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

790 Commits

Author SHA1 Message Date
Ivan Diaz a34429d32a Merged in OS-149-delete-all-users (pull request #120) 
Guillermo -   path-delete-all-users
 2017-01-14 13:44:16 -03:00
AntonyAntonio a9b52d7ed9 Merge branch 'master' into OS-149-delete-all-users 
Conflicts:
	server/controllers/system.php
 2017-01-14 13:42:08 -03:00
ivan 4f7118c2e5 Max Red - Abstracting StatsChart, modified demo page [skip ci] 2017-01-14 01:45:21 -03:00
Ivan Diaz dffe4a87a0 Ivan - Add file upload and download test [skip ci] 2017-01-13 21:58:59 -03:00
Ivan Diaz 9f1a1cb09c Merged in OS187-Registration-api-keys (pull request #122) 
Os187 registration api keys
 2017-01-13 21:21:27 -03:00
ivan 8221a06048 Max Red - WIP second layout [skip ci] 2017-01-13 17:06:52 -03:00
AntonyAntonio 0108414a70 Guillermo - registration api keys [skip ci] 2017-01-13 17:06:49 -03:00
AntonyAntonio f79913de97 Guillermo - registration api keys [skip ci] 2017-01-13 15:50:35 -03:00
ivan 1944f7109d Merge branch 'master' into os-146-add-stats-component 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-13 15:19:39 -03:00
ivan 6a22ba711e Max Red - WIP first layout [skip ci] 2017-01-13 15:17:43 -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
Ivan Diaz 01ac3e432d Merged in fixmastertestdate (pull request #121) 
Guillermo -   fix master tests date
 2017-01-13 13:57:30 -03:00
AntonyAntonio 087a24c75c Guillermo - stast architecture [skip ci] 2017-01-13 13:46:57 -03:00
Ivan Diaz cadd5a663e Merged in OS-144Stats-Architecture (pull request #119) 
OS-144stats architecture
 2017-01-13 12:39:52 -03:00
Ivan Diaz 3743ec5e67 Merged in os-145-toggle-list (pull request #117) 
Os 145 toggle list
 2017-01-13 12:06:28 -03:00
ivan 139a474693 Max Red - beautify code and set default selected indices to an empty array [skip ci] 2017-01-13 10:33:17 -03:00
ivan 71984384cc Ivan - Add validations before download and upload on comment [skip ci] 2017-01-12 20:31:12 -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 1d514dda58 Guillermo - path-delete-all-users [skip ci] 2017-01-12 17:06:41 -03:00
ivan 134540fed9 Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci] 2017-01-12 16:45:01 -03:00
AntonyAntonio b8d24b601d Guillermo - stats architecture [skip ci] 2017-01-12 16:30:58 -03:00
ivan be49990091 Ivan - Add files folder [skip ci] 2017-01-12 03:02:56 -03:00
AntonyAntonio 868d08ecb2 Guillermo - stats architecture [skip ci] 2017-01-12 02:50:45 -03:00
AntonyAntonio 845939f089 Guillermo - stats architecture [skip ci] 2017-01-11 04:25:26 -03:00
Ivan Diaz ae27ee390e Merged in OS4#150Enable-registration (pull request #115) 
Os4#150enable registration
 2017-01-11 04:01:18 -03:00
ivan 9383fd0d3e Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react 
# Conflicts:
#	server/controllers/system/get-settings.php
 2017-01-11 03:50:47 -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 149a18c52e Merged in deploy-dev3-bloque-3 (pull request #116) 
Ivan - Deploy changes
 2017-01-11 00:41:14 -03:00
Ivan Diaz 3299c3dd8d Ivan - Deploy changes [skip ci] 2017-01-11 00:21:27 -03:00
Ivan Diaz 258f4003c0 Merged in os-177-verification-view (pull request #114) 
Os 177 verification view
 2017-01-10 23:37:47 -03:00
ivan 6fc460d4b6 Max Red - Modified some things, I don't know which [skip ci] 2017-01-10 18:27:53 -03:00
Ivan Diaz 42c1e81fbc Ivan - Fix login test 2017-01-10 17:10:28 -03:00
Ivan Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
ivan b75660ec1d Max Red - Created first layout and functionality of ToggleList component [skip ci] 2017-01-10 16:45:58 -03:00
AntonyAntonio 397246aa4b Guillermo - paths enable/disable registration[skip ci] 2017-01-10 16:04:25 -03:00
AntonyAntonio a317f6a29c Guillermo - paths enable/disable registration[skip ci] 2017-01-10 15:22:36 -03:00
Ivan Diaz c248c8d486 Ivan - Add verification for admin view [skip ci] 2017-01-10 13:34:16 -03:00
Ivan Diaz a113d547d2 Ivan - Add verification token return data for backend [skip ci] 2017-01-10 13:19:36 -03:00
Ivan Diaz ae946a7397 Ivan - Add verification token for frontend user view [skip ci] 2017-01-10 13:14:35 -03:00
Ivan Diaz 91e539a053 Ivan - Fix master type [skip ci] 2017-01-06 18:40:33 -03:00
Ivan Diaz e9854341f0 Merged in 184-add-info-tooltip-form-fields (pull request #113) 
184 add info tooltip form fields
 2017-01-06 16:36:37 -03:00
Ivan Diaz e9a0b6ac9e Merged in os-143-last-activity (pull request #112) 
Os 143 last activity
 2017-01-06 16:36:18 -03:00
ivan 4213c77e6e Ivan Diaz - Fix activity list minor issues [skip ci] 2017-01-05 21:31:43 -03:00
Ivan Diaz 9288067958 Ivan - Add language list validation [skip ci] 2017-01-05 18:22:36 -03:00
ivan 5ea4137e41 Max Red - Finally we did it! [skip ci] 2017-01-05 18:01:56 -03:00
Ivan Diaz e78808eb6c Ivan - Language selection for system preferences [skip ci] 2017-01-05 17:15:20 -03:00
ivan 1465a53616 Merge branch 'master' into os-143-last-activity 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-05 16:27:19 -03:00