aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* abstract poco into a single function in socgraph so we can provide different ...friendica2015-01-253-207/+220
* we also don't need a profile selector when editing our default permissions.friendica2015-01-251-0/+2
* don't hide the scary stuff when editing self permissions.friendica2015-01-251-2/+8
* roadmap updatefriendica2015-01-251-0/+4
* Hide all the scary decision making stuff that sends intellectually challenged...friendica2015-01-252-0/+5
* turn "large photo thumbnails" into a feature.friendica2015-01-252-6/+12
* rework the new connection stuff so we don't need a "permissions have been cha...friendica2015-01-253-28/+16
* Merge pull request #879 from anaqreon/patch-1RedMatrix2015-01-261-1/+1
|\
| * misspellinganaqreon2015-01-251-1/+1
|/
* recognise opus as an audio filefriendica2015-01-252-2/+2
* move connection approval checkbox to top of page (above the sliders) - instea...friendica2015-01-251-11/+8
* don't set a rating of 1 on old sites that report poco rating as an array. Jus...friendica2015-01-252-2/+2
* Merge pull request #877 from solstag/masterRedMatrix2015-01-251-1/+2
|\
| * Call sslify with an extra path element so files keep their namesAlexandre Hannud Abdo2015-01-251-1/+2
* | Merge pull request #876 from cvogeley/masterRedMatrix2015-01-255-595/+29
|\ \
| * | Check allowed emails, also add blacklisting forChristian Vogeley2015-01-255-595/+29
| |/
* | Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-241-3/+15
|\|
| * optimize check querymarijus2015-01-241-2/+7
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-246-7/+12
| |\
| * | the old item must be removed before the new is createdmarijus2015-01-241-1/+8
* | | standardize sqlHabeas Codice2015-01-241-1/+1
| |/ |/|
* | unmatched parensHabeas Codice2015-01-231-1/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-237-131/+115
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-2358-1239/+1497
| |\ \
| | * \ Merge pull request #875 from zzottel/masterRedMatrix2015-01-242-0/+4
| | |\ \ | | | |/ | | |/|
| | | * add db update 1131/1132 to database schemaszottel2015-01-232-0/+4
| | * | disable noticesmarijus2015-01-241-2/+2
| | * | some more kissmarijus2015-01-242-95/+60
| | |/
| | * typomarijus2015-01-231-1/+1
| | * we get the object info before it is deleted nowmarijus2015-01-231-12/+12
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-2351-1111/+1384
| | |\
| | * | some code restructuremarijus2015-01-233-46/+59
| * | | rand() fixesHabeas Codice2015-01-232-3/+5
* | | | onedirsync issue reported by habeas codicefriendica2015-01-231-3/+2
| |_|/ |/| |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-233-6/+9
|\ \ \ | | |/ | |/|
| * | this will require more fixing in include/enotifymarijus2015-01-232-2/+2
| * | possible performance improvement for sharedwithme update querymarijus2015-01-221-4/+7
| |/
* | provide pref to set default photo resolution for posts to something other tha...friendica2015-01-231-0/+9
* | doc updatesfriendica2015-01-2350-1111/+1375
|/
* Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-222-2/+26
|\
| * add some mimetypesmarijus2015-01-222-2/+26
* | fix dir server query take 2Habeas Codice2015-01-221-1/+1
|/
* Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-2117-89/+184
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-212-2/+4
| |\
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-222-6/+12
| | |\
| | * | make $links an array of linksmarijus2015-01-222-2/+4
| * | | zot_finger second arg is optional but function declaration didn't specify thi...friendica2015-01-211-1/+1
| | |/ | |/|
| * | couple of hubloc manager issuesfriendica2015-01-212-4/+8
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-214-68/+118
| |\|
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-228-8/+37
| | |\