Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-09 | 11 | -15/+356 | |
| |\ | ||||||
| * | | new notification changes - use sticky_kit instead of position fixed | Mario Vavti | 2017-10-09 | 7 | -24/+37 | |
| | | | ||||||
| * | | more new notifications fixes | Mario Vavti | 2017-10-09 | 4 | -30/+26 | |
| | | | ||||||
* | | | purify user-supplied filenames in some cases. Probably not needed but it's ↵ | zotlabs | 2017-10-09 | 3 | -2/+11 | |
| |/ |/| | | | | | the right thing to do. | |||||
* | | ability to pin apps to the navbar when using named navbars | zotlabs | 2017-10-08 | 4 | -2/+26 | |
| | | ||||||
* | | check write_storage permission in /display | zotlabs | 2017-10-08 | 1 | -1/+1 | |
| | | ||||||
* | | alternate navbar layouts | zotlabs | 2017-10-08 | 7 | -12/+325 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 10 | -39/+54 | |
|\| | ||||||
| * | more fixes | Mario Vavti | 2017-10-08 | 3 | -3/+6 | |
| | | ||||||
| * | new notification fixes | Mario Vavti | 2017-10-08 | 8 | -38/+50 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 57 | -60/+493 | |
|\| | ||||||
| * | experimental new notifications - needs pconfig experimental_notif set to 1 ↵ | Mario Vavti | 2017-10-08 | 51 | -23/+383 | |
| | | | | | | | | for your channel to work. | |||||
| * | pubstream single view fixes | Mario Vavti | 2017-10-07 | 1 | -3/+15 | |
| | | ||||||
| * | provide single post view for pubstream and rewrite llink to point to ↵ | Mario Vavti | 2017-10-07 | 2 | -24/+45 | |
| | | | | | | | | /pubstream/?f=&mid=some_mid instead of /display/some_mid for pubs notifications | |||||
| * | fix filestorage spinner | Mario Vavti | 2017-10-07 | 1 | -1/+1 | |
| | | ||||||
| * | no need to move $modrated check up | Mario Vavti | 2017-10-06 | 2 | -3/+4 | |
| | | ||||||
| * | to find out if a comment is to be moderated we need to look at the actual ↵ | Mario Vavti | 2017-10-06 | 1 | -2/+1 | |
| | | | | | | | | comment not at its parent | |||||
| * | enable anonymous comments also in /display | Mario Vavti | 2017-10-06 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "mod display: if we have a local channel we should still be allowed ↵ | Mario Vavti | 2017-10-06 | 1 | -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 Vavti | 2017-10-06 | 1 | -1/+2 | |
| | | | | | | | | sys channel items | |||||
| * | it is not your public stream -> just public stream | Mario Vavti | 2017-10-06 | 1 | -1/+1 | |
| | | ||||||
| * | introduce public stream notifications | Mario Vavti | 2017-10-06 | 3 | -6/+46 | |
| | | ||||||
* | | navbar controls now functionally hidden with too low z-index when ↵ | zotlabs | 2017-10-07 | 1 | -0/+4 | |
|/ | | | | cover_photo is showing and navbar doesn't have class fixed-top | |||||
* | changes to encryption encapsulation for zot6 (backward compatible) | zotlabs | 2017-10-05 | 1 | -0/+4 | |
| | ||||||
* | typo | zotlabs | 2017-10-05 | 1 | -1/+1 | |
| | ||||||
* | Add JSalmon signing library for Zot6. See ↵ | zotlabs | 2017-10-05 | 1 | -0/+38 | |
| | | | | https://macgirvin.com/wiki/mike/Zot%2BVI/Encryption/Signatures | |||||
* | add admin app - the site admin link probably does not belong in the ↵ | zotlabs | 2017-10-05 | 2 | -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_merge | zotlabs | 2017-10-05 | 1 | -2/+2 | |
|\ | ||||||
| * | fix wrong logic for enable/disable pubstream notifications | Mario Vavti | 2017-10-05 | 1 | -2/+2 | |
| | | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-05 | 9 | -7/+35 | |
| |\ | ||||||
* | | | update some old spinners which were causing js issues | zotlabs | 2017-10-05 | 5 | -14/+14 | |
| | | | ||||||
* | | | Experimental alternate channel_menu navigation. To use, "util/config ↵ | zotlabs | 2017-10-05 | 4 | -5/+19 | |
| | | | | | | | | | | | | system.channel_menu 1" | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-04 | 12 | -101/+177 | |
|\| | | |/ |/| | ||||||
| * | introduce shared files notifications | Mario Vavti | 2017-10-04 | 3 | -9/+50 | |
| | | ||||||
| * | bring back notifications for account approvals | Mario Vavti | 2017-10-04 | 4 | -4/+41 | |
| | | ||||||
| * | some basic work on mod common | Mario Vavti | 2017-10-03 | 2 | -27/+28 | |
| | | ||||||
| * | move common connections widget to left aside | Mario Vavti | 2017-10-03 | 3 | -32/+17 | |
| | | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-03 | 4 | -54/+53 | |
| |\ | ||||||
| * | | fix community tags not preserved on post edit. issue #865 | Mario Vavti | 2017-10-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | whitespace | Mario Vavti | 2017-10-02 | 1 | -3/+3 | |
| | | | ||||||
| * | | wiki: show save button and commit input field in all tabs if there is ↵ | Mario Vavti | 2017-10-02 | 1 | -25/+37 | |
| | | | | | | | | | | | | unsaved content. fix #853 | |||||
* | | | redirect loop with rmagic and owa | zotlabs | 2017-10-04 | 2 | -2/+3 | |
| | | | ||||||
* | | | wiki double encoding html entities | zotlabs | 2017-10-04 | 2 | -1/+3 | |
| | | | ||||||
* | | | ensure we have an observer hash | zotlabs | 2017-10-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | hubzilla issue #868 | zotlabs | 2017-10-03 | 2 | -0/+25 | |
| | | | ||||||
* | | | wrong param | zotlabs | 2017-10-03 | 1 | -4/+4 | |
| | | | ||||||
* | | | urlencode hashes from mod_acl | zotlabs | 2017-10-03 | 2 | -3/+3 | |
| | | | ||||||
* | | | don't use chanlink_url() for feed mentions | zotlabs | 2017-10-03 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | import: special handling required for channel photo in the xchan record when ↵ | zotlabs | 2017-10-02 | 1 | -14/+25 | |
| | | | | | | | | not seizing 'primary' | |||||
* | | remove server role selection details from install documentation, no longer ↵ | zotlabs | 2017-10-02 | 1 | -30/+10 | |
| | | | | | | | | needed |