aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| | * | Hubzilla issue #866 allow navbar to be used when cover photo is displayed - a...zotlabs2017-10-021-1/+2
| | * | Clone sync deletions to comments (which belong to you) on wall posts (which d...zotlabs2017-10-021-9/+16
| * | | fix community tags not preserved on post edit. issue #865Mario Vavti2017-10-021-1/+1
| * | | whitespaceMario Vavti2017-10-021-3/+3
| * | | wiki: show save button and commit input field in all tabs if there is unsaved...Mario Vavti2017-10-021-25/+37
| |/ /
| * | profile photo propagation issue if the local xchan_photo_[l|m|s] fields were ...zotlabs2017-10-011-2/+10
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-015-24/+24
| |\ \
| * | | use imagick converter for large photoszotlabs2017-09-303-2/+81
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-015-24/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #863 from mjfriaza/devgit-marijus2017-10-012-11/+11
| |\ \ \ | | | |/ | | |/|
| | * | Fixed the Spanish translationManuel Jiménez Friaza2017-10-012-11/+11
| * | | card_edit: fix lockstate and current permissions not handed over to editorMario Vavti2017-10-011-0/+2
| * | | fix profile edit dropdown for multiple profilesMario Vavti2017-10-011-11/+9
| * | | Update administrator_guide.mdAndrew Manning2017-09-301-2/+2
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-285-39/+67
|\| |
| * | remove double remote login button and slightly change appearenceMario Vavti2017-09-282-2/+2
| * | Merge pull request #860 from waitman/patch-2git-marijus2017-09-281-0/+1
| |\ \
| | * | add remote login to login formWaitman Gobble2017-09-181-0/+1
| * | | Merge pull request #861 from waitman/patch-3git-marijus2017-09-281-0/+1
| |\ \ \
| | * | | add remote login to login.tplWaitman Gobble2017-09-181-0/+1
| | |/ /