Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #529 from phellmes/dev | git-marijus | 2016-09-22 | 2 | -7794/+8199 |
|\ | | | | | Update DE translation strings | ||||
| * | Update DE translation strings | phellmes | 2016-09-22 | 2 | -7794/+8199 |
| | | |||||
* | | Merge pull request #530 from wave72/dev | Wave | 2016-09-22 | 2 | -5106/+5151 |
|\ \ | |/ |/| | Updated Italian strings | ||||
| * | Updated Italian strings | Wave72 | 2016-09-22 | 2 | -5106/+5151 |
| | | |||||
* | | objects with id=share_container seem to be blacklisted in various security ↵ | Mario Vavti | 2016-09-22 | 2 | -16/+4 |
| | | | | | | | | browser plugins. rename it to distr_container. also remove some superfluous js | ||||
* | | add bootstrap .css.map files | Mario Vavti | 2016-09-22 | 4 | -0/+4 |
| | | |||||
* | | fix #525 | Mario Vavti | 2016-09-22 | 1 | -1/+1 |
| | | |||||
* | | issue #522 - replace && with AND in sql query. | redmatrix | 2016-09-21 | 1 | -1/+1 |
| | | |||||
* | | issue #521, add 'map' extension to files served natively by nginx without ↵ | redmatrix | 2016-09-21 | 1 | -1/+1 |
| | | | | | | | | using the project controller | ||||
* | | finish the channel_reddress() conversion | redmatrix | 2016-09-21 | 9 | -19/+19 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | typo | Mario Vavti | 2016-09-21 | 1 | -1/+1 |
| | | | |||||
* | | | zot discovery wasn't returning in all cases (after discovering zot), which ↵ | redmatrix | 2016-09-21 | 1 | -1/+3 |
|/ / | | | | | | | means that it could fall through and also discover other protocols and create xchans for them. | ||||
* | | issue #516 | redmatrix | 2016-09-20 | 1 | -65/+58 |
| | | |||||
* | | issue #519 | redmatrix | 2016-09-20 | 1 | -2/+5 |
| | | |||||
* | | issue #520 | redmatrix | 2016-09-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-20 | 1 | -12/+8 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-09-20 | 2 | -1/+7 |
| |\ \ | |||||
| * | | | narrow navbar css fixes | Mario Vavti | 2016-09-20 | 1 | -12/+8 |
| | | | | |||||
* | | | | issue #515 | redmatrix | 2016-09-20 | 1 | -2/+5 |
| |/ / |/| | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-20 | 2 | -4/+57 |
|\| | | |||||
| * | | remove redundant loop | Mario Vavti | 2016-09-20 | 1 | -4/+0 |
| | | | |||||
| * | | update changelog | Mario Vavti | 2016-09-20 | 1 | -0/+57 |
| | | | |||||
* | | | don't offer a settings/features link for techlevel 0 (basic or pro:0) even ↵ | redmatrix | 2016-09-20 | 1 | -1/+1 |
| | | | | | | | | | | | | if there are level 0 features/categories. The definition of level 0 is "don't confuse me with options". | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-19 | 3 | -3/+3 |
|\| | | |||||
| * | | if a feature category array has no items unset it | Mario Vavti | 2016-09-19 | 1 | -1/+1 |
| | | | |||||
| * | | erge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-09-19 | 1 | -86/+377 |
| |\ \ | | | | | | | | | | | | | Merge erforderlich ist, insbesondere wenn es einen aktualisierten | ||||
| * | | | fix issue #517 | Mario Vavti | 2016-09-19 | 2 | -2/+2 |
| | | | | |||||
* | | | | probable fix for #509 - errant comment notifications provided on delayed ↵ | redmatrix | 2016-09-19 | 1 | -0/+6 |
| |/ / |/| | | | | | | | | (duplicate delivery) top level posts which are probably coming from clones | ||||
* | | | pro: filter features by techlevel | redmatrix | 2016-09-19 | 1 | -86/+377 |
|/ / | |||||
* | | a couple more namespace issues with exception handlers | redmatrix | 2016-09-18 | 1 | -1/+1 |
| | | |||||
* | | couple of minor issues with dba namespace during install and enotify::format ↵ | redmatrix | 2016-09-18 | 2 | -6/+12 |
| | | | | | | | | referencing an unknown variable | ||||
* | | some changes merged from wrong branch... new function channel_reddress() ↵ | redmatrix | 2016-09-17 | 9 | -3488/+3504 |
| | | | | | | | | instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file | ||||
* | | do not show hidden channels in /randprof issue #513 | Mario Vavti | 2016-09-15 | 1 | -1/+1 |
| | | |||||
* | | fix #514 | Mario Vavti | 2016-09-15 | 1 | -1/+1 |
| | | |||||
* | | fix #512 | Mario Vavti | 2016-09-15 | 1 | -1/+1 |
| | | |||||
* | | add new locale file | Mario Vavti | 2016-09-14 | 1 | -0/+5 |
| | | |||||
* | | upgrade fullcalendar to version 3 | Mario Vavti | 2016-09-14 | 10 | -950/+1721 |
| | | |||||
* | | fix settings/account | Mario Vavti | 2016-09-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-09 | 9 | -4931/+4994 |
|\ \ | |||||
| * | | whitelist button tag in htmlpurifier | Mario Vavti | 2016-09-09 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #510 from wave72/dev | Wave | 2016-09-09 | 2 | -4745/+4849 |
| |\| | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Wave72 | 2016-09-09 | 2 | -4745/+4849 |
| | | | |||||
| * | | version bump due to js caching issue | Mario Vavti | 2016-09-09 | 1 | -1/+1 |
| | | | |||||
| * | | update justifiedGallery 3.6.1 -> 3.6.3 | Mario Vavti | 2016-09-09 | 5 | -185/+141 |
| | | | |||||
* | | | issue #511, postgres schema issues | redmatrix | 2016-09-09 | 2 | -4250/+4299 |
|/ / | |||||
* | | fix for old style version specifiers | redmatrix | 2016-09-08 | 2 | -3/+5 |
| | | |||||
* | | more get rid of illegal offset in include/conversation | redmatrix | 2016-09-08 | 3 | -7/+10 |
| | | |||||
* | | illegal offset errors in include/conversation:status_editor() when no ↵ | redmatrix | 2016-09-08 | 1 | -0/+4 |
| | | | | | | | | permissions array is passed | ||||
* | | comanche: simple test issue | redmatrix | 2016-09-08 | 1 | -2/+1 |
| | |