aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-03-1728-306/+488
|\
| * Merge pull request #143 from simonlnu/masterSimon2012-03-161-0/+3
| |\
| | * make auto-complete in darkzero-NS. other themes can use this easily. might ne...Simon L'nu2012-03-161-0/+3
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-162-7/+18
| | |\ | | |/ | |/|
| * | convert boolean or int settings to strings to work around issues with templat...friendica2012-03-161-7/+7
| * | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| |/
| * Merge branch 'pull'friendica2012-03-1619-200/+325
| |\
| | * Merge pull request #142 from simonlnu/masterSimon2012-03-162-0/+18
| | |\
| | | * make profiles-menu disappear when clicked outside itSimon L'nu2012-03-162-0/+18
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | |/
| | * Merge pull request #141 from CatoTH/masterSimon2012-03-164-10/+18
| | |\
| | | * Bugfix of old IEsTobias Hößl2012-03-161-1/+1
| | | * Forgot to remove a debug lineTobias Hößl2012-03-161-1/+0
| | | * Use tabindex to enable easy navigation in the dialog to write private mails; ...Tobias Hößl2012-03-164-11/+20
| | * | Merge pull request #140 from simonlnu/masterSimon2012-03-1615-195/+294
| | |\ \
| | | * | weee, dispys get another updateSimon L'nu2012-03-1615-195/+294
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-165-98/+141
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | | |\ \
| * | | | | wrong link in d* comment notificationsfriendica2012-03-162-2/+2
| |/ / / /
| * | | | syntax error from pasted text, remove ^M'sfriendica2012-03-161-96/+96
| * | | | bug #335 network search broken after new ssl policy settingsfriendica2012-03-162-2/+2
| * | | | whitespacefriendica2012-03-161-0/+1
| * | | | notification for disapora commentsfriendica2012-03-161-0/+42
| | |_|/ | |/| |
* | | | Merge remote branch 'upstream/master'zottel2012-03-1644-170/+547
|\| | |
| * | | Merge pull request #139 from simonlnu/masterSimon2012-03-151-1/+1
| |\| | | | |/ | |/|
| | * missing close double quote in mail_list.tplSimon L'nu2012-03-161-1/+1
| * | Merge pull request #138 from simonlnu/masterSimon2012-03-151-0/+6
| |\|
| | * more changes in dispy-darkSimon L'nu2012-03-161-0/+6
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| |/
| * turn indexes back off (this is from an errant checkin a year or more ago)friendica2012-03-151-1/+1
| * Merge branch 'pull'friendica2012-03-1515-32/+86
| |\
| | * Merge pull request #137 from tomtom84/mastertomtom842012-03-1515-32/+86
| | |\
| | | * added icons to profile_side, fixes in csstommy tomson2012-03-1615-32/+86
| | |/
| * / undo git stuffupfriendica2012-03-153-4/+8
| |/
| * Merge branch 'pull'friendica2012-03-1528-157/+448
| |\
| | * Merge pull request #136 from annando/masterfriendica2012-03-1512-71/+329
| | |\
| | | * html2bbcode: Disabled size conversionMichael Vogel2012-03-151-9/+9
| | | * Merge commit 'upstream/master'Michael Vogel2012-03-15114-870/+2820
| | | |\
| | | * | Mail: Subject are now with working "Re:"Michael Vogel2012-03-122-43/+14
| | | * | Removing test exportsMichael Vogel2012-03-112-4/+4
| | | * | Missing field in database.sqlMichael Vogel2012-03-111-0/+1
| | | * | Removed changesMichael Vogel2012-03-112-19/+11
| | | * | Merge commit 'upstream/master'Michael Vogel2012-03-1162-555/+7192
| | | |\ \
| | | * | | Added config options for the item cache and the ostatus priorityMichael Vogel2012-03-111-0/+6
| | | * | | Item cache now is one day.Michael Vogel2012-03-111-1/+1
| | | * | | Corrected some git problemsMichael Vogel2012-03-112-89/+0
| | | * | | Cache: item cache now has an autodelete of old files. The pages plugin now se...Michael Vogel2012-03-113-3/+17
| | | * | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-112-12/+61
| | | * | | New plugin that shows community pages in the sidebarMichael Vogel2012-03-112-0/+42
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 09:14:55 +0000