Commit graph

12786 commits

Author SHA1 Message Date
marijus
884d542d4b Merge branch 'master' of https://github.com/friendica/red 2015-01-23 14:51:15 +01:00
marijus
8789c96e78 some code restructure 2015-01-23 14:50:39 +01:00
friendica
7cd4374e3d Merge https://github.com/friendica/red into pending_merge 2015-01-23 03:27:14 -08:00
friendica
c49c96962f provide pref to set default photo resolution for posts to something other than 2. The only acceptable option is 1. (640) 2015-01-23 03:25:40 -08:00
friendica
0cdcc4bc50 doc updates 2015-01-23 03:25:17 -08:00
marijus
e874376268 this will require more fixing in include/enotify 2015-01-23 02:09:28 +01:00
marijus
87dcc4c145 possible performance improvement for sharedwithme update query 2015-01-22 22:50:38 +01:00
Habeas Codice
660ed058bf Merge branch 'master' of https://github.com/friendica/red 2015-01-22 09:29:13 -08:00
Habeas Codice
9d9be768c5 fix dir server query take 2
rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they
are equivalent. prevents dupes from fake null dates.
2015-01-22 09:25:34 -08:00
marijus
d94114ec98 add some mimetypes 2015-01-22 12:12:42 +01:00
Habeas Codice
c05f0ec407 Merge branch 'master' of https://github.com/friendica/red 2015-01-21 21:27:07 -08:00
Habeas Codice
6d291d880e directory server dba sql fixes 2015-01-21 21:25:50 -08:00
friendica
7d0e0366b9 Merge https://github.com/friendica/red into pending_merge 2015-01-21 20:09:51 -08:00
friendica
76fe9dc702 zot_finger second arg is optional but function declaration didn't specify this - causes issue with check_upstream_directory 2015-01-21 20:08:10 -08:00
marijus
cad8228db3 Merge branch 'master' of https://github.com/friendica/red 2015-01-22 04:58:34 +01:00
marijus
3731ff97ff make $links an array of links 2015-01-22 04:57:59 +01:00
friendica
b946ac63a1 couple of hubloc manager issues 2015-01-21 19:09:12 -08:00
friendica
0010eaa411 Merge https://github.com/friendica/red into pending_merge 2015-01-21 18:34:31 -08:00
friendica
8472e706bc hubloc manage issue 2015-01-21 18:34:15 -08:00
marijus
200220ff36 Merge branch 'master' of https://github.com/friendica/red 2015-01-22 02:34:57 +01:00
marijus
4ff71fc0c7 change mod/sharedwithme backend to use activity object - this is not backwards compatible 2015-01-22 02:34:38 +01:00
Jeroen
503047dc32 added redmatrix.nl back as a directory server. this was not the issue with the performance problems 2015-01-22 00:11:00 +00:00
friendica
0b6415e73d Merge https://github.com/friendica/red into pending_merge 2015-01-21 14:26:10 -08:00
friendica
6d0e6b78b4 update V3 roadmap 2015-01-21 14:25:45 -08:00
RedMatrix
f7c88c99b0 Merge pull request #873 from pafcu/master
Update some external libraries
2015-01-22 08:54:43 +11:00
Stefan Parviainen
84833ca15e Update to latest version of jRange (fixes issue #867) 2015-01-21 12:34:01 +01:00
Stefan Parviainen
6ea5b57715 Update to latest version of jquery-textcomplete. 2015-01-21 12:28:45 +01:00
marijus
2757da433e bring back nav-search spinner 2015-01-21 11:38:55 +01:00
friendica
19dfbfc063 Merge https://github.com/friendica/red into pending_merge 2015-01-20 21:09:16 -08:00
friendica
2d682cf8b0 add my.federated.social as directory server 2015-01-20 21:08:44 -08:00
RedMatrix
c78c1ab4b0 Merge pull request #872 from habeascodice/master
Rework directory server update selection query
2015-01-21 16:07:47 +11:00
Habeas Codice
90fbfb313e Rework directory server update selection query 2015-01-20 20:59:08 -08:00
friendica
d0258c0da2 More styling for poco reputation page. Note: the reason this isn't yet linked to the UI is because we need to age some old '1' values that are bogus. 2015-01-20 20:58:55 -08:00
friendica
9028e6bd30 typo in postgres db update, remove redmatrix.nl from directory servers since it isn't a directory server any more. 2015-01-20 19:41:09 -08:00
friendica
70fb47248b Merge https://github.com/friendica/red into pending_merge 2015-01-20 14:05:22 -08:00
friendica
7875b79f2f get rid of really old poco records once weekly 2015-01-20 14:04:44 -08:00
marijus
43326a26b7 css fixes - hopefully 2015-01-20 22:19:51 +01:00
marijus
5ee815b2fa satisfy the floated images 2015-01-20 21:10:41 +01:00
marijus
33380b3c30 as a workaround make nav-search dropdown behave a little better 2015-01-20 15:00:44 +01:00
friendica
9d5e972013 poco rating variable getting over-written before local storage. 2015-01-19 20:36:13 -08:00
friendica
e3041b80fd oauth permissions table 2015-01-19 20:06:12 -08:00
friendica
ced0685d67 Change link label from Feature settings to Feature/Addon settings to more accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true). 2015-01-19 15:18:44 -08:00
friendica
43d2703e92 Merge https://github.com/friendica/red into pending_merge 2015-01-19 14:32:25 -08:00
friendica
ec6e147935 put cloud back in get_cloudpath - just have to be careful where we use it. 2015-01-19 14:31:45 -08:00
RedMatrix
abddaccb5f Merge pull request #870 from pafcu/autocomplete_fix
Fix autocomplete with groups
2015-01-20 08:48:26 +11:00
Stefan Parviainen
9cd522a790 Fix autocomplete with groups 2015-01-19 20:42:57 +01:00
git-marijus
ab2db9e819 Merge pull request #868 from pafcu/autocomplete_fix
Fix issue #865.
2015-01-19 19:10:36 +01:00
Stefan Parviainen
f55a312c17 Fix issue #865. 2015-01-19 15:35:06 +01:00
friendica
2372d9b42a make typo.php descend into include/RedDAV 2015-01-18 19:28:32 -08:00
friendica
21da3443f3 Merge https://github.com/friendica/red into pending_merge 2015-01-18 19:25:10 -08:00