aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | not seizing 'primary'
| | * remove server role selection details from install documentation, no longer ↵zotlabs2017-10-021-30/+10
| | | | | | | | | | | | needed
| | * Hubzilla issue #866 allow navbar to be used when cover photo is displayed - ↵zotlabs2017-10-021-1/+2
| | | | | | | | | | | | also scroll cover photo on keyup event.
| | * Clone sync deletions to comments (which belong to you) on wall posts (which ↵zotlabs2017-10-021-9/+16
| | | | | | | | | | | | do not).
| * | 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 ↵Mario Vavti2017-10-021-25/+37
| |/ | | | | | | unsaved content. fix #853
| * profile photo propagation issue if the local xchan_photo_[l|m|s] fields were ↵zotlabs2017-10-011-2/+10
| | | | | | | | changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation.
| * 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 some errors in the Spanish translation
| | * | 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 form
| | * | add remote login to login formWaitman Gobble2017-09-181-0/+1
| | | | | | | | | | | | This exists in nav login but not login.tpl
| * | | Merge pull request #861 from waitman/patch-3git-marijus2017-09-281-0/+1
| |\ \ \ | | | | | | | | | | add remote login to login.tpl
| | * | | add remote login to login.tplWaitman Gobble2017-09-181-0/+1
| | |/ / | | | | | | | | Add Remote login option to login.tpl, this exists in nav login.
| * | | Merge pull request #862 from waitman/patch-4git-marijus2017-09-281-1/+5
| |\ \ \ | | | | | | | | | | prevent 'my_address' being set with bogus info
| | * | | prevent 'my_address' being set with bogus infoWaitman Gobble2017-09-181-1/+5
| | |/ / | | | | | | | | After a user has authenticated, it is possible to set my_address in $_SESSION to 'anything' using zid= parameter in URL - if user is authenticated then zid is never set. This change kills the authenticated switch if a person sends a new zid through for processing, which will trigger remote authentication.
| * | | process activity deletes from OStatus which for whatever reason do not use ↵zotlabs2017-09-272-37/+59
| | | | | | | | | | | | | | | | the industry standard tombstone mechanism
* | | | 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 ↵Mario Vavti2017-09-271-1/+3
| | | | | | | | | | | | | | | | same classname hardcoded
| * | | 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 ↵zotlabs2017-09-254-28/+36
| | | | | | | | | | | | | | | | | | | | belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch()
| | * | | typozotlabs2017-09-251-1/+1
| | | | |
| | * | | more zot6 basic stuffzotlabs2017-09-253-11/+12
| | | | |
| | * | | zot_site_info - always sign the site block with the site private keyzotlabs2017-09-251-4/+4
| | | | |
| * | | | bump versionMario Vavti2017-09-261-1/+1
| | | | |
| * | | | get rid of spinner.js in use a lightweight css spinner insteadMario Vavti2017-09-2622-558/+175
| |/ / /
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-2515-628/+996
|\| | |
| * | | extend activity_match to work with arrayszotlabs2017-09-241-2/+10
| | | |
| * | | doc page for the new channel_links hookzotlabs2017-09-241-0/+12
| | | |
| * | | update the trusted CA cert databasezotlabs2017-09-242-560/+740
| | | |
| * | | missing Zlib filezotlabs2017-09-241-0/+25
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 16:52:14 +0000