| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |/ | |||||
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-08 | 15 | -30/+43 |
| |\ | |||||
| | * | minor dispy* fixes | Simon L'nu | 2012-04-07 | 7 | -30/+35 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | diabook-themes: small fix | tommy tomson | 2012-04-07 | 8 | -0/+8 |
| | | | |||||
| * | | "vier": Some design stuff | Michael Vogel | 2012-04-07 | 1 | -0/+1 |
| | | | |||||
| * | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-07 | 493 | -1342/+3345 |
| |\| | |||||
| | * | changelog 1.014 : | tommy tomson | 2012-04-07 | 37 | -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/master | tomtom84 | 2012-04-06 | 173 | -51/+126 |
| | |\ | | | | | | | fixes in diabook-derivates | ||||
| | | * | new-contacts-introductions in contacts-drop-down and new-messages in ↵ | tommy tomson | 2012-04-06 | 173 | -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 strings | Tobias Diekershoff | 2012-04-06 | 2 | -19/+19 |
| | |/ | |||||
| | * | update to the German strings | Tobias Diekershoff | 2012-04-06 | 2 | -1216/+1850 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 890 | -5398/+45119 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | | | "vier": Bookmarks now look better. | Michael Vogel | 2012-04-07 | 2 | -0/+10 |
| | | | | |||||
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-06 | 84 | -4038/+567 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | finish styling category tags and category input | Simon L'nu | 2012-04-05 | 2 | -0/+20 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | style categorytags | Simon L'nu | 2012-04-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | update the dispy* templates | Simon L'nu | 2012-04-04 | 19 | -131/+188 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | move alert box away from nav links | friendica | 2012-04-04 | 1 | -1/+4 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |