Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\| | |||||
| * | fix app-icon color and use bs class for w100 | Mario Vavti | 2017-03-26 | 2 | -2/+2 |
| | | |||||
| * | fix nav menu caret | Mario Vavti | 2017-03-26 | 1 | -1/+1 |
| | | |||||
| * | fix and cleanup custom theme settings | Mario Vavti | 2017-03-26 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 106 | -1165/+1171 |
|\| | |||||
| * | fix active state | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | |||||
| * | missing badge-default class | Mario Vavti | 2017-03-24 | 2 | -3/+3 |
| | | |||||
| * | do not return false here. it can lead to unresponsive links under certain ↵ | Mario Vavti | 2017-03-24 | 1 | -1/+1 |
| | | | | | | | | situations. | ||||
| * | fix viewconnections | Mario Vavti | 2017-03-23 | 1 | -12/+10 |
| | | |||||
| * | bs4 fixes for events | Mario Vavti | 2017-03-23 | 4 | -26/+33 |
| | | |||||
| * | fix embed image modals | Mario Vavti | 2017-03-22 | 4 | -29/+29 |
| | | |||||
| * | css fixes | Mario Vavti | 2017-03-22 | 1 | -40/+52 |
| | | |||||
| * | add generic-icons-nav class | Mario Vavti | 2017-03-21 | 1 | -1/+1 |
| | | |||||
| * | add icon, name and thumb to profile tabs. remove login app - we have login ↵ | Mario Vavti | 2017-03-21 | 1 | -1/+2 |
| | | | | | | | | in the panel now. | ||||
| * | missing template | Mario Vavti | 2017-03-21 | 1 | -0/+4 |
| | | |||||
| * | really fix fullscreen and fix some issues in chat | Mario Vavti | 2017-03-20 | 1 | -9/+9 |
| | | |||||
| * | fix webpages widgets | Mario Vavti | 2017-03-20 | 2 | -77/+53 |
| | | |||||
| * | fix fullscreen and bbco_autocomplete popup rendering | Mario Vavti | 2017-03-20 | 1 | -1/+1 |
| | | |||||
| * | minor fixes | Mario Vavti | 2017-03-20 | 1 | -2/+2 |
| | | |||||
| * | update to latest bs4 from git and change hidden-* classes to d-* | Mario Vavti | 2017-03-20 | 13 | -47/+47 |
| | | |||||
| * | reflect count in modal | Mario Vavti | 2017-03-19 | 2 | -2/+2 |
| | | |||||
| * | open like-modal directly if more than 10 likes | Mario Vavti | 2017-03-19 | 2 | -15/+9 |
| | | |||||
| * | typo | Mario Vavti | 2017-03-19 | 1 | -1/+1 |
| | | |||||
| * | css fixes | Mario Vavti | 2017-03-19 | 1 | -2/+2 |
| | | |||||
| * | bs4 fixes | Mario Vavti | 2017-03-19 | 2 | -19/+6 |
| | | |||||
| * | bs4 fixes | Mario Vavti | 2017-03-18 | 4 | -7/+8 |
| | | |||||
| * | more abook_edit and some css | Mario Vavti | 2017-03-18 | 1 | -6/+8 |
| | | |||||
| * | more abook_edit | Mario Vavti | 2017-03-18 | 1 | -3/+3 |
| | | |||||
| * | fix abook_edit and private mail | Mario Vavti | 2017-03-18 | 2 | -31/+30 |
| | | |||||
| * | bs4 fixes | Mario Vavti | 2017-03-18 | 6 | -57/+52 |
| | | |||||
| * | fix item_list and item_search templates. make item filer use a bootdtrap ↵ | Mario Vavti | 2017-03-17 | 13 | -211/+253 |
| | | | | | | | | modal and some css and class fixes | ||||
| * | re-add spaces between tags | Mario Vavti | 2017-03-15 | 1 | -1/+1 |
| | | |||||
| * | style hashtags, mentions and categories. hide expand-aside button if not ↵ | Mario Vavti | 2017-03-15 | 3 | -12/+15 |
| | | | | | | | | needed. css and class fixes |