aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mark bubbles unsupportedfriendica2012-05-222-0/+0
* keep FB out of private notesfriendica2012-05-224-16/+25
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-222-4/+8
|\
| * Oops - but lets commit the right revision, sorry. There's a spare line in th...Thomas Willingham2012-05-221-6/+1
| * Fix darkzero/ns BB icon background colours.Thomas Willingham2012-05-222-4/+13
* | clear submanage, etc from session on logoutfriendica2012-05-221-0/+7
* | if identity (uid) changes - reload any other open browser windows on next ping.friendica2012-05-225-249/+267
|/
* cause of bogus wall-to-wall posts foundfriendica2012-05-221-1/+1
* add queue totals to admin summary pagefriendica2012-05-222-1/+18
* DE: update to the strings and some mail templatesTobias Diekershoff2012-05-224-483/+535
* Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-05-224-27/+30
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-219-213/+227
| |\
| * | redir links for permission controlled attachmentsfriendica2012-05-214-27/+30
* | | fix setting array values to config itemsTobias Diekershoff2012-05-221-3/+1
| |/ |/|
* | Merge pull request #308 from simonlnu/masterSimon2012-05-212-2/+2
|\ \
| * | fix (min-)search-text textSimon L'nu2012-05-212-2/+2
* | | Merge pull request #307 from simonlnu/masterSimon2012-05-219-212/+226
|\| | | |/ |/|
| * updates to dispy family; fix typo in INSTALL.txtSimon L'nu2012-05-219-212/+226
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2111-66/+205
| |\ | |/ |/|
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-212-8/+8
|\ \
* | | rev update, bug 428, 429, and ability to block globaldir submissions from dem...friendica2012-05-2111-66/+205
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-210-0/+0
| |/
| * Merge pull request #306 from simonlnu/masterSimon2012-05-212-2/+2
| |\
| | * more light fixesSimon L'nu2012-05-212-2/+2
| * | Merge pull request #305 from simonlnu/masterSimon2012-05-202-6/+6
|/| | | |/
| * fix dumb mistake in lightSimon L'nu2012-05-212-6/+6
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-210-0/+0
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-202-2/+2
|\
| * Merge pull request #303 from simonlnu/masterSimon2012-05-202-2/+2
| |\
| | * fix dispy lightSimon L'nu2012-05-202-2/+2
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-207-33/+126
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-190-0/+0
* | | rev updatefriendica2012-05-208-135/+158
|/ /
* | search with leading @ performs directory search (# for tag search), nothing f...friendica2012-05-192-1/+8
* | Darkzero-NS + 'Friendicaland' countries.Thomas Willingham2012-05-202-12/+69
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-193-7/+35
|\|
| * Darkzero, another missing part of "everything"Thomas Willingham2012-05-191-0/+1
| * Diabook-dark - some more cleaning upThomas Willingham2012-05-192-4/+5
| * Okay, so maybe not *everything*Thomas Willingham2012-05-191-2/+11
| * Give Darkzero some loving.Thomas Willingham2012-05-191-1/+18
* | set comment permissions explicitly to parent permissionsfriendica2012-05-193-20/+49
|/
* backend support for 'x' deliveries per process - x is configurable, more impo...friendica2012-05-193-377/+394
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-194-5/+5
|\
| * Merge pull request #302 from simonlnu/masterSimon2012-05-194-5/+5
| |\
| | * fix -desc againSimon L'nu2012-05-194-5/+5
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-193-246/+266
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1816-40/+183
| | |\
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-170-0/+0
* | | | sql script to ccnvert all tables to innodbfriendica2012-05-191-0/+19
|/ / /
* | / profile change activity link bugfriendica2012-05-183-246/+266
| |/ |/|