aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-2523-819/+1098
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-2510-444/+450
| |\
| | * DE update to strings and templatesTobias Diekershoff2012-05-253-397/+419
| | * Merge pull request #313 from fabrixxm/masterSimon2012-05-243-5/+7
| | |\
| | | * fix small js error when user not logged inroot2012-05-241-1/+1
| | | * install wizard: fix php executable pathroot2012-05-242-4/+6
| | * | Merge pull request #314 from simonlnu/masterSimon2012-05-244-42/+24
| | |\ \
| | | * | update dark a bit. i messed up some buttonsSimon L'nu2012-05-244-42/+24
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
| | |/ /
| * / / rev updatefriendica2012-05-254-89/+90
| |/ /
| * | slackr: improve interactivityfriendica2012-05-231-0/+14
| * | slackr: hide calendar when postingfriendica2012-05-231-0/+8
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-234-39/+70
| |\ \
| | * \ Merge pull request #312 from simonlnu/masterSimon2012-05-234-39/+70
| | |\ \
| | | * | clean up and more fixingSimon L'nu2012-05-234-39/+70
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-233-151/+174
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| * | | | more theme stufffriendica2012-05-233-1/+56
| |/ / /
| * | | slackr - better highlighting of current selectionsfriendica2012-05-231-1/+6
| * | | slackr - knock the sharp edges off the events calendarfriendica2012-05-231-1/+1
| * | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2312-137/+278
| |\| |
| | * | Merge pull request #309 from fabrixxm/masterSimon2012-05-234-38/+56
| | |\|
| | | * Update install wizardroot2012-05-234-38/+56
| | * | Merge pull request #311 from simonlnu/masterSimon2012-05-235-64/+164
| | |\ \
| | | * | clean up and make nice the dispy photo edit stuffSimon L'nu2012-05-235-64/+164
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| | |/ /
| | * | Merge pull request #310 from simonlnu/masterSimon2012-05-237-35/+58
| | |\ \ | | | |/ | | |/|
| | | * add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-237-35/+58
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2319-269/+417
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-220-0/+0
| * | | rev updatefriendica2012-05-232-150/+168
| |/ /
* | | Merge remote branch 'upstream/master'zottel2012-05-2329-761/+980
|\| |
| * | photo rotationfriendica2012-05-234-4/+75
| * | event calendar themingfriendica2012-05-221-0/+3
| * | import quattro event reminderfriendica2012-05-222-0/+40
| * | 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
| |\
| * | fix setting array values to config itemsTobias Diekershoff2012-05-221-3/+1
* | | Merge remote branch 'upstream/master'zottel2012-05-2229-444/+623
|\ \ \ | | |/ | |/|
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-219-213/+227
| |\|
| | * Merge pull request #308 from simonlnu/masterSimon2012-05-212-2/+2
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 01:37:40 +0000