aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
| * | | Merge pull request #862 from waitman/patch-4git-marijus2017-09-281-1/+5
| |\ \ \
| | * | | prevent 'my_address' being set with bogus infoWaitman Gobble2017-09-181-1/+5
| | |/ /
| * | | process activity deletes from OStatus which for whatever reason do not use th...zotlabs2017-09-272-37/+59
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-2736-615/+257
|\| | |
| * | | re-arrange some htmlMario Vavti2017-09-272-7/+7
| * | | make justifiedGallery even more happyMario Vavti2017-09-272-2/+2
| * | | make justifiedGallery happy againMario Vavti2017-09-273-2/+7
| * | | do not use our spinner css on the justifiedGallery spinner which has the same...Mario Vavti2017-09-271-1/+3
| * | | fix some missing spinnersMario Vavti2017-09-279-9/+20
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-266-44/+51
| |\ \ \
| | * | | whitespacezotlabs2017-09-251-2/+0
| | * | | move the Link header initialisation from Router (where it does not really bel...zotlabs2017-09-254-28/+36
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 19:26:36 +0000