aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-0122-6272/+6486
|\
| * settings: missing /form and whitespaceMario Vavti2015-03-011-133/+129
| * more settings workMario Vavti2015-03-013-160/+191
| * provide some more yes/no labelsMario Vavti2015-03-011-29/+31
| * fix loginMario Vavti2015-03-012-86/+18
| * first pile of work on settingsMario Vavti2015-03-0118-161/+80
| * Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-02-282-5845/+6180
| |\
| | * Dutch language updatedjeroenpraat2015-02-282-5845/+6180
| * | some css fixes for settingsMario Vavti2015-02-282-6/+5
| |/
* / queue management actions. Still needs further work such as indication of last...friendica2015-03-015-12/+49
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-275-448/+525
|\
| * Merge pull request #913 from zzottel/masterzzottel2015-02-273-4/+11
| |\
| | * update German help files to current English contentszottel2015-02-272-3/+10
| | * fix link to siteinfo/jsonzottel2015-02-271-1/+1
| |/
| * Merge pull request #912 from zzottel/masterzzottel2015-02-272-444/+514
| |\
| | * update to German stringszottel2015-02-272-444/+514
| |/
* | Fix a couple of places where we weren't checking for dead hublocs. Add a func...friendica2015-02-274-2352/+2394
* | weekly doxygen pushfriendica2015-02-2769-765/+1321
|/
* don't report already delivered queue items in admin queue summaryfriendica2015-02-261-1/+1
* high level queue inspector - needs a lot more, like the ability to dump certa...friendica2015-02-263-1/+27
* per Randal overheard on a foreign network - tab in post/comment edit window g...friendica2015-02-263-4/+10
* finish converting "delete" to trash icons for consistency. The 'x' was left i...friendica2015-02-2615-16/+20
* Merge pull request #911 from tokudan/patch-1RedMatrix2015-02-271-2/+2
|\
| * fix issues in schema_postgres.sqlDaniel Frank2015-02-261-2/+2
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-261-0/+3
|\
| * more fake null shenanigansHabeas Codice2015-02-261-0/+3
| * Revert "more fake null shenanigans"Habeas Codice2015-02-261-23/+94
| * more fake null shenanigansHabeas Codice2015-02-261-94/+23
* | loop breakerfriendica2015-02-262-1/+17
|/
* syntax - missing argfriendica2015-02-251-1/+1
* this may actually fix the deliver loop when deleting existing items. It's hac...friendica2015-02-252-1/+23
* Found the cause of the delete looping, and I can prevent it going forward. Th...friendica2015-02-253-15/+54
* call post_local hooks prior to storing a post that is going to be sourced. Th...friendica2015-02-252-0/+9
* solve some (hopefully most) missing delivery issuesfriendica2015-02-253-15/+57
* don't send deleted items upstream - only downstream.friendica2015-02-241-3/+6
* require access token to view, query, or join directories in private realms, i...friendica2015-02-248-14/+68
* support rel=me on channel "homepage" urlfriendica2015-02-243-4/+4
* provide ability to link new themes/addonsfriendica2015-02-234-8/+60
* public_recips cleanupfriendica2015-02-231-18/+30
* apply fix from 8d03774 to z_post_url alsofriendica2015-02-231-1/+1
* Merge pull request #910 from zzottel/masterRedMatrix2015-02-241-1/+1
|\
| * make redirections restriction in z_fetch_url() workzottel2015-02-231-1/+1
|/
* fix 404 pages for derivative themes by pretending we've found a module called...friendica2015-02-221-0/+3
* notes about private realm registrations and multiple primary directories.friendica2015-02-222-3/+15
* no longer neededfriendica2015-02-221-33/+0
* remove the new session functions from the trunk. Don't yet know if they'll co...friendica2015-02-221-33/+0
* remove these functions for now.friendica2015-02-221-1/+2
* fi8x the typofriendica2015-02-221-1/+1
* new session functionsfriendica2015-02-223-2/+31
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-201-6/+7
|\