zotlabs
|
4203d43c58
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-10 16:06:09 -07:00 |
|
zotlabs
|
f273815d8f
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-10 16:05:56 -07:00 |
|
zotlabs
|
6a2c5e0731
|
pdledit usability improvements
|
2017-10-10 16:05:10 -07:00 |
|
Mario Vavti
|
07ae431950
|
css fixes
|
2017-10-10 20:02:42 +02:00 |
|
Mario Vavti
|
0c4a1fb9be
|
version
|
2017-10-10 19:28:11 +02:00 |
|
Mario Vavti
|
e6f1fb3d95
|
remove notifications code from nav and go live with new notifications
|
2017-10-10 16:51:35 +02:00 |
|
Mario Vavti
|
030d703a05
|
remove left_align mode
|
2017-10-10 16:03:59 +02:00 |
|
Mario Vavti
|
edc262f5af
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-10 12:09:32 +02:00 |
|
Mario Vavti
|
41cf846ee3
|
new notification fixes
|
2017-10-10 12:08:51 +02:00 |
|
zotlabs
|
335536bbbf
|
more custom navbar work
|
2017-10-09 20:19:03 -07:00 |
|
zotlabs
|
89aa9a80c4
|
typo
|
2017-10-09 15:51:30 -07:00 |
|
zotlabs
|
d636ff586d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-09 15:15:02 -07:00 |
|
zotlabs
|
8797049144
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-09 15:14:44 -07:00 |
|
zotlabs
|
623dfa1384
|
purify user-supplied filenames in some cases. Probably not needed but it's the right thing to do.
|
2017-10-09 15:13:25 -07:00 |
|
Mario Vavti
|
cc1ffff7cd
|
feed untranslated appnames to nav_set_selected() and query for the active app directly to get app details
|
2017-10-09 21:22:57 +02:00 |
|
Mario Vavti
|
5698462588
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-09 17:49:55 +02:00 |
|
Mario Vavti
|
f99c007187
|
new notification changes - use sticky_kit instead of position fixed
|
2017-10-09 17:49:15 +02:00 |
|
Mario Vavti
|
54a0690323
|
more new notifications fixes
|
2017-10-09 13:35:58 +02:00 |
|
zotlabs
|
23812e5b48
|
ability to pin apps to the navbar when using named navbars
|
2017-10-08 19:43:03 -07:00 |
|
zotlabs
|
c37908f344
|
check write_storage permission in /display
|
2017-10-08 17:22:38 -07:00 |
|
zotlabs
|
4011dd18f0
|
alternate navbar layouts
|
2017-10-08 16:48:24 -07:00 |
|
zotlabs
|
52b1ea10a1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-08 15:10:44 -07:00 |
|
zotlabs
|
09009d4b32
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-08 15:10:28 -07:00 |
|
Mario Vavti
|
ec173e7eb2
|
more fixes
|
2017-10-08 22:47:43 +02:00 |
|
Mario Vavti
|
bcf4cb519a
|
new notification fixes
|
2017-10-08 22:21:19 +02:00 |
|
zotlabs
|
27bc8294ae
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-08 12:43:50 -07:00 |
|
zotlabs
|
5cc6c6c1e9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-08 12:42:54 -07:00 |
|
Mario Vavti
|
991db280be
|
experimental new notifications - needs pconfig experimental_notif set to 1 for your channel to work.
|
2017-10-08 17:19:29 +02:00 |
|
zotlabs
|
6f709a6f57
|
navbar controls now functionally hidden with too low z-index when cover_photo is showing and navbar doesn't have class fixed-top
|
2017-10-07 23:44:27 -07:00 |
|
Mario Vavti
|
71c206fdb9
|
pubstream single view fixes
|
2017-10-07 16:40:43 +02:00 |
|
Mario Vavti
|
4c0e8a61ae
|
provide single post view for pubstream and rewrite llink to point to /pubstream/?f=&mid=some_mid instead of /display/some_mid for pubs notifications
|
2017-10-07 15:40:34 +02:00 |
|
Mario Vavti
|
dc2c6d00fe
|
fix filestorage spinner
|
2017-10-07 12:34:43 +02:00 |
|
Mario Vavti
|
e7c8012794
|
no need to move $modrated check up
|
2017-10-06 22:25:53 +02:00 |
|
Mario Vavti
|
9bd30eb8bf
|
to find out if a comment is to be moderated we need to look at the actual comment not at its parent
|
2017-10-06 21:32:06 +02:00 |
|
Mario Vavti
|
b883b9c983
|
enable anonymous comments also in /display
|
2017-10-06 21:30:44 +02:00 |
|
Mario Vavti
|
5468ebbb43
|
Revert "mod display: if we have a local channel we should still be allowed to see sys channel items"
This reverts commit 27f8320353 .
|
2017-10-06 21:05:37 +02:00 |
|
Mario Vavti
|
27f8320353
|
mod display: if we have a local channel we should still be allowed to see sys channel items
|
2017-10-06 16:51:39 +02:00 |
|
Mario Vavti
|
e15307747f
|
it is not your public stream -> just public stream
|
2017-10-06 16:48:25 +02:00 |
|
Mario Vavti
|
f427b4a325
|
introduce public stream notifications
|
2017-10-06 16:46:27 +02:00 |
|
zotlabs
|
a6835f4e71
|
changes to encryption encapsulation for zot6 (backward compatible)
|
2017-10-05 23:01:42 -07:00 |
|
zotlabs
|
052ed1f88b
|
typo
|
2017-10-05 22:01:45 -07:00 |
|
zotlabs
|
34a0ec4089
|
Add JSalmon signing library for Zot6. See https://macgirvin.com/wiki/mike/Zot%2BVI/Encryption/Signatures
|
2017-10-05 20:09:21 -07:00 |
|
zotlabs
|
2ed77b5986
|
add admin app - the site admin link probably does not belong in the 'usermenu' and this is a first step to straigtening out that historical mistake.
|
2017-10-05 19:51:00 -07:00 |
|
zotlabs
|
d70e6f273b
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-05 19:24:16 -07:00 |
|
zotlabs
|
d2e22d8c2f
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-05 19:24:03 -07:00 |
|
zotlabs
|
7c501ef60f
|
update some old spinners which were causing js issues
|
2017-10-05 19:20:39 -07:00 |
|
zotlabs
|
a0eb628526
|
Experimental alternate channel_menu navigation. To use, "util/config system.channel_menu 1"
|
2017-10-05 16:59:33 -07:00 |
|
Mario Vavti
|
0ddc3e4af2
|
fix wrong logic for enable/disable pubstream notifications
|
2017-10-05 21:42:25 +02:00 |
|
Mario Vavti
|
5be9477f21
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-05 11:25:39 +02:00 |
|
zotlabs
|
4ab21edba8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-04 19:37:50 -07:00 |
|