Commit graph

12459 commits

Author SHA1 Message Date
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
Stefan Parviainen
f2e648308c Return results from acl.php in standard form 2015-01-07 20:45:00 +01:00
Stefan Parviainen
c9b15bbab5 Allow passing autocomplete type to contact_autocomplete 2015-01-07 20:38:56 +01:00
Stefan Parviainen
9f8ce331f3 Disable browser-based autocomplete when using the textcomplete based one 2015-01-07 20:29:38 +01:00
Stefan Parviainen
f157122c35 Make searchbox use textcomplete 2015-01-07 20:25:29 +01:00
Stefan Parviainen
e025fd9de2 Make mail use textcomplete 2015-01-07 20:15:33 +01:00
Stefan Parviainen
0cf016b0b0 Make mod_poke use textcomplete 2015-01-07 20:03:05 +01:00
Stefan Parviainen
34ecbcceea Make nav search use textcomplete 2015-01-07 19:39:50 +01:00
Stefan Parviainen
4e3aadc38a Rename some stuff related to autocomplete 2015-01-07 18:57:16 +01:00
Stefan Parviainen
e3d064ff22 Allow textcomplete to work on inputs (PR also filed upstream) 2015-01-07 18:42:57 +01:00
marijus
a373b9f1d4 also style the collapse link 2015-01-07 13:04:50 +01:00
friendica
3ef487418d don't allow admin to delete the sys channel from the channel manage page 2015-01-06 20:12:34 -08:00
friendica
a1e5a661fa Merge branch 'master' into trinidad 2015-01-06 15:45:00 -08:00
friendica
fbe0610ce9 don't update locally deleted items 2015-01-06 15:44:23 -08:00
friendica
f8151a33e2 Merge branch 'master' into trinidad 2015-01-06 15:31:39 -08:00
friendica
bb67ab1fbf this brings us up to date 2015-01-06 15:30:54 -08:00
friendica
400a2cd912 Merge branch 'master' into trinidad 2015-01-06 14:51:13 -08:00
friendica
4b9ed48a54 don't let dns_get_record() "write to screen" if it errors. 2015-01-06 14:50:29 -08:00
friendica
aaceb71e86 Merge branch 'master' into trinidad 2015-01-06 13:45:55 -08:00
RedMatrix
2417125c89 Merge pull request #826 from pafcu/cache_autocomplete
Cache autocomplete results locally (the one in the editor)
2015-01-07 08:45:47 +11:00
friendica
c9839d38a5 Merge branch 'master' into trinidad 2015-01-06 13:43:19 -08:00
friendica
1cfff44535 lines reversed in handle_tag() 2015-01-06 13:42:55 -08:00
Stefan Parviainen
3e41b8137c Cache autocomplete results locally (the one in the editor) 2015-01-06 21:01:30 +01:00
friendica
c05586fbe7 begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. 2015-01-06 11:55:42 -08:00
friendica
7ee5567421 Merge branch 'master' into trinidad 2015-01-06 11:40:31 -08:00