aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\ \
* | | theme preview for end usersfriendica2012-03-254-1/+23
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-250-0/+0
| |/
| * 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
| |\ \ | |/ / |/| |
* | | Merge branch 'pull'friendica2012-03-253-9/+17
|\ \ \
* | | | theme screenshotsfriendica2012-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
| |/ /
| * | 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
|/
* enotify plugin hookfriendica2012-03-251-2/+24
* NOTIFY_SYSTEMfriendica2012-03-252-1/+9
* Merge pull request #166 from simonlnu/masterSimon2012-03-2519-18/+455
|\
| * dispy-dark not experimental. start implementing fpostitSimon L'nu2012-03-2519-16/+452
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2512-36/+152
| |\ | |/ |/|
* | Merge pull request #165 from tomtom84/mastertomtom842012-03-2410-29/+135
|\ \
| * | move community_pages to right_aside, fixes in csstommy tomson2012-03-2510-29/+135
|/ /
* | Merge branch 'pull'friendica2012-03-248-38/+105
|\ \
| * \ Merge pull request #164 from simonlnu/masterSimon2012-03-248-38/+105
| |\ \
* | | | improved the inivitations and added a bit of sales pitch.friendica2012-03-242-7/+17
|/ / /
| | * increase version to 1.0 for dispys \o/Simon L'nu2012-03-252-2/+3
| |/
| * implement filer/file-asSimon L'nu2012-03-258-38/+105
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-252-9/+15
| |\ | |/ |/|
* | bug #329 - compress the plugin list on the friendica info pagefriendica2012-03-241-7/+12
* | bug #346 - add oembed maxwidth to oembed requestfriendica2012-03-241-2/+3
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2442-122/+5673
| |\ | |/ |/|
* | prevent duplicate friend suggestionsfriendica2012-03-242-1/+10
* | block filed items from deletionfriendica2012-03-242-4/+4
* | add the bangfriendica2012-03-241-2/+2
* | Merge branch 'pull'friendica2012-03-244-4/+4
|\ \
| * | small fix in csstommy tomson2012-03-244-4/+4
* | | network filter is now a permission groupfriendica2012-03-242-2/+16
|/ /
* | Merge pull request #163 from tomtom84/mastertomtom842012-03-2420-94/+5443
|\ \
| * | add right_aside to diabook-bluetommy tomson2012-03-2420-94/+5443
|/ /
* | Merge pull request #162 from tomtom84/mastertomtom842012-03-2310-3/+19
|\ \
| * | add connectable services to right_asidetommy tomson2012-03-2410-3/+19
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 03:30:03 +0000