aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* make editplain work everywherefriendica2012-04-103-4/+3
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1033-275/+350
|\
| * Incorrect tranlation (one negation too much)Tobias Hößl2012-04-102-2/+2
| |
| * diabook-themes: smal fix in bbcode-jstommy tomson2012-04-104-1/+25
| |
| * diabook-themes: added url and quote to bbcode toolbar under comment boxtommy tomson2012-04-1016-4/+45
| |
| * aaah, nice asides ;). we'll be updating these soonSimon L'nu2012-04-1011-268/+278
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-101-1/+0
|\ \ | |/ |/|
| * Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-091-1/+0
| | | | | | | | | | This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow?
* | Merge pull request #218 from campino/masterfriendica2012-04-093-1/+25
|\ \ | | | | | | db errors and update error mail
| * \ Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-098-0/+0
| |\ \
| * \ \ Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0923-109/+243
| |\ \ \
| * | | | fixed some typosAlexander Kampmann2012-04-091-1/+1
| | | | |
| * | | | added exceptions to dba classAlexander Kampmann2012-04-093-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email
* | | | | bbcode toolbar attached to the comment text fieldtommy tomson2012-04-1040-26/+383
| |_|_|/ |/| | | | | | | | | | | minor css-fixes
* | | | diabook-themes: small icon fixtommy tomson2012-04-0914-0/+0
| |_|/ |/| |
* | | diabook-nav-icons with gradienttommy tomson2012-04-098-0/+0
| |/ |/|
* | Some new German translationszottel2012-04-092-64/+64
| |
* | fixed z-index of youtube-vidstommy tomson2012-04-0921-45/+179
|/ | | | fixed bug to hide right_side
* provide theme_init() functionsfriendica2012-04-087-0/+14
|
* Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
|\
| * minor dispy* fixesSimon L'nu2012-04-077-30/+35
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * diabook-themes: small fixtommy tomson2012-04-078-0/+8
| |
* | "vier": Some design stuffMichael Vogel2012-04-071-0/+1
| |
* | Merge commit 'upstream/master'Michael Vogel2012-04-07493-1342/+3345
|\|
| * changelog 1.014 :tommy tomson2012-04-0737-79/+1373
| | | | | | | | | | | | | | | | | | | | | | | | image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed
| * Merge pull request #210 from tomtom84/mastertomtom842012-04-06173-51/+126
| |\ | | | | | | fixes in diabook-derivates
| | * new-contacts-introductions in contacts-drop-down and new-messages in ↵tommy tomson2012-04-06173-51/+126
| | | | | | | | | | | | | | | | | | | | | messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
| * | small fixes for the German stringsTobias Diekershoff2012-04-062-19/+19
| |/
| * update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| |
| * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-05890-5398/+45119
| |\ | | | | | | | | | | | | | | | Conflicts: include/config.php update.php
* | | "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0684-4038/+567
|\ \ \ | | |/ | |/|
| * | finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | style categorytagsSimon L'nu2012-04-042-4/+4
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | move alert box away from nav linksfriendica2012-04-041-1/+4
| | |
| * | latest changes are the popup menu for notifs, fixesSimon L'nu2012-04-042-20/+38
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'pull'friendica2012-04-0324-120/+313
| |\ \
| | * | smal fixtommy tomson2012-04-031-1/+1
| | | |
| | * | german translation for right_asidetommy tomson2012-04-031-0/+8
| | | |
| | * | make right_aside translatable and provide german translation...tommy tomson2012-04-0323-119/+304
| | | | | | | | | | | | | | | | and some css-fixes
| * | | remove loozah themes which fell too far behind to recoverfriendica2012-04-0339-3762/+0
| |/ /
* | | API: template for test function addedMichael Vogel2012-04-021-0/+1
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0265-470/+1540
|\| |
| * | diabook-themes: css-fixestommy tomson2012-04-0224-20/+125
| | |
| * | diabook-themes: fixes in jstommy tomson2012-04-024-112/+115
| | |
| * | diabook-themes: fixed pageheadertommy tomson2012-04-0217-68/+98
| | |
| * | diabook-themes: bugfixes / css-fixestommy tomson2012-04-0217-17/+30
| | |
| * | allow users to set categories on their postsMichael Johnston2012-04-014-11/+33
| | |
| * | diabook-themes: add link to global dir in "find friends" at right_asidetommy tomson2012-04-0212-12/+20
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 15:10:20 +0000