aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-03-27166-1297/+7813
|\
| * Merge pull request #175 from simonlnu/masterSimon2012-03-276-115/+216
| |\
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-273-12/+18
| | |\ | | |/ | |/|
| * | profile wall privacyfriendica2012-03-272-12/+13
| * | Merge branch 'pull'friendica2012-03-2710-26/+42
| |\ \
| * | | don't expire filed itemsfriendica2012-03-271-0/+5
| | | * more fixes for dispysSimon L'nu2012-03-276-10/+23
| | | * add dispy-dark snapshot; fix toolbarSimon L'nu2012-03-273-109/+197
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2710-26/+42
| | | |\ | | | |/ | | |/|
| | * | add "find friends" to right_aside to diabook, fixes in css in diabooktommy tomson2012-03-279-16/+32
| | * | fixed Umlaute in de strings.phpTobias Diekershoff2012-03-271-10/+10
| |/ /
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-270-0/+0
| |/
| * @-completion bugfriendica2012-03-261-5/+5
| * qcomment enhancementsfriendica2012-03-263-5/+25
| * theme description with preview (non-translatable unfortunately)friendica2012-03-263-2/+13
| * preparation for some possibly killer featuresfriendica2012-03-263-15/+23
| * translate br with extra elementsfriendica2012-03-262-2/+2
| * Merge branch 'pull'friendica2012-03-2633-731/+101
| |\
| | * Merge pull request #174 from beardy-unixer/masterfriendica2012-03-261-8/+8
| | |\
| | | * Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern ...Thomas Willingham2012-03-261-8/+8
| | | * Merge remote-tracking branch 'main/master'Thomas Willingham2012-03-26527-11251/+34436
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #173 from simonlnu/masterSimon2012-03-262-5/+8
| | |\ \
| | | * | fix dispy's nav element; fix colours in #search-textSimon L'nu2012-03-262-5/+8
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-260-0/+0
| | |/ /
| | * | add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_a...tommy tomson2012-03-268-20/+50
| | * | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2613-36/+29
| | |\ \
| | | * | minor css fixes in diabooktommy tomson2012-03-2612-36/+29
| | * | | marking quattro-green as extension of quattro and deleting the tpl filesTobias Diekershoff2012-03-2614-667/+11
| | | | * Merge remote-tracking branch 'main/master'Thomas2012-03-193-78/+66
| | | | |\
| * | | | | revupfriendica2012-03-261-1/+1
| | |/ / / | |/| | |
| * | | | screenshot for darkzero-NS, same as darkzerofriendica2012-03-261-0/+0
| |/ / /
| * | | added quaddro templates to quaddro-greenTobias Diekershoff2012-03-2613-0/+667
| * | | Merge pull request #172 from fabrixxm/masterfriendica2012-03-2634-902/+902
| |\ \ \
| | * | | diabook: small fix in theme_info arrayFabio Comuni2012-03-261-1/+1
| | * | | themes: use duepuntozero tpls as defaultFabio Comuni2012-03-2633-901/+901
| * | | | Merge branch 'pull'friendica2012-03-264-1/+3
| |\ \ \ \
| | * | | | small fix in diabook :: add local friendica to right_asidetommy tomson2012-03-264-1/+3
| * | | | | language issues in enotifyfriendica2012-03-261-5/+9
| |/ / / /
| * | | | Merge branch 'pull'friendica2012-03-2612-22/+37
| |\ \ \ \
| | * \ \ \ Merge pull request #171 from simonlnu/masterSimon2012-03-261-1/+1
| | |\ \ \ \
| | | * | | | [fix] contact_edit.tpl syntax; reduce cols to fit betterSimon L'nu2012-03-261-1/+1
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-260-0/+0
| | |/ / / /
| | * / / / add screenshots to diabooktommy tomson2012-03-264-3/+8
| | |/ / /
| | * | | Merge pull request #170 from simonlnu/masterSimon2012-03-264-8/+22
| | |\ \ \
| | | * | | fix the search boxSimon L'nu2012-03-264-8/+22
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2623-18/+45
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | small fixtommy tomson2012-03-264-11/+7
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-250-0/+0
| * | | | | comix screenshotfriendica2012-03-261-0/+0
| * | | | | more theme screenshotsfriendica2012-03-267-0/+0
| |/ / / /