| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 85 | -319/+1591 |
| |\ | |||||
| | * | lighten wrapper shadow a bit on dispy | Simon L'nu | 2012-04-13 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | neat little changes. hopefully the shadow will be well recieved | Simon L'nu | 2012-04-13 | 14 | -22/+128 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | well that was a silly mistake... | friendica | 2012-04-13 | 1 | -1/+1 |
| | | | |||||
| | * | diabook-themes: theme-settings: users can set font-size and line-height for ↵ | tommy tomson | 2012-04-13 | 22 | -31/+628 |
| | | | | | | | | | posts and comments | ||||
| | * | diabook: theme-settings: users can set font-size and line-height for posts ↵ | tommy tomson | 2012-04-13 | 7 | -10/+209 |
| | | | | | | | | | and comments | ||||
| | * | diabook-themes: small fixes | tommy tomson | 2012-04-13 | 28 | -75/+249 |
| | | | |||||
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 64 | -10754/+584 |
| | |\ | |||||
| | | * | bug #369 - show contacts who are not in any groups | friendica | 2012-04-12 | 2 | -0/+17 |
| | | | | |||||
| | | * | profile change activities | friendica | 2012-04-12 | 1 | -0/+1 |
| | | | | |||||
| | | * | allow setting default new friend notify | friendica | 2012-04-12 | 1 | -1/+6 |
| | | | | |||||
| | * | | quattro: language icon in navbar | Fabio Comuni | 2012-04-13 | 7 | -6/+44 |
| | | | | |||||
| | * | | move html out of lang_selector() and new template lang_selector.tpl | Fabio Comuni | 2012-04-13 | 1 | -0/+10 |
| | | | | |||||
| | * | | display settings: show theme screenshot on page load | Fabio Comuni | 2012-04-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | quattro: add admin theme settigs. darker items background with a bottom border. | Fabio Comuni | 2012-04-13 | 8 | -126/+79 |
| | | | | |||||
| | * | | admin: change global theme settings | Fabio Comuni | 2012-04-13 | 2 | -1/+37 |
| | | | | |||||
| | * | | quattro: work on | Fabio Comuni | 2012-04-13 | 9 | -52/+188 |
| | | | | | | | | | | | | | | | | | | | | | | "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot | ||||
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 78 | -10831/+657 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/dba.php | ||||
| | * | | diabook-themes: fixed css for settings aside-links | tommy tomson | 2012-04-12 | 20 | -10546/+194 |
| | | | | |||||
| | * | | diabook-themes: css-fixes in aside | tommy tomson | 2012-04-12 | 34 | -140/+261 |
| | | | | |||||
| | * | | fix css in aside | tommy tomson | 2012-04-12 | 12 | -68/+106 |
| | |/ | |||||
| | * | quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons ↵ | Fabio Comuni | 2012-04-12 | 5 | -39/+54 |
| | | | | | | | | | in a toolbar in notifications menu | ||||
| | * | quattro: move center css to style.php. add tpl for generic_links_widget | Fabio Comuni | 2012-04-12 | 3 | -21/+26 |
| | | | |||||
| | * | settings: move tabs to aside. add a new template "generic_links_widget.tpl" | Fabio Comuni | 2012-04-12 | 7 | -12/+11 |
| | | | |||||
| | * | fix the icons a bit | Simon L'nu | 2012-04-12 | 2 | -6/+6 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 96 | -457/+1097 |
| |\| | |||||
| | * | diabook-themes: small fix | tommy tomson | 2012-04-11 | 4 | -11/+11 |
| | | | |||||
| | * | major refactor. step 1 | Simon L'nu | 2012-04-11 | 4 | -71/+108 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | visit "random profile" feature | friendica | 2012-04-10 | 1 | -0/+1 |
| | | | |||||
| | * | make editplain work everywhere | friendica | 2012-04-10 | 3 | -4/+3 |
| | | | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 33 | -275/+350 |
| | |\ | |||||
| | | * | Incorrect tranlation (one negation too much) | Tobias Hößl | 2012-04-10 | 2 | -2/+2 |
| | | | | |||||
| | | * | diabook-themes: smal fix in bbcode-js | tommy tomson | 2012-04-10 | 4 | -1/+25 |
| | | | | |||||
| | | * | diabook-themes: added url and quote to bbcode toolbar under comment box | tommy tomson | 2012-04-10 | 16 | -4/+45 |
| | | | | |||||
| | | * | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 1 | -1/+0 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 1 | -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/master | friendica | 2012-04-09 | 3 | -1/+25 |
| | |\ \ | | | | | | | | | db errors and update error mail | ||||
| | | * \ | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 8 | -0/+0 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 23 | -109/+243 |
| | | |\ \ \ | |||||
| | | * | | | | fixed some typos | Alexander Kampmann | 2012-04-09 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 3 | -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 field | tommy tomson | 2012-04-10 | 40 | -26/+383 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | minor css-fixes | ||||
| | * | | | | diabook-themes: small icon fix | tommy tomson | 2012-04-09 | 14 | -0/+0 |
| | | |_|/ | |/| | | |||||
| | * | | | diabook-nav-icons with gradient | tommy tomson | 2012-04-09 | 8 | -0/+0 |
| | | |/ | |/| | |||||
| | * | | Some new German translations | zottel | 2012-04-09 | 2 | -64/+64 |
| | | | | |||||
| | * | | fixed z-index of youtube-vids | tommy tomson | 2012-04-09 | 21 | -45/+179 |
| | |/ | | | | | | | fixed bug to hide right_side | ||||
| | * | provide theme_init() functions | friendica | 2012-04-08 | 7 | -0/+14 |
| | | | |||||
| * | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 1 | -0/+1 |
| | | | |||||
| * | | API: Tweetdeck is now working | Michael Vogel | 2012-04-09 | 2 | -54/+51 |
| |/ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |