Christian Vogeley
487d201ea8
.
2015-01-11 19:23:15 +01:00
Christian Vogeley
f957208600
fix accidentally removed file
2015-01-11 19:19:18 +01:00
Christian Vogeley
f0c7612bcd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211
Fix for issue #763 Error creating new channel within the limits of the
...
subscription plan
2015-01-11 16:12:36 +01:00
friendica
4c31598555
Merge branch 'master' into trinidad
2015-01-10 14:59:24 -08:00
friendica
10102ac2ac
connection clone issues
2015-01-10 14:59:10 -08:00
friendica
df0f67843e
Merge branch 'master' into trinidad
2015-01-10 13:05:04 -08:00
friendica
8c4eb839f9
Merge https://github.com/friendica/red into pending_merge
2015-01-10 13:05:02 -08:00
friendica
c75cdbd304
doc updates
2015-01-10 13:04:43 -08:00
RedMatrix
50bc43733f
Merge pull request #839 from einervonvielen/dev_beginning_fix1
...
Fixed / Changed step-by-step manual for beginning developers
2015-01-11 08:03:54 +11:00
Einer von Vielen
bd7aebe272
Changed step-by-step manual for beginning developers.
...
- Fixed: Deleted wrong "orign" in push
- Changed: Spellings
- Added: Eclipses GIT plugin "Eclipse Mylyn to GitHub connector"
2015-01-10 20:45:09 +01:00
Einer von Vielen
52236c8677
Changed step-by-step manual for beginning devolopers.
...
- Fixed: Deleted "origin" in push at the end of the document
- Changed: Wordings
- Added: Reference to eclipse GIT plugin "Eclipse Mylyn to GitHub
connector"
2015-01-10 20:39:05 +01:00
Habeas Codice
0368fe49f3
Fix unescaped image data
2015-01-10 11:08:37 -08:00
git-marijus
72c0bc1169
Merge pull request #838 from f03el/master
...
Some updates to the Swedish translation
2015-01-10 13:02:32 +01:00
git-marijus
884fa8bf9f
Merge pull request #837 from git-marijus/master
...
basic changes for file activity
2015-01-10 13:01:02 +01:00
Erik Lundin
3877f4ffd4
Fix typo and rephrase Swedish translation
2015-01-10 11:46:03 +01:00
Erik Lundin
27046aeb7a
Update Swedish strings from Transifex
2015-01-10 11:38:09 +01:00
marijus
978d78b953
basic changes for file activity
2015-01-09 15:18:45 +01:00
Paolo T
e1c5cc46f6
Merge pull request #836 from tuscanhobbit/dev
...
Updated Italian translation
2015-01-09 08:59:26 +01:00
Paolo Tacconi
39cfd77583
Updated Italian translation
2015-01-09 08:57:08 +01:00
friendica
072dc6e820
Merge branch 'master' into trinidad
2015-01-08 19:21:27 -08:00
friendica
1b535ff8a5
clean up some url anomalies in dir_sort_links after security fix
2015-01-08 19:20:50 -08:00
friendica
623a5b7c6c
Merge branch 'master' into trinidad
2015-01-08 19:13:32 -08:00
friendica
af943f4569
double q argument could also cause issues
2015-01-08 19:13:13 -08:00
friendica
1159ffaf7a
Merge branch 'master' into trinidad
2015-01-08 19:10:39 -08:00
friendica
1e4e7ce2d3
SECURITY: dir_sort_links() exposes session cookie
2015-01-08 19:09:52 -08:00
friendica
fab09ef1bc
Merge branch 'master' into trinidad
2015-01-08 16:03:30 -08:00
friendica
836223bf5b
Merge https://github.com/friendica/red into pending_merge
2015-01-08 16:03:29 -08:00
friendica
aa490a39bb
include channel clones in PM deliveries (also some whitespace edits)
2015-01-08 16:02:15 -08:00
pafcu
80c77b7f92
Merge pull request #833 from pafcu/oneautocompleter
...
Fixes for the new autocompletion
2015-01-08 18:25:38 +02:00
Stefan Parviainen
32c6eab01c
Fix saved searches on network page, fix caching mith multiple autocompleters
2015-01-08 17:16:08 +01:00
zzottel
a2e43ae172
Merge pull request #832 from zzottel/master
...
updated German translation of features.bb help file to match English version
2015-01-08 16:11:02 +01:00
zottel
6992717b37
updated German translation of features.bb help file to match current English one
2015-01-08 16:07:48 +01:00
Stefan Parviainen
4beb782014
Fix issue with case sensitive filtering in autocomplete, put autocomplete dropdown on top of navbar, show entry to leave the text unchanged
2015-01-08 16:06:37 +01:00
Stefan Parviainen
833d51527b
Honor requested count in navbar search
2015-01-08 16:05:00 +01:00
zzottel
4165be2c4c
Merge pull request #831 from zzottel/master
...
update German main help file
2015-01-08 11:47:19 +01:00
zottel
1e8019c806
remove extra blank line
2015-01-08 11:46:14 +01:00
zottel
9467208f78
update German main help file
2015-01-08 11:44:04 +01:00
friendica
1a67c55f28
the yearly license update
2015-01-07 18:03:36 -08:00
friendica
0657195125
Merge branch 'master' into trinidad
2015-01-07 14:39:09 -08:00
friendica
087d6744fc
Merge https://github.com/friendica/red into pending_merge
2015-01-07 14:39:07 -08:00
RedMatrix
8771dee9cf
Merge pull request #829 from pafcu/oneautocompleter
...
Steps towards a single autocompleter
2015-01-08 09:38:45 +11:00
friendica
ce953e2f41
syncing connections issue, incorrect return_url after deleting connection
2015-01-07 14:35:03 -08:00
Stefan Parviainen
7176eb8845
Merge autocomplete caching, show more results in navbar search
2015-01-07 22:07:11 +01:00
Stefan Parviainen
f3cd29f829
Typo + comment
2015-01-07 21:38:12 +01:00
Stefan Parviainen
885bcb4b2a
Remove out-of-date mod_message.js
2015-01-07 21:33:22 +01:00
Stefan Parviainen
d7a3d9f606
Add autosubmit feature to textcomplete based autocompleter
2015-01-07 21:32:17 +01:00
Stefan Parviainen
fcc9131fb9
Make mod_sources autocomplete use textcomplete
2015-01-07 21:01:36 +01:00
Stefan Parviainen
b098d5d901
Make photos tag autocomplete use textcomplete
2015-01-07 20:57:30 +01:00
Stefan Parviainen
8e4d66dd7b
Make mod_connections search use textcomplete
2015-01-07 20:57:10 +01:00