aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-1485-319/+1591
|\
| * lighten wrapper shadow a bit on dispySimon L'nu2012-04-131-1/+1
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * neat little changes. hopefully the shadow will be well recievedSimon L'nu2012-04-1314-22/+128
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * well that was a silly mistake...friendica2012-04-131-1/+1
| |
| * diabook-themes: theme-settings: users can set font-size and line-height for ↵tommy tomson2012-04-1322-31/+628
| | | | | | | | posts and comments
| * diabook: theme-settings: users can set font-size and line-height for posts ↵tommy tomson2012-04-137-10/+209
| | | | | | | | and comments
| * diabook-themes: small fixestommy tomson2012-04-1328-75/+249
| |
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-1364-10754/+584
| |\
| | * bug #369 - show contacts who are not in any groupsfriendica2012-04-122-0/+17
| | |
| | * profile change activitiesfriendica2012-04-121-0/+1
| | |
| | * allow setting default new friend notifyfriendica2012-04-121-1/+6
| | |
| * | quattro: language icon in navbarFabio Comuni2012-04-137-6/+44
| | |
| * | move html out of lang_selector() and new template lang_selector.tplFabio Comuni2012-04-131-0/+10
| | |
| * | display settings: show theme screenshot on page loadFabio Comuni2012-04-131-1/+1
| | |
| * | quattro: add admin theme settigs. darker items background with a bottom border.Fabio Comuni2012-04-138-126/+79
| | |
| * | admin: change global theme settingsFabio Comuni2012-04-132-1/+37
| | |
| * | quattro: work onFabio Comuni2012-04-139-52/+188
| | | | | | | | | | | | | | | | | | | | | "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
* | | Merge commit 'upstream/master'Michael Vogel2012-04-1378-10831/+657
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: include/dba.php
| * | diabook-themes: fixed css for settings aside-linkstommy tomson2012-04-1220-10546/+194
| | |
| * | diabook-themes: css-fixes in asidetommy tomson2012-04-1234-140/+261
| | |
| * | fix css in asidetommy tomson2012-04-1212-68/+106
| |/
| * quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons ↵Fabio Comuni2012-04-125-39/+54
| | | | | | | | in a toolbar in notifications menu
| * quattro: move center css to style.php. add tpl for generic_links_widgetFabio Comuni2012-04-123-21/+26
| |
| * settings: move tabs to aside. add a new template "generic_links_widget.tpl"Fabio Comuni2012-04-127-12/+11
| |
| * fix the icons a bitSimon L'nu2012-04-122-6/+6
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge commit 'upstream/master'Michael Vogel2012-04-1196-457/+1097
|\|
| * diabook-themes: small fixtommy tomson2012-04-114-11/+11
| |
| * major refactor. step 1Simon L'nu2012-04-114-71/+108
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * visit "random profile" featurefriendica2012-04-101-0/+1
| |
| * 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
| |
* | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+1
| |
* | API: Tweetdeck is now workingMichael Vogel2012-04-092-54/+51
|/