aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* merge include/zot.php from devMario Vavti2018-10-291-1/+1
* merge include/nav.php from devMario Vavti2018-10-291-1/+0
* merge include/import.php from devMario Vavti2018-10-291-1/+0
* merge include/connections.php from devMario Vavti2018-10-291-2/+0
* Merge branch 'dev'Mario Vavti2018-10-292-7/+16
|\
| * delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
| * refine stream filter and forum notification behaviour (mostly for performance...Mario Vavti2018-10-241-1/+1
| * Fix template root redirectionM.Dent2018-10-171-1/+2
| * Merge branch 'dev' into 'dev'Mario2018-10-151-3/+4
| |\
| | * fix phpunit error with html2markdown test and temporary disable failing markd...git-marijus2018-10-131-3/+4
| * | 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
* | | Merge branch '3.8RC'3.8Mario Vavti2018-10-1931-928/+1012
|\ \ \
| * | | Merge branch 'dev' into 'dev'Mario2018-10-181-1/+2
| * | | Merge branch 'dev' into 'dev'Mario2018-10-151-3/+4
| * | | Merge branch 'patch-16' into 'dev'Mario2018-10-151-1/+1
| * | | Merge branch 'patch-14' into 'dev'Mario2018-10-132-5/+40
| * | | Merge branch 'dev' into 3.8RCMario Vavti2018-10-132-42/+5
| |\| |
| | * | Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-132-42/+5
| * | | 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 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 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 clauseM.Dent2018-10-061-2/+3
| | | * | | | move profile assign selector to profile settings and personal menu selector t...Mario Vavti2018-10-061-8/+19
| | | |/ / /
| | | * | / 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 23:57:03 +0000