aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-262-5/+16
| | |\ \ | | |/ / | |/| |
| * | | Diabook-dark more CSS fixes.Thomas Willingham2012-04-252-5/+16
| | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2516-452/+151
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2550-501/+1196
| | |\
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2441-601/+974
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-23222-13881/+170
| | |\ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2267-294/+231
| | |\ \ \ \
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-220-0/+0
* | | | | | | rev update, fix autoname test "random" failurefriendica2012-04-263-32/+35
|/ / / / / /
* | | | | | bug #307, explaining decentralised private photos is impossible.friendica2012-04-251-0/+23
* | | | | | this turns out to be harder than I thoughtfriendica2012-04-252-2/+2
* | | | | | Merge pull request #264 from mschmitt/masterfriendica2012-04-252-78/+112
|\ \ \ \ \ \
| * | | | | | Esperanto at 100% againMartin Schmitt2012-04-252-78/+112
| | |_|_|_|/ | |/| | | |
* | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2512-12/+96
|\| | | | |
| * | | | | Merge pull request #263 from tomtom84/mastertomtom842012-04-2412-12/+96
| |\ \ \ \ \
| | * | | | | diabook-themes: fix css to login.tpltommy tomson2012-04-2512-12/+96
* | | | | | | cleanup - make bb-buttons vanish when comment closedfriendica2012-04-2514-374/+16
|/ / / / / /
* | | | | | restore qcomment selectorfriendica2012-04-247-21/+35
* | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2436-94/+934
|\ \ \ \ \ \
| * | | | | | Merge pull request #262 from tomtom84/masterfriendica2012-04-2422-0/+732
| |\| | | | |
| | * | | | | zero-themes: add bbcode-toolbar to commentboxtommy tomson2012-04-2522-0/+732
| |/ / / / /
| * | | | | diabook-themes: small fixtommy tomson2012-04-253-8/+31
| * | | | | Merge pull request #261 from fabrixxm/eventspagefriendica2012-04-246-82/+167
| |\ \ \ \ \
| | * | | | | quattro: small week calendar view for event/birthday remindersFabio Comuni2012-04-242-0/+40
| | * | | | | remove html from get_birthdays() and get_events()Fabio Comuni2012-04-243-23/+53
| | * | | | | events page: set calendar start date from url (events/[year]/[month]/) and sh...Fabio Comuni2012-04-242-60/+75
| | | |_|_|/ | | |/| | |
| * | | | | Diabook-dark css fixThomas Willingham2012-04-241-3/+3
| * | | | | Diabook-dark, couple of new icons, and another css fix.Thomas Willingham2012-04-244-1/+1
* | | | | | rev updatefriendica2012-04-242-393/+150
|/ / / / /
* / / / / fix tags test with new urlfriendica2012-04-241-2/+2
|/ / / /
* | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2330-463/+737
|\ \ \ \
| * \ \ \ Merge pull request #260 from mschmitt/masterfriendica2012-04-239-459/+733
| |\ \ \ \
| | * | | | Esperanto at 100% againMartin Schmitt2012-04-249-459/+733
| |/ / / /
| * | | | Merge pull request #259 from beardy-unixer/masterfriendica2012-04-2321-4/+4
| |\ \ \ \
| | * | | | Improvements to diabook-darkThomas Willingham2012-04-2421-4/+4
| | * | | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-246-118/+203
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-242106-17706/+98887
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-020-0/+0
| | |\ \ \ \
* | | | | | | separate tag search from body searchfriendica2012-04-235-20/+34
|/ / / / / /
* | | | | | move unfriend to standalone function for use in account removalfriendica2012-04-232-33/+47
* | | | | | more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ...friendica2012-04-234-85/+156
| |_|/ / / |/| | | |
* | | | | DE strings, correction of a typoTobias Diekershoff2012-04-232-198/+98
* | | | | diabok-themes: fixed bug in green-wide and dark-widetommy tomson2012-04-235-12/+12
* | | | | diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpl...tommy tomson2012-04-23211-13669/+5
* | | | | diabook-themes: bugfix in admin-sectiontommy tomson2012-04-231-1/+1
* | | | | allow bbcode representation of html symbols such as © by wrapping in bb ...friendica2012-04-231-0/+3
* | | | | protect jappixmini/proxy from typo check, more work on email2 connectorfriendica2012-04-232-1/+51
| |_|_|/ |/| | |
* | | | bug #388 - notify_comment received after post deletedfriendica2012-04-222-2/+2
* | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2273-714/+1005
|\ \ \ \
| * \ \ \ Merge pull request #258 from unary/apifriendica2012-04-222-13/+36
| |\ \ \ \