aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update DE translation stringsphellmes2016-09-222-7794/+8199
* objects with id=share_container seem to be blacklisted in various security br...Mario Vavti2016-09-222-16/+4
* add bootstrap .css.map filesMario Vavti2016-09-224-0/+4
* fix #525Mario Vavti2016-09-221-1/+1
* issue #522 - replace && with AND in sql query.redmatrix2016-09-211-1/+1
* issue #521, add 'map' extension to files served natively by nginx without usi...redmatrix2016-09-211-1/+1
* finish the channel_reddress() conversionredmatrix2016-09-219-19/+19
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-211-1/+1
|\
| * typoMario Vavti2016-09-211-1/+1
* | zot discovery wasn't returning in all cases (after discovering zot), which me...redmatrix2016-09-211-1/+3
|/
* issue #516redmatrix2016-09-201-65/+58
* issue #519redmatrix2016-09-201-2/+5
* issue #520redmatrix2016-09-201-0/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-201-12/+8
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-09-202-1/+7
| |\
| * | narrow navbar css fixesMario Vavti2016-09-201-12/+8
* | | issue #515redmatrix2016-09-201-2/+5
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-202-4/+57
|\|
| * remove redundant loopMario Vavti2016-09-201-4/+0
| * update changelogMario Vavti2016-09-201-0/+57
* | don't offer a settings/features link for techlevel 0 (basic or pro:0) even if...redmatrix2016-09-201-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-193-3/+3
|\|
| * if a feature category array has no items unset itMario Vavti2016-09-191-1/+1
| * erge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-09-191-86/+377
| |\
| * | fix issue #517Mario Vavti2016-09-192-2/+2
* | | probable fix for #509 - errant comment notifications provided on delayed (dup...redmatrix2016-09-191-0/+6
| |/ |/|
* | pro: filter features by techlevelredmatrix2016-09-191-86/+377
|/
* a couple more namespace issues with exception handlersredmatrix2016-09-181-1/+1
* couple of minor issues with dba namespace during install and enotify::format ...redmatrix2016-09-182-6/+12
* some changes merged from wrong branch... new function channel_reddress() inst...redmatrix2016-09-179-3488/+3504
* do not show hidden channels in /randprof issue #513Mario Vavti2016-09-151-1/+1
* fix #514Mario Vavti2016-09-151-1/+1
* fix #512Mario Vavti2016-09-151-1/+1
* add new locale fileMario Vavti2016-09-141-0/+5
* upgrade fullcalendar to version 3Mario Vavti2016-09-1410-950/+1721
* fix settings/accountMario Vavti2016-09-121-2/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-099-4931/+4994
|\
| * whitelist button tag in htmlpurifierMario Vavti2016-09-091-0/+3
| * Merge pull request #510 from wave72/devWave2016-09-092-4745/+4849
| |\
| | * Updated Italian stringsWave722016-09-092-4745/+4849
| * | version bump due to js caching issueMario Vavti2016-09-091-1/+1
| * | update justifiedGallery 3.6.1 -> 3.6.3Mario Vavti2016-09-095-185/+141
* | | issue #511, postgres schema issuesredmatrix2016-09-092-4250/+4299
|/ /
* | fix for old style version specifiersredmatrix2016-09-082-3/+5
* | more get rid of illegal offset in include/conversationredmatrix2016-09-083-7/+10
* | illegal offset errors in include/conversation:status_editor() when no permiss...redmatrix2016-09-081-0/+4
* | comanche: simple test issueredmatrix2016-09-081-2/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-083-5/+8
|\ \
| * | add more foundation data- attributesMario Vavti2016-09-081-1/+4
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-09-0813-47/+146
| |\ \