| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 3 | -3/+3 |
| |\ | |||||
| | * | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 2 | -6/+30 |
| |\| | |||||
| | * | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 1 | -5/+29 |
| | | | |||||
| | * | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | 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/+12312 |
| | | | | | | | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c. | ||||
| * | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -12312/+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 | 3 | -7/+7 |
| |\| | |||||
| | * | missing clearfix | Mario Vavti | 2017-04-16 | 1 | -1/+1 |
| | | | |||||
| | * | :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 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 1 | -14/+6 |
| |\| | |||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 10 | -35/+29 |
| |\| | |||||
| | * | various form css fixes | Mario Vavti | 2017-03-31 | 8 | -29/+26 |
| | | | |||||
| | * | 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 | 1 | -6/+2 |
| | |/ / | |||||
| | * | | add max height to #navbar-collapse-2 | Mario Vavti | 2017-03-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -7/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 2 | -7/+2 |
| | |/ | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-29 | 2 | -4/+4 |
| |\| | |||||
| | * | allow setting the system email name/address/reply | zotlabs | 2017-03-29 | 1 | -0/+5 |
| | | | |||||
| | * | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-29 | 1 | -3/+3 |
| | | | | | | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact | ||||
| | * | more markdown purification | zotlabs | 2017-03-29 | 1 | -2/+1 |
| | | | |||||
| | * | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-29 | 1 | -1/+1 |
| | | | | | | | | | the wiki | ||||
| | * | various input filter fixes | zotlabs | 2017-03-29 | 1 | -1/+2 |
| | | | |||||
| | * | dim class was un-themed | zotlabs | 2017-03-29 | 1 | -3/+3 |
| | | | |||||
| | * | remove the unimplemented upload limit site settings | zotlabs | 2017-03-29 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 4 | -30/+30 |
| |\| | |||||
| | * | minor bs4 fixes | Mario Vavti | 2017-03-28 | 3 | -11/+11 |
| | | | |||||
| | * | fixes for latest bootstrap | Mario Vavti | 2017-03-28 | 1 | -19/+19 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 4 | -36/+26 |
| |\| | |||||
| | * | fix app rendering | Mario Vavti | 2017-03-27 | 3 | -5/+4 |
| | | | |||||
| | * | unify css classes | Mario Vavti | 2017-03-27 | 1 | -8/+10 |
| | | | |||||
| | * | css fixes | Mario Vavti | 2017-03-27 | 1 | -25/+14 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-26 | 3 | -5/+5 |
| |\| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |