aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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 (cherry picked from commit c39de966df2ff28674697be77a527b2214afef42) b77acb3e add gitlab-ci.yml and phpunit.xml 22275f30 fix dba_pdoTest 0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown…
* Merge branch 'patch-16' into 'dev'Mario2018-10-151-1/+1
| | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 (cherry picked from commit 721461dd3e8cb6990ace54688ace953374506daf) b7280a44 JS plurals displaying code cleanup ab0e2f52 Update language.php f9c3b807 Update main.js ce52c27a Update main.js
* Merge branch 'patch-14' into 'dev'Mario2018-10-132-5/+40
| | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 (cherry picked from commit a2575059e2a068a67cd984888422265c6888f261) 5c0d3187 Add date/time plurals translation in JavaScript 729d0d53 Update language.php f68674b3 Update js_strings.tpl 3ac4337a Update main.js e96e3dc6 Update po2php.php 54bdf59d Update js_strings.php
* Merge branch 'dev' into 3.8RCMario Vavti2018-10-132-42/+5
|\
| * 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 3.8RCMario Vavti2018-10-133-8/+42
|\|
| * 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
| |\| | | | |/ | |/|
| * | do not propagate channel deletion for an already deleted channel.zotlabs2018-10-021-0/+6
| | |
* | | Fix order of assignment and get template file before returnZotSocial Admin2018-10-131-2/+3
| | | | | | | | | (cherry picked from commit 8ebcc4439b373e2127ac33c79e254bc53e8d9070)
* | | verify some edge case http signatureszotlabs2018-10-121-0/+24
| | | | | | | | | (cherry picked from commit c6bfd5e7befedf79ab6f7e70902e5fb2aa69fa6f)
* | | Prevent links damage on foreign channel repost for clonedMax Kostikov2018-10-081-1/+3
| | | | | | | | | (cherry picked from commit d9efb037e3d0c14fa288e8b54c3d55d67689ab54)
* | | Add missing else clauseM.Dent2018-10-071-2/+3
| | | | | | | | | (cherry picked from commit 259db3778c9385b9e4811e495146267b14b67a46)
* | | use hubloc_store_lowlevel to ensure all hubloc columns are initialisedzotlabs2018-10-071-1/+1
| | | | | | | | | (cherry picked from commit 52be5c1660abb1f3f8c6a8f0ba09799615214c30)
* | | 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. (cherry picked from commit 66cf0852728d2f95ed3a5b7a304dbc7b79111831)
* | | strings and force import_system_apps() on std_version changeMario Vavti2018-10-061-0/+5
| | | | | | | | | (cherry picked from commit cd5f25596678da5cba2e9208ec817a103e20914c)
* | | version RC1Mario Vavti2018-10-061-6/+0
| | |
* | | Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RCMario Vavti2018-10-051-0/+6
|\ \ \
| * | | do not propagate channel deletion for an already deleted channel.zotlabs2018-10-051-0/+6
| | |/ | |/| | | | (cherry picked from commit 7c1e99884cf9013d68dcce174e8f8d4f9dac49f7)
* / | force major version system apps import for 3.8RC - remove this at a later pointMario Vavti2018-10-051-0/+7
|/ /
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 03:00:56 +0000