Commit Graph

16 Commits

Author SHA1 Message Date
alext 32e618975a Updated CodeIgniter to v3.1.6 2017-10-31 13:00:54 +01:00
alext 483e2348a1 Updated CodeIgniter to v3.1.5 2017-06-29 15:35:42 +02:00
alext b568061ffd Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	composer.lock
#	doc/faq.md
#	gulpfile.js
#	src/vendor/autoload.php
#	src/vendor/composer/autoload_real.php
#	src/vendor/composer/installed.json
#	src/vendor/phpmailer/phpmailer/VERSION
#	src/vendor/phpmailer/phpmailer/class.phpmailer.php
#	src/vendor/phpmailer/phpmailer/class.pop3.php
#	src/vendor/phpmailer/phpmailer/class.smtp.php
2017-05-24 23:31:47 +02:00
alext 0fc36007c3 Corrected source link in composer.json 2017-05-21 12:52:59 +02:00
alext d79ff1a5ce Added minimum-stability in composer.json 2017-05-21 12:52:26 +02:00
alext 4b0e6b7f2f Updated composer configuration. 2017-05-21 12:47:34 +02:00
Scott Arthur b63e5b3db7 Upgrade to CodeIgniter 3.1.4 2017-03-21 22:28:20 +11:00
alext 2e2cb09a2d Renamed "composer" directory to "composer_modules" and updated its references. 2016-11-13 12:46:02 +01:00
alext 869e7d74f7 Added phpunit as a composer dependency. 2016-11-09 19:55:41 +01:00
Alex Tselegidis c6bf850907 Removed ApiGen from composer and added codeigniter framework as a dev dependency. 2016-04-24 09:59:01 +02:00
Alex Tselegidis 95a5ae1dce Implemented the 'gulp composer' task which will install the composer dependencies and move only the required files to the 'src/application/third_party' directory. 2015-12-30 14:18:18 +01:00
Alex Tselegidis 663324c8c5 Added phpmailer class to the composer dependencies. 2015-10-21 23:48:35 +02:00
Alex Tselegidis b3f9eacc9d Added captcha library to the project. 2015-10-18 18:50:06 +02:00
Alex Tselegidis 48b4b26487 Changed the composer installation path to the third_party directory. 2015-10-18 18:27:10 +02:00
Alex Tselegidis 069783d69d Removed phpmetrics from composer dependencies. 2015-10-04 21:29:01 +02:00
Alex Tselegidis 2e408daced Added composer file for apigen and phpmetrics dependencies. 2015-10-04 21:12:37 +02:00