aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * screenshot for darkzero-NS, same as darkzerofriendica2012-03-261-0/+0
| * | marking quattro-green as extension of quattro and deleting the tpl filesTobias Diekershoff2012-03-2614-667/+11
| |/
| * 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
| |/ /
| * | don't include friend suggestions for people with the same name as current con...friendica2012-03-251-2/+6
| * | position the theme-preview on settings pagefriendica2012-03-251-0/+4
| * | more wordsmithing of the Friendica invitation emailfriendica2012-03-251-4/+5
| * | screenshot galleryfriendica2012-03-2512-0/+0
| * | Merge branch 'pull'friendica2012-03-257-15/+45
| |\|
| | * Merge pull request #167 from unary/typoSimon2012-03-251-1/+1
| | |\
| | | * typo datarry -> datarrayMichael Johnston2012-03-251-1/+1
| | * | Merge pull request #169 from simonlnu/masterSimon2012-03-256-14/+44
| | |\ \
| | | * | add in the search boxSimon L'nu2012-03-256-13/+43
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-256-2/+22
| | | |\ \ | | | |/ / | | |/| |
| | | * | minor fix to dispy theme.phpSimon L'nu2012-03-251-1/+1
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-250-0/+0
| * | | | theme preview for end usersfriendica2012-03-254-1/+23
| |/ / /
| * | | Merge branch 'pull'friendica2012-03-253-9/+17
| |\| |
| | * | Merge pull request #168 from simonlnu/masterSimon2012-03-251-1/+1
| | |\ \ | | | |/ | | |/|
| | | * urgent fix to dispy-dark theme.phpSimon L'nu2012-03-251-1/+1
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-250-0/+0
| | |/
| | * small fixestommy tomson2012-03-252-8/+16
| * | theme screenshotsfriendica2012-03-256-2/+22
| |/
| * enotify plugin hookfriendica2012-03-251-2/+24
| * NOTIFY_SYSTEMfriendica2012-03-252-1/+9
| * Merge pull request #166 from simonlnu/masterSimon2012-03-2519-18/+455
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:23:34 +0000