tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
799 Commits 77 Branches 19 Tags 15 MiB
Commit Graph

32 Commits

Author SHA1 Message Date
AntonyAntonio 35ac87ab88 Merge branch 'master' into OS156-Disable-user-system 
Conflicts:
	server/controllers/system.php
	tests/init.rb
 2017-01-17 15:03:48 -03:00
AntonyAntonio 6ff0dbdf6b Guillermo - Add user system test [skip ci] 2017-01-16 21:05:11 -03:00
AntonyAntonio e44792c3de Ivan - Add csv file [skip ci] 2017-01-16 20:06:22 -03:00
AntonyAntonio 1c0c16f7f6 Merge branch 'master' into OS156-Disable-user-system 
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	server/data/ERRORS.php
	server/libs/Controller.php
	tests/init.rb
 2017-01-16 16:13:40 -03:00
AntonyAntonio fdd35ed2c1 Guillermo - disable-user-system [skip ci] 2017-01-16 16:07:53 -03:00
Ivan Diaz 7b95c54257 Merge branch 'master' into os-147-151-file-architecture-and-backup 
Conflicts:
	server/controllers/system.php
	server/data/ERRORS.php
	tests/init.rb
 2017-01-14 21:45:43 -03:00
Ivan Diaz dffe4a87a0 Ivan - Add file upload and download test [skip ci] 2017-01-13 21:58:59 -03:00
AntonyAntonio 0108414a70 Guillermo - registration api keys [skip ci] 2017-01-13 17:06:49 -03:00
Ivan Diaz 012103c2ad Merge branch 'master' into os-147-151-file-architecture-and-backup 
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	server/data/ERRORS.php
 2017-01-13 14:42:04 -03:00
Ivan Diaz db63948db7 Ivan - Add file upload test [skip ci] 2017-01-13 14:40:21 -03:00
AntonyAntonio 087a24c75c Guillermo - stast architecture [skip ci] 2017-01-13 13:46:57 -03:00
ivan f2401dcec7 Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci] 2017-01-12 18:29:50 -03:00
AntonyAntonio 5f5a2be76b Guillermo - stast architecture [skip ci] 2017-01-12 18:26:06 -03:00
AntonyAntonio 8763264a01 Merge branch 'master' into OS-144Stats-Architecture 
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	tests/init.rb
 2017-01-12 17:10:37 -03:00
AntonyAntonio b8d24b601d Guillermo - stats architecture [skip ci] 2017-01-12 16:30:58 -03:00
ivan a7ef5c10f2 Merge branch 'master' into OS4#150Enable-registration 
# Conflicts:
#	server/controllers/system/get-settings.php
 2017-01-11 03:49:32 -03:00
Ivan Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
AntonyAntonio 397246aa4b Guillermo - paths enable/disable registration[skip ci] 2017-01-10 16:04:25 -03:00
AntonyAntonio d7cd5086bd Guillermo - tests get/edit/recover-mail-templates [skip ci] 2017-01-03 21:06:45 -03:00
AntonyAntonio e317bbea38 Merge branch 'master' into OS141create-Log-Architectur 
Conflicts:
	server/controllers/staff/delete.php
	tests/system/edit-settings.rb
 2016-12-29 18:54:17 -03:00
AntonyAntonio 93fbd1cbf0 Guillermo - add TESTS log [skip ci] 2016-12-29 17:25:45 -03:00
AntonyAntonio b718598f32 Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00
AntonyAntonio 4e92a0d7a0 Merge branch 'master' into OS175-registration-with-verification-token 
Conflicts:
	tests/system/edit-settings.rb
 2016-12-26 00:27:50 -03:00
AntonyAntonio e24f46c278 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:56:01 -03:00
AntonyAntonio be2e492aa4 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:27:21 -03:00
AntonyAntonio 69c3410e03 Guillermo - add test supported languages [skip ci] 2016-12-21 01:09:35 -03:00
AntonyAntonio 83edf85f3d Guillermo - path edit-settings tests[skip ci] 2016-12-19 23:17:35 -03:00
ivan 05380fdfda Ivan - Add transfer to department [skip ci] 2016-12-13 20:19:17 -03:00
AntonyAntonio 496dc9d939 Guillermo - department parths/ department tests[skip ci] 2016-12-12 02:12:17 -03:00
ivan 9aceff4313 Ivan - Fixes for Deploy 2016-11-20 23:01:38 -03:00
ivan 10d6eebc69 Ivan - Backend - Add get-settings tests [skip ci] 2016-08-20 18:33:47 -03:00
ivan 3f01526814 Ivan - Fix issues with mail templating and add it to ruby tests [skip ci] 2016-07-27 00:44:07 -03:00