aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* issue syncing the channel_primary setting which shows up as a wrong count on ↵zotlabs2018-10-302-19/+17
| | | | the admin summary page
* delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
|
* refine stream filter and forum notification behaviour (mostly for ↵Mario Vavti2018-10-241-1/+1
| | | | performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
* Fix template root redirectionM.Dent2018-10-171-1/+2
|
* Merge branch 'dev' into 'dev'Mario2018-10-151-3/+4
|\ | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332
| * fix phpunit error with html2markdown test and temporary disable failing ↵git-marijus2018-10-131-3/+4
| | | | | | | | markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected)
* | Update language.phpMax Kostikov2018-10-141-1/+1
| |
* | Update js_strings.phpMax Kostikov2018-10-131-5/+5
| |
* | Update language.phpMax Kostikov2018-10-131-0/+26
| |
* | Add date/time plurals translation in JavaScriptMax Kostikov2018-10-131-0/+9
| |
* | Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-132-42/+5
| | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849.
* | Merge branch 'dev' into 'dev'Mario2018-10-131-2/+3
|\ \ | | | | | | | | | | | | Fix order of assignment and get template file before return See merge request hubzilla/core!1329
| * | Fix order of assignment and get template file before returnZotSocial Admin2018-10-121-2/+3
| |/
* | Update language.phpMax Kostikov2018-10-131-2/+1
| |
* | Update language.phpMax Kostikov2018-10-131-3/+4
| |
* | Update language.phpMax Kostikov2018-10-131-2/+2
| |
* | Update language.phpMax Kostikov2018-10-131-1/+1
| |
* | Update language.phpMax Kostikov2018-10-131-2/+1
| |
* | Update language.phpMax Kostikov2018-10-131-4/+2
| |
* | Update language.phpMax Kostikov2018-10-131-1/+1
| |
* | Update language.phpMax Kostikov2018-10-131-1/+1
| |
* | Update language.phpMax Kostikov2018-10-131-5/+5
| |
* | Update language.phpMax Kostikov2018-10-121-0/+31
| |
* | Add plurals translation at browser side (JS)Max Kostikov2018-10-121-5/+14
|/
* verify some edge case http signatureszotlabs2018-10-111-0/+24
|
* Merge branch 'dev'zotlabs2018-10-084-11/+30
|\
| * Merge branch 'patch-2' into 'dev'Mario2018-10-081-1/+3
| |\ | | | | | | | | | | | | Prevent links damage on foreign channel repost for cloned See merge request hubzilla/core!1307
| | * Prevent links damage on foreign channel repost for clonedMax Kostikov2018-10-051-1/+3
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-071-1/+1
| |\ \
| * \ \ Merge branch 'dev' into 'dev'M. Dent2018-10-071-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317
| | * | | Add missing else clauseM.Dent2018-10-061-2/+3
| | | | |
| * | | | move profile assign selector to profile settings and personal menu selector ↵Mario Vavti2018-10-061-8/+19
| |/ / / | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section.
| * | / strings and force import_system_apps() on std_version changeMario Vavti2018-10-061-0/+5
| | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-051-0/+6
| |\ \
* | | | whitespacezotlabs2018-10-081-3/+0
| |_|/ |/| |
* | | use hubloc_store_lowlevel to ensure all hubloc columns are initialisedzotlabs2018-10-061-1/+1
| | |
* | | Merge branch 'dev'zotlabs2018-10-0415-231/+149
|\| | | |/ |/|
| * move *_divmore_height setting to the module extra_settings, and fix issue ↵Mario Vavti2018-10-041-3/+9
| | | | | | | | where feature settings were not synced if rpath was provided
| * move *_list_mode to featuresMario Vavti2018-10-041-0/+16
| |
| * jot: show settings icon only to local profile ownerMario2018-10-031-1/+2
| |
| * move archives from network to channel_homeMario2018-10-031-8/+8
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-031-1/+1
| |\
| | * Merge branch 'dev' into 'dev'M. Dent2018-10-031-1/+1
| | |\ | | | | | | | | | | | | | | | | Fix misplaced comma with period. See merge request hubzilla/core!1304
| | | * Fix misplaced comma with period.M.Dent2018-10-021-1/+1
| | | |
| * | | move filing from conversation to network - it is only functional there.Mario Vavti2018-10-031-8/+8
| |/ /
| * / indicate locked featuresMario Vavti2018-10-011-1/+1
| |/
| * Status editor hookM. Dent2018-09-291-1/+15
| |
| * Remove servicelevel logicM. Dent2018-09-294-20/+3
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-09-281-8/+13
| |\
| | * settings for channel homeMario Vavti2018-09-281-8/+13
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 23:43:13 +0000