summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-20Merge tag 'ci-upstream/3.1.7' into devFlorian Pritz179-571/+615
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-02-09Highlight .rs as rustFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-02-06Update NEWS3.0.2Florian Pritz1-0/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-31Proper display of expiration duration for less than a dayHrvoje Hodak4-2/+73
2018-01-21Remove database cache config from exampleFlorian Pritz1-4/+0
These settings do not work because the cache is never invalidated in the application. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-21composer: Add extension deps where easily possibleFlorian Pritz2-5/+14
mysql/psql is missing because composer can't do OR easily. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-21README: Document deps of testsuiteFlorian Pritz1-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-21Put testsuite config in example database configFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-13[ci skip] 3.1.7 releaseAndrey Andreev507-43380/+137997
2018-01-13[ci skip] Prepare 3.1.7 releaseAndrey Andreev4-5/+5
2018-01-12[ci skip] Add changelog entry for PR #5379Andrey Andreev1-0/+1
2018-01-12[ci skip] Merge pull request #5379 from tianhe1986/develop_session_memcachedAndrey Andreev1-0/+2
Fix of Session_memcached_driver::_get_lock
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev176-350/+350
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-05[ci skip] Add changelog entry for PR #5369Andrey Andreev1-0/+1
2018-01-05[ci skip] Merge pull request #5369 from tianhe1986/develop_cache_memcacheAndrey Andreev1-2/+12
Cache_memcached: setting initial value with increment/decrement when not exist
2018-01-01Ensure file does not exist when new one is added to DBFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-01Only update mtime when uploaded files already existFlorian Pritz1-6/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-01Reduce bcrypt cost for testsuiteFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-01Use temporary directory for testsuite uploadsFlorian Pritz2-0/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-01Update composer.lockFlorian Pritz1-8/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev8-45/+24
Clean elses
2017-12-26README: Add IRC channelFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-26Remove codeigniter readmeFlorian Pritz1-70/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-20Merge pull request #5354 from carusogabriel/refactoring-testsAndrey Andreev23-76/+75
Refactoring tests Conflicts resolved: tests/codeigniter/core/Utf8_test.php tests/codeigniter/database/query_builder/group_test.php tests/codeigniter/libraries/Form_validation_test.php
2017-12-20Prevent asciinema from being affected by file size limitFlorian Pritz1-8/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-09Highlight .pm as perlFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02Fix DB settings for postgres which doesn't use utf8mb43.0.1Florian Pritz2-4/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02NEWS: Release v3.0.03.0.0Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02Update composer.lockFlorian Pritz1-26/+28
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02composer.json: Replace codeigniter settings with oursFlorian Pritz1-12/+8
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02composer.json: Add missing , to fix syntax errorFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02NEWS: Clarify wording regarding base_urlFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02NEWS: Fix typoFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-12-02Migration 21: Limit utf8mb4 to columns that need itFlorian Pritz1-4/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-11-29[ci skip] Fix allow_get_array defaulting to FALSE if it doesn't existAndrey Andreev2-1/+2
2017-11-28[ci skip] Add changelog entry for PR #5342Andrey Andreev1-0/+1
2017-11-28[ci skip] Polish changes from PR #5342Andrey Andreev1-1/+3
2017-11-28[ci skip] Merge pull request #5342 from aanbar/pagination-bc-fixAndrey Andreev1-2/+3
Preserve attributes from pagination config files Related: #4454
2017-11-20[ci skip] More docs updates following #5330Andrey Andreev5-24/+8
2017-11-15Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332Andrey Andreev1-0/+8
2017-11-10Close #5330Andrey Andreev3-13/+8
2017-11-10Fix #5331Andrey Andreev3-1/+11
2017-11-10Try testing on PHP master branch builds too (allowed failures)Andrey Andreev1-0/+4
2017-11-09More on #5003Andrey Andreev2-8/+16
2017-11-09Move PHP 7.2 into the main testing matrixAndrey Andreev1-1/+0
2017-11-09Don't try to run 'DB=mysql' tests on PHP 7.2Andrey Andreev1-0/+2
2017-11-09Attempt PHP 7.2 tests on TravisAndrey Andreev1-0/+2
2017-11-09[ci skip] Fix patch for #5300Andrey Andreev3-5/+5
2017-11-07[ci skip] Deprecate extra parameters of the CAPTCHA helperAndrey Andreev4-8/+26
2017-11-06[ci skip] Merge pull request #5326 from vinodselvin/patch-1Andrey Andreev1-2/+2
Bug in documentation