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

825 Commits

Author SHA1 Message Date
AntonyAntonio 78a98b9d0e Guillermo - disable-user-system [skip ci] 2017-01-16 18:15:28 -03:00
ivan e32717a1a6 Max Red - Added toggle buttons [skip ci] 2017-01-16 18:05:07 -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
ivan bcb9b5b7ac Max Red - deleted filters and custom fields [skip ci] 2017-01-16 17:00:48 -03:00
ivan 73c8d94626 Max Red - renamed user-system to advanced-settings [skip ci] 2017-01-16 16:58:46 -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
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