| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 5 | -7/+54 |
| |\ | |||||
| | * | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 2 | -6/+31 |
| | | | |||||
| | * | css hack to make remote channel menu header look in line with the rest if in ↵ | Mario Vavti | 2017-05-05 | 1 | -0/+6 |
| | | | | | | | | | collapsed state | ||||
| | * | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| | * | German translations for demohub | Andrew Manning | 2017-05-03 | 1 | -0/+16 |
| | | | |||||
| * | | more cleanup | zotlabs | 2017-05-02 | 1 | -0/+3 |
| | | | |||||
| * | | profile_sidebar hook ignored the updated html content | zotlabs | 2017-05-02 | 1 | -69/+0 |
| | | | |||||
| * | | Revert "move theme specific files to theme dir" | zotlabs | 2017-05-02 | 277 | -0/+0 |
| | | | | | | | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c. | ||||
| * | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -0/+0 |
| | | | |||||
| * | | add cdav files | zotlabs | 2017-05-01 | 4 | -0/+998 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 1 | -0/+1 |
| |\| | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 1 | -0/+1 |
| | |\ | |||||
| | | * | When template "none" is used in a webpage layout, then the contents of the ↵ | Andrew Manning | 2017-04-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | page should be the sole output, with no other code before or after the page element content. | ||||
| | * | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-26 | 1 | -5/+2 |
| | |/ | |||||
| * | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 1 | -5/+2 |
| | | | |||||
| * | | give the item_obscured flag a new lease on life by using it to designate ↵ | zotlabs | 2017-04-18 | 1 | -0/+3 |
| | | | | | | | | | third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends. | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-18 | 7 | -7/+7 |
| |\| | |||||
| | * | more lock carets | Mario Vavti | 2017-04-18 | 4 | -4/+4 |
| | | | |||||
| | * | the caret beside the lock seems a little overkill | Mario Vavti | 2017-04-18 | 3 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 7 | -11230/+10653 |
| |\| | |||||
| | * | missing clearfix | Mario Vavti | 2017-04-16 | 1 | -1/+1 |
| | | | |||||
| | * | css fixes | Mario Vavti | 2017-04-16 | 1 | -4/+4 |
| | | | |||||
| | * | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | As a follow up to issue #699 update SimplePie from 1.2.1-dev (around 6years old) to current git master (1.4.4-dev). We use the master branch until the next release because it contains our patch for enclosure titles already. The other patches in the library from us can be done by configuring the SimplePie object in our code instead. Used composer to manage this library and use class autoloading. Add some unit tests for include/feedutils.php, but the interesting parts are unfortunately not testable with the current code. | ||||
| | * | missing includes | Mario Vavti | 2017-04-13 | 1 | -1/+1 |
| | | | |||||
| | * | bs font set might work better for win and mac | Mario Vavti | 2017-04-13 | 1 | -1/+0 |
| | | | |||||
| | * | Merge pull request #714 from mjfriaza/dev | git-marijus | 2017-04-11 | 2 | -11218/+10642 |
| | |\ | | | | | | | Updated the Spanish translation | ||||
| | | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-04-10 | 2 | -11218/+10642 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 3 | -11094/+10565 |
| |\| | | |||||
| | * | | Merge pull request #712 from zotlabs/fr_update | git-marijus | 2017-04-07 | 2 | -11080/+10559 |
| | |\ \ | | | | | | | | | Fr update (Monret) | ||||
| | | * | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
| | | | | | |||||
| | | * | | Revert "fr strings update (Monret)" | zotlabs | 2017-04-03 | 2 | -10559/+11080 |
| | | | | | | | | | | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e. | ||||
| | | * | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
| | | | | | |||||
| | * | | | the string was there but the template var was wrong | Mario Vavti | 2017-04-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | css fixes and missing string | Mario Vavti | 2017-04-07 | 1 | -14/+6 |
| | | | | | |||||
| * | | | | fix from downstream | zotlabs | 2017-04-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | revert grid and bars icon size change | zotlabs | 2017-04-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-05 | 4 | -10/+3 |
| |\| | | | |||||
| | * | | | we should probably stick to 0.875rem font-size (this is equal to 14px with a ↵ | Mario Vavti | 2017-04-05 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size. | ||||
| | * | | | adjust font-size | Mario Vavti | 2017-04-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | update bd-dev and remove hotfix | Mario Vavti | 2017-04-05 | 1 | -7/+0 |
| | |/ / | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 13 | -59/+57 |
| |\| | | |||||
| | * | | triple a is more sane | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | minor css adjustments | Mario Vavti | 2017-03-31 | 1 | -1/+5 |
| | | | | |||||
| | * | | various form css fixes | Mario Vavti | 2017-03-31 | 10 | -42/+38 |
| | | | | |||||
| | * | | make btn-outline-secondary color slightly darker | Mario Vavti | 2017-03-31 | 1 | -0/+4 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-31 | 2 | -7/+2 |
| | |\ \ | |||||
| | | * \ | Merge pull request #710 from dawnbreak/importcsrf | git-marijus | 2017-03-31 | 2 | -7/+2 |
| | | |\ \ | | | | | | | | | | | :lock: Add CSRF protection for import and import_items. | ||||
| | * | | | | css fixes | Mario Vavti | 2017-03-31 | 3 | -17/+9 |
| | |/ / / | |||||
| | * | | | add max height to #navbar-collapse-2 | Mario Vavti | 2017-03-31 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -7/+2 |
| |\ \ \ \ | | |/ / | |/| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |