aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1019-332/+134
|\
| * css fixesMario Vavti2017-10-103-4/+7
| |
| * versionMario Vavti2017-10-101-1/+1
| |
| * remove notifications code from nav and go live with new notificationsMario Vavti2017-10-106-212/+18
| |
| * remove left_align modeMario Vavti2017-10-105-24/+3
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-106-55/+51
| |\
| | * more custom navbar workzotlabs2017-10-093-53/+40
| | |
| | * typozotlabs2017-10-091-1/+1
| | |
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0929-69/+80
| | |\
| | * | purify user-supplied filenames in some cases. Probably not needed but it's ↵zotlabs2017-10-093-2/+11
| | | | | | | | | | | | | | | | the right thing to do.
| * | | new notification fixesMario Vavti2017-10-103-42/+60
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0937-84/+436
|\| |
| * | feed untranslated appnames to nav_set_selected() and query for the active ↵Mario Vavti2017-10-0923-37/+39
| | | | | | | | | | | | app directly to get app details
| * | 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 ↵zotlabs2017-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | cover_photo is showing and navbar doesn't have class fixed-top
| * | | | 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 ↵Mario Vavti2017-10-0851-23/+383
| | | | | | | | | | | | for your channel to work.
| * | pubstream single view fixesMario Vavti2017-10-071-3/+15
| | |
| * | provide single post view for pubstream and rewrite llink to point to ↵Mario Vavti2017-10-072-24/+45
| | | | | | | | | | | | /pubstream/?f=&mid=some_mid instead of /display/some_mid for pubs notifications
| * | 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 ↵Mario Vavti2017-10-061-2/+1
| | | | | | | | | | | | comment not at its parent
| * | 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 ↵Mario Vavti2017-10-061-2/+1
| | | | | | | | | | | | | | | | | | to see sys channel items" This reverts commit 27f83203531606f6dca99bc89f7cd31e5e296528.
| * | mod display: if we have a local channel we should still be allowed to see ↵Mario Vavti2017-10-061-1/+2
| | | | | | | | | | | | sys channel items
| * | 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 ↵zotlabs2017-10-051-0/+38
| | | | | | | | https://macgirvin.com/wiki/mike/Zot%2BVI/Encryption/Signatures
| * add admin app - the site admin link probably does not belong in the ↵zotlabs2017-10-052-1/+7
| | | | | | | | 'usermenu' and this is a first step to straigtening out that historical mistake.
| * 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 ↵zotlabs2017-10-054-5/+19
| | | | | | | | | | | | system.channel_menu 1"
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:00:31 +0000