aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-0911-15/+356
| |\| |
| | * | ability to pin apps to the navbar when using named navbarszotlabs2017-10-084-2/+26
| | * | check write_storage permission in /displayzotlabs2017-10-081-1/+1
| | * | alternate navbar layoutszotlabs2017-10-087-12/+325
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0810-39/+54
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0857-60/+493
| | |\ \ \
| | * | | | navbar controls now functionally hidden with too low z-index when cover_photo...zotlabs2017-10-071-0/+4
| * | | | | new notification changes - use sticky_kit instead of position fixedMario Vavti2017-10-097-24/+37
| * | | | | more new notifications fixesMario Vavti2017-10-094-30/+26
| | |_|/ / | |/| | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0810-39/+54
|\| | | |
| * | | | more fixesMario Vavti2017-10-083-3/+6
| * | | | new notification fixesMario Vavti2017-10-088-38/+50
| | |/ / | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0868-80/+575
|\| | |
| * | | experimental new notifications - needs pconfig experimental_notif set to 1 fo...Mario Vavti2017-10-0851-23/+383
| * | | pubstream single view fixesMario Vavti2017-10-071-3/+15
| * | | provide single post view for pubstream and rewrite llink to point to /pubstre...Mario Vavti2017-10-072-24/+45
| * | | fix filestorage spinnerMario Vavti2017-10-071-1/+1
| * | | no need to move $modrated check upMario Vavti2017-10-062-3/+4
| * | | to find out if a comment is to be moderated we need to look at the actual com...Mario Vavti2017-10-061-2/+1
| * | | enable anonymous comments also in /displayMario Vavti2017-10-061-1/+1
| * | | Revert "mod display: if we have a local channel we should still be allowed to...Mario Vavti2017-10-061-2/+1
| * | | mod display: if we have a local channel we should still be allowed to see sys...Mario Vavti2017-10-061-1/+2
| * | | it is not your public stream -> just public streamMario Vavti2017-10-061-1/+1
| * | | introduce public stream notificationsMario Vavti2017-10-063-6/+46
| |/ /
| * | changes to encryption encapsulation for zot6 (backward compatible)zotlabs2017-10-051-0/+4
| * | typozotlabs2017-10-051-1/+1
| * | Add JSalmon signing library for Zot6. See https://macgirvin.com/wiki/mike/Zot...zotlabs2017-10-051-0/+38
| * | add admin app - the site admin link probably does not belong in the 'usermenu...zotlabs2017-10-052-1/+7
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-051-2/+2
| |\ \
| * | | update some old spinners which were causing js issueszotlabs2017-10-055-14/+14
| * | | Experimental alternate channel_menu navigation. To use, "util/config system.c...zotlabs2017-10-054-5/+19
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0412-101/+177
| |\ \ \
* | \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0510-9/+37
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix wrong logic for enable/disable pubstream notificationsMario Vavti2017-10-051-2/+2
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-059-7/+35
| |\| | | | | |/ / | |/| |
| | * | redirect loop with rmagic and owazotlabs2017-10-042-2/+3
| | * | wiki double encoding html entitieszotlabs2017-10-042-1/+3
| | * | ensure we have an observer hashzotlabs2017-10-031-1/+1
| | * | hubzilla issue #868zotlabs2017-10-032-0/+25
| | * | wrong paramzotlabs2017-10-031-4/+4
| | * | urlencode hashes from mod_aclzotlabs2017-10-032-3/+3
| | * | don't use chanlink_url() for feed mentionszotlabs2017-10-031-1/+1
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0419-159/+321
|\| | |
| * | | introduce shared files notificationsMario Vavti2017-10-043-9/+50
| * | | bring back notifications for account approvalsMario Vavti2017-10-044-4/+41
| * | | some basic work on mod commonMario Vavti2017-10-032-27/+28
| * | | move common connections widget to left asideMario Vavti2017-10-033-32/+17
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-034-54/+53
| |\| |
| | * | import: special handling required for channel photo in the xchan record when ...zotlabs2017-10-021-14/+25
| | * | remove server role selection details from install documentation, no longer ne...zotlabs2017-10-021-30/+10