aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\ \ \
| | * | | api: add support for StatusNet-style media param to APIMichael Johnston2012-04-222-13/+36
| * | | | Merge pull request #257 from CatoTH/masterfriendica2012-04-221-0/+2
| |\ \ \ \
| | * | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-04-22748-2940/+62981
| | |\| | |
| | * | | | Add a hookTobias Hößl2012-04-221-0/+2
| * | | | | diabook-themes: bugfixtommy tomson2012-04-2215-27/+31
| * | | | | diabook-themes: fixed youtube-bug and added "Info/Impressum" to footertommy tomson2012-04-2245-101/+108
| | |/ / / | |/| | |
| * | | | DE strings updateTobias Diekershoff2012-04-228-542/+789
| * | | | diabook-themes: comment-bbcode-bugfixtommy tomson2012-04-222-9/+9
| * | | | Merge pull request #256 from simonlnu/masterSimon2012-04-212-22/+30
| |\ \ \ \
| | * | | | fix tinymce themingSimon L'nu2012-04-222-22/+30
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-22384-56031/+194
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-210-0/+0
* | | | | | don't allow non-existent themes as choicesfriendica2012-04-223-151/+52
|/ / / / /
* | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-21382-55989/+76
|\ \ \ \ \
| * | | | | diabook-themes: deleted obsolete diabook-folder & minor bug-fixestommy tomson2012-04-22382-55989/+76
| |/ / / /
* / / / / rev updatefriendica2012-04-212-42/+118
|/ / / /
* | | | rev updatefriendica2012-04-212-416/+560
* | | | Merge pull request #255 from simonlnu/masterSimon2012-04-202-0/+4
|\ \ \ \
| * | | | fix checkbox/radio buttons for some browsersSimon L'nu2012-04-202-0/+4
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-200-0/+0
|/ / / /
* | | | diabook-themes: add diabook-darktommy tomson2012-04-21117-1/+18810
* | | | diabook-themes: add diabook-green and some minor css/bug-fixestommy tomson2012-04-20121-30/+19091
* | | | rev updatefriendica2012-04-202-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:33:48 +0000