aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-132-42/+5
* | 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
|\| | | |/ |/|
| * move *_divmore_height setting to the module extra_settings, and fix issue whe...Mario Vavti2018-10-041-3/+9
| * 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.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
| * | nav_channel_select should be off by defaultMario2018-09-281-1/+1
| |/
| * Update zot.phpMax Kostikov2018-09-281-1/+1
| * Update security.phpMax Kostikov2018-09-281-1/+1
| * Update zot.phpMax Kostikov2018-09-281-14/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 07:14:02 +0000