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
AntonyAntonio 38f71212a6 Guillermo - disable-user-system [skip ci] chinese 2017-02-07 03:55:54 -03:00
AntonyAntonio 6057c40f4a Guillermo - disable-user-system [skip ci] chinese 2017-01-31 22:59:02 -03:00
AntonyAntonio 72d556549e Guillermo - disable-user-system [skip ci] chinese 2017-01-29 00:15:23 -03:00
AntonyAntonio 85f1bef0b3 Guillermo - disable-user-system [skip ci] パスワ 2017-01-25 01:14:33 -03:00
Ivan Diaz d3ecbacf2d Merged in os-146-add-stats-component (pull request #124) 
Os 146 add stats component
 2017-01-17 16:54:04 -03:00
Ivan Diaz 585159e84c Merged in OS156-Disable-user-system (pull request #126) 
Os156 disable user system
 2017-01-17 15:58:50 -03:00
ivan bce56d7b05 Max Red - make toggle list unselectable and not able to change cursor view [skip ci] 2017-01-17 15:53:43 -03:00
ivan 26d26320c9 Max Red - deleted console.logs from system-fixtures [skip ci] 2017-01-17 15:52:12 -03:00
ivan f1c82dc384 Max Red - beautified code a little bit more replacing another for for another map [skip ci] 2017-01-17 15:50:33 -03:00
ivan fda6e798a0 Max Red - problems with displaying stats in admin-panel-my-account view, Ivan fixed it [skip ci] 2017-01-17 15:26:18 -03:00
ivan 4fb1c32cbc Max Red - beautified code by replacing a for for a map (: [skip ci] 2017-01-17 15:09:00 -03:00
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
Ivan Diaz 0e88a9715a Merged in os-153-disable-registration (pull request #125) 
Max Red - disable registration and fixed a message in en.js
 2017-01-17 14:59:39 -03:00
ivan a40121111e Max Red - modified registration setting in fixtures [skip ci] 2017-01-17 14:58:28 -03:00
Ivan Diaz 90d04d9444 Merged in OS154-CSV-Import (pull request #128) 
Ivan - Add csv file
 2017-01-16 22:07:22 -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
Ivan Diaz ebc2800698 Merged in OS154-CSV-Import (pull request #127) 
Os154 csv import
 2017-01-16 19:00:07 -03:00
AntonyAntonio 78a98b9d0e Guillermo - disable-user-system [skip ci] 2017-01-16 18:15:28 -03:00
AntonyAntonio c4b63aab43 Guillermo - disable-user-system [skip ci] 2017-01-16 18:04:26 -03:00
AntonyAntonio 8ce33a2e40 Guillermo - disable-user-system [skip ci] 2017-01-16 17:11:45 -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 a70778db9c Max Red - disable registration and fixed a message in en.js[skip ci] 2017-01-16 16:06:19 -03:00
ivan 1019b4ff96 Max Red - Delete redundant css [skip ci] 2017-01-16 12:39:07 -03:00
ivan 9fbf53d586 Max Red - Beautify code, replacing another for using .map [skip ci] 2017-01-16 12:20:22 -03:00
ivan 7c19ef1716 Max Red - Beautify code, replacing a for using .map [skip ci] 2017-01-16 12:04:47 -03:00
ivan 8584be0924 Max Red - Changed colors [skip ci] 2017-01-15 20:10:02 -03:00
ivan 371b7973b2 Max Red - Ivan changed some things (problems with userId in my-account) and I kept abstacting the component, and applied it to staff-editor [skip ci] 2017-01-15 19:46:08 -03:00
ivan da928f9b6f Max Red - Added abstraction to the component in order to work in view-staff page [skip ci] 2017-01-15 18:33:00 -03:00
AntonyAntonio 565c60c198 Guillermo - csv import [skip ci] 2017-01-15 17:33:33 -03:00
ivan ebb3516df3 Max Red - Starting refactoring of component stats [skip ci] 2017-01-15 17:20:48 -03:00
AntonyAntonio 8f2310f855 Merge branch 'master' into OS154-CSV-Import 
Conflicts:
	server/controllers/system.php
 2017-01-15 17:08:07 -03:00
ivan 30f1526f1c Max Red - Added even even more more basic scss [skip ci] 2017-01-15 15:47:13 -03:00
ivan 0500666174 Max Red - Added even more basic scss [skip ci] 2017-01-15 15:07:07 -03:00
Ivan Diaz e8e29d8701 Ivan - Fix static ticketevent 2017-01-15 01:36:04 -03:00
ivan 1f6e3ae028 Max Red - Added basic scss [skip ci] 2017-01-15 00:07:02 -03:00
Ivan Diaz bfcb02b311 Merged in os-147-151-file-architecture-and-backup (pull request #123) 
Os 147 151 file architecture and backup
 2017-01-15 00:02:45 -03:00
Ivan Diaz 575f34256a Ivan - Fix unit testing backend 2017-01-14 23:51:31 -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 35d9a166cf Ivan - Add file download component [skip ci] 2017-01-14 21:44:20 -03:00
ivan fd2c20ac9f Max Red - Added all functionality to the component [skip ci] 2017-01-14 21:31:02 -03:00
ivan 19f25657ef Max Red - Corrected to work even if the response of system/get-stats is not the full week/month/year etc.. [skip ci] 2017-01-14 18:47:04 -03:00
ivan 9861bfb023 Max Red - Added functionality to dropdown [skip ci] 2017-01-14 18:41:19 -03:00
AntonyAntonio 6eae5f9299 Guillermo - csv import [skip ci] 2017-01-14 18:19:21 -03:00
ivan 7022dfeabf Max Red - Showing real data in graph taken from fixtures [skip ci] 2017-01-14 17:20:04 -03:00
Ivan Diaz d575882bf2 Ivan - Add file uploader component [skip ci] 2017-01-14 16:39:22 -03:00
ivan 8c50cc97c9 Max Red - Create stats state, and display correct values in the toggle list [skip ci] 2017-01-14 15:15:26 -03:00
ivan 1e69e6f4f8 Max Red - Finished StatsChart component, started full component [skip ci] 2017-01-14 14:17:35 -03:00
ivan d12194cd34 Max Red - beautify code and add functionality [skip ci] 2017-01-14 14:00:02 -03:00