aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #265 from cvogeley/masterfriendica2012-04-2614-2/+999
|\ | | | | cleanzero theme added
| * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-0/+71
| | | | | | | | to avoid breaking of design
| * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-2/+5
| | | | | | | | to avoid breaking of design
| * added BBCODE thing in commentsChristian Vogeley2012-04-251-0/+38
| |
| * add cleanzero themeChristian Vogeley2012-04-2512-0/+885
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-266-6358/+6809
|\ \
| * \ Merge pull request #266 from simonlnu/masterSimon2012-04-254-6353/+6793
| |\ \ | | | | | | | | convert stylesheets to less, and compress output css
| | * | convert stylesheets to less, and compress output cssSimon L'nu2012-04-264-6353/+6793
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-262-5/+16
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: Diabook-dark more CSS fixes. * master:
| * | | Diabook-dark more CSS fixes.Thomas Willingham2012-04-252-5/+16
| | |/ | |/| | | | | | | Slowly getting there.
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2516-452/+151
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #307, explaining decentralised private photos is impossible. this turns out to be harder than I thought cleanup - make bb-buttons vanish when comment closed Esperanto at 100% again * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2550-501/+1196
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: fix css to login.tpl restore qcomment selector rev update zero-themes: add bbcode-toolbar to commentbox diabook-themes: small fix Diabook-dark css fix Diabook-dark, couple of new icons, and another css fix. fix tags test with new url quattro: small week calendar view for event/birthday reminders remove html from get_birthdays() and get_events() events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) * master:
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2441-601/+974
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: separate tag search from body search Esperanto at 100% again Improvements to diabook-dark move unfriend to standalone function for use in account removal more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-23222-13881/+170
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE strings, correction of a typo diabok-themes: fixed bug in green-wide and dark-wide diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders diabook-themes: bugfix in admin-section allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets protect jappixmini/proxy from typo check, more work on email2 connector * master:
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2267-294/+231
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #388 - notify_comment received after post deleted don't allow non-existent themes as choices diabook-themes: bugfix diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer api: add support for StatusNet-style media param to API Add a hook * master:
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE strings update diabook-themes: comment-bbcode-bugfix * master:
* | | | | | | 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% again
| * | | | | | 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.tpl
| | * | | | | 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 commentbox
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Some tweak on events page and events/bitrhdays reminder
| | * | | | | 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 ↵Fabio Comuni2012-04-242-60/+75
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | show event popup from url anchor (#link-[event id])
| * | | | | 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% again
| | * | | | Esperanto at 100% againMartin Schmitt2012-04-249-459/+733
| |/ / / /
| * | | | Merge pull request #259 from beardy-unixer/masterfriendica2012-04-2321-4/+4
| |\ \ \ \ | | | | | | | | | | | | Diabook-dark
| | * | | | Improvements to diabook-darkThomas Willingham2012-04-2421-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Still a long way to go, but some icons and a few CSS fixes
| | * | | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-246-118/+203
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | Merge upstream
| | * | | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-242106-17706/+98887
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | Merge upstream
| | * | | | 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
| |_|/ / / |/| | | | | | | | | | | | | | autocomplete of PM recips
* | | | | DE strings, correction of a typoTobias Diekershoff2012-04-232-198/+98
| | | | |