aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 2.2RC2.2Mario Vavti2017-03-08868-40986/+159191
|\
| * version 2.2 and changelogMario Vavti2017-03-082-2/+3
| * allow post_activity_item to be passed an empty ACL without resetting to chann...zotlabs2017-03-061-1/+2
| * add public_policy to the nwiki container also. This should not affect the rec...zotlabs2017-03-061-0/+2
| * correct fix for wiki anonymous read issue (items_permissions_sql checks item....zotlabs2017-03-062-9/+6
| * Big 2.2 string update Dutchjeroenpraat2017-03-062-6864/+7305
| * allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
| * do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
| * update changelogMario Vavti2017-03-041-0/+1
| * we need item edited for wiki page history, not item createdMario Vavti2017-03-041-1/+1
| * fix badge position for narrow navbarMario Vavti2017-03-031-4/+0
| * provide info if there are no sche,es availableMario Vavti2017-03-021-4/+9
| * reset schema value after we empty and repopulate it. second half of fix for #624Mario Vavti2017-03-022-2/+2
| * reset schema value after we empty and repopulate it. first half of fix for #624Mario Vavti2017-03-021-0/+2
| * setting top position of contextual-help in schemes does not work with narrow ...Mario Vavti2017-03-024-5/+0
| * add title to connect buttonMario Vavti2017-03-011-1/+1
| * minor template fixesMario Vavti2017-03-013-19/+12
| * missing css classMario Vavti2017-02-281-1/+1
| * Merge branch '2.2RC' of https://github.com/redmatrix/hubzilla into 2.2RC_mergezotlabs2017-02-2710-14/+38
| |\
| | * fix js issue in markdown mimetype wikis if content contains quotesMario Vavti2017-02-272-6/+4
| | * update changelogMario Vavti2017-02-271-0/+1
| | * whitespaceMario Vavti2017-02-271-2/+0
| | * missing clearMario Vavti2017-02-271-1/+1
| | * do not mess up schemasMario Vavti2017-02-271-4/+6
| | * lower version requirement to 2.2RCMario Vavti2017-02-271-1/+1
| | * set minversion and maxversion for themes in view/theme/themename/php/theme.ph...Mario Vavti2017-02-276-7/+13
| | * add a minversion to the theme and fallback to default if requirement is not m...Mario Vavti2017-02-266-7/+26
| * | document the filesize limitations on uploading via /cloud, fix non-functional...zotlabs2017-02-271-2/+6
| |/
| * send sync packet on profile photo permissions changezotlabs2017-02-251-0/+9
| * Merge branch '2.2RC' of https://github.com/redmatrix/hubzilla into 2.2RC_mergezotlabs2017-02-252-2/+2
| |\
| | * bump versionMario Vavti2017-02-251-1/+1
| | * use chanlink_url() in directory since the xchan might not yet be available on...Mario Vavti2017-02-241-1/+1
| * | escape tags on viewsrc output in case it is not text/bbcode.zotlabs2017-02-251-1/+3
| |/
| * minor editszotlabs2017-02-231-6/+8
| * Merge branch '2.2RC' of https://github.com/redmatrix/hubzilla into 2.2RC_mergezotlabs2017-02-230-0/+0
| |\
| | * update changelogMario Vavti2017-02-231-0/+86
| | * move collapsed login and register buttons to the leftMario Vavti2017-02-232-3/+12
| | * yet one more place to use chanlink_hash() instead of chanlink_url()Mario Vavti2017-02-231-2/+2
| * | update changelogMario Vavti2017-02-231-0/+86
| * | move collapsed login and register buttons to the leftMario Vavti2017-02-232-3/+12
| * | yet one more place to use chanlink_hash() instead of chanlink_url()Mario Vavti2017-02-231-2/+2
| |/
| * one more place to use chanlink_hash() instead of chanlink_url()Mario Vavti2017-02-231-1/+1
| * more places to use chanlink_hash() instead of chanlink_url() for profile_linkMario Vavti2017-02-233-3/+3
| * use chanlink_hash() instead of chanlink_url() for $profile_linkMario Vavti2017-02-231-1/+1
| * Merge pull request #685 from phellmes/devzotlabs2017-02-232-6067/+6490
| |\
| | * Update DE translation stringsphellmes2017-02-222-6067/+6490
| |/
| * apps improvementsMario Vavti2017-02-228-31/+19
| * change text back to 'add apps'zotlabs2017-02-212-3/+3
| * Merge pull request #684 from anaqreon/devzotlabs2017-02-222-3/+4
| |\
| | * Change Add Apps to Manage Apps and support translation.Andrew Manning2017-02-212-3/+4