| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-17 | 36 | -2217/+1611 |
| |\ | |||||
| | * | diabook-themes: removed fpostit due to security issues and small fix in ↵ | tommy tomson | 2012-04-17 | 33 | -754/+39 |
| | | | | | | | | | german translation | ||||
| | * | finally fix the ui in the settings. it was fugly.... other bug fixes too | Simon L'nu | 2012-04-17 | 3 | -1463/+1572 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | update to the German string files | Tobias Diekershoff | 2012-04-17 | 2 | -942/+1280 |
| |/ | |||||
| * | diabook-themes: bugfix (sry, necessary) | tommy tomson | 2012-04-16 | 12 | -12/+52 |
| | | |||||
| * | diabook-themes: small bug/css-fixes ---> ver. 1.019 | tommy tomson | 2012-04-16 | 26 | -21/+419 |
| | | |||||
| * | diabook-themes: bug-fixes | tommy tomson | 2012-04-16 | 12 | -48/+68 |
| | | |||||
| * | diabook-themes: minor bugfixes | tommy tomson | 2012-04-16 | 12 | -25/+59 |
| | | |||||
| * | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 2 | -54/+52 |
| |\ | | | | | API: Support of the statusnet application | ||||
| | * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 85 | -319/+1591 |
| | |\ | |||||
| | * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 78 | -10831/+657 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | ||||
| | * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 96 | -457/+1097 |
| | |\ \ \ | |||||
| | * | | | | 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 |
| | | | | | | |||||
| * | | | | | diabook-themes: css-fixes | tommy tomson | 2012-04-15 | 17 | -24/+88 |
| | | | | | | |||||
| * | | | | | where did this "lang" string come from and why? | friendica | 2012-04-15 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | REALLY fix fpostit this time | Simon L'nu | 2012-04-15 | 15 | -82/+159 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | | fix fpostJS, add and fix some other stuff | Simon L'nu | 2012-04-15 | 6 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | | diabook-themes: added js for auto-growing comment-textareas | tommy tomson | 2012-04-15 | 12 | -4/+238 |
| | | | | | | |||||
| * | | | | | diabook: theme-settings: add a wide-option | tommy tomson | 2012-04-15 | 43 | -11/+8147 |
| | | | | | | |||||
| * | | | | | Merge pull request #234 from copyninja/master | friendica | 2012-04-14 | 150 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Executable permisson removal on files which are not elf/script | ||||
| | * | | | | | Another bunch of executable permission removal | Vasudev Kamath | 2012-04-14 | 119 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | Removed execution permission: lintian warning in Debian packaging | Vasudev Kamath | 2012-04-14 | 31 | -0/+0 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | string fix: typo. slow down scroll to top in dispys | Simon L'nu | 2012-04-14 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | | bogus empty list element in dfrn_request page when emailnet not enabled | friendica | 2012-04-14 | 2 | -2/+2 |
| |/ / / / | |||||
| * | | | | 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 |
| | | |_|/ | |/| | | |||||
| | * | | | 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: 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 | ||||
| * | | | 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> | ||||
| * | | 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> | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |