aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-20181028a' into 'dev'Mario2018-11-052-4/+37
|\
| * strpos needs to test with ===0 not ==0M.Dent2018-11-011-3/+3
| * Add timestamp and associated logic to pconfigM.Dent2018-10-282-4/+37
* | Fix wrong image resize for some external imagesMax Kostikov2018-11-011-2/+2
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-311-1/+6
|\ \
| * \ Merge branch 'patch-20' into 'dev'Mario2018-10-311-1/+6
| |\ \
| | * | Update oembed.phpMax Kostikov2018-10-301-1/+5
| | * | Beautiful embedding for Hubzilla linksMax Kostikov2018-10-301-1/+2
| | |/
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-10-301-12/+14
|\| |
| * | fix markdown testsMario Vavti2018-10-301-1/+2
| * | really fix html2markdown() - when using environment, we must set the defaultsMario Vavti2018-10-301-5/+13
| * | fix html2markdown() and re-enable previously failing testsMario Vavti2018-10-301-9/+2
| |/
* | typozotlabs2018-10-301-1/+1
* | issue syncing the channel_primary setting which shows up as a wrong count on ...zotlabs2018-10-302-19/+17
|/
* 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
* | 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
|\| | | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:32:49 +0000