Commit Graph
12654 Commits
Author SHA1 Message Date
RedMatrix 776557cb88 Merge pull request #876 from cvogeley/master
Check allowed emails, also add blacklisting for
2015-01-25 17:12:43 +11:00
Habeas Codice af7fa99e2e Merge branch 'master' of https://github.com/friendica/red 2015-01-24 21:18:27 -08:00
Habeas Codice 1d80bcf2e7 standardize sql 2015-01-24 21:16:43 -08:00
Christian Vogeley ba10833bc5 Check allowed emails, also add blacklisting for
not allowed emails:
config:'system','not_allowed_email'
2015-01-25 04:16:28 +01:00
marijus 63f1ae5e20 optimize check query 2015-01-24 14:35:21 +01:00
marijus ed09513bb2 Merge branch 'master' of https://github.com/friendica/red 2015-01-24 12:23:26 +01:00
marijus e4e990df06 the old item must be removed before the new is created 2015-01-24 12:22:04 +01:00
Habeas Codice 146efbc18e unmatched parens 2015-01-23 22:34:45 -08:00
friendica 34b5072ccf Merge https://github.com/friendica/red into pending_merge 2015-01-23 21:49:48 -08:00
friendica befe77a93f onedirsync issue reported by habeas codice 2015-01-23 21:48:34 -08:00
Habeas Codice 0405f2bcb9 Merge branch 'master' of https://github.com/friendica/red 2015-01-23 17:26:37 -08:00
Habeas Codice 891d231bbe rand() fixes 2015-01-23 17:25:05 -08:00
RedMatrix be9fc16bd5 Merge pull request #875 from zzottel/master
add db update 1131/1132 to database schemas
2015-01-24 12:23:27 +11:00
marijus 4379354021 disable notices 2015-01-24 01:15:54 +01:00
marijus 0cbe64c360 some more kiss 2015-01-24 01:13:02 +01:00
zottel eb4e6ab073 add db update 1131/1132 to database schemas 2015-01-23 23:20:30 +01:00
marijus ea209a84ab typo 2015-01-23 15:06:30 +01:00
marijus b4f1cc5044 we get the object info before it is deleted now 2015-01-23 15:03:19 +01:00
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