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

810 Commits

Author SHA1 Message Date
ivan dbfbd0cf80 Ivan - WIP [skip ci] 2017-02-13 15:45:43 -03:00
Ivan Diaz b2ad2c10ef Merged in os-152-add-advanced-settings (pull request #130) 
Os 152 add advanced settings
 2017-02-05 05:46:18 +00:00
Ivan Diaz 9c8605fef4 Merge branch 'master' into os-152-add-advanced-settings 
Conflicts:
	client/src/data/fixtures/system-fixtures.js
	client/src/data/languages/en.js
 2017-01-26 17:35:49 -03:00
Ivan Diaz 5dbbcdc114 Merged in os-157-disable-user-system-views (pull request #129) 
Os 157 disable user system views
 2017-01-26 20:29:03 +00:00
Ivan Diaz 5e51536f25 Ivan - Add api keys [skip ci] 2017-01-22 06:52:03 -03:00
ivan 796571c8a1 Ivan - Update some texts [skip ci] 2017-01-21 19:06:13 -03:00
ivan 09c6453d46 Ivan - Fix some issues related to no user system [skip ci] 2017-01-21 02:00:04 -03:00
ivan c18142f2ba Ivan - Add home link and english keys for no user system [skip ci] 2017-01-21 01:54:13 -03:00
ivan 6109e1ac73 Ivan - Add article list for no user system [skip ci] 2017-01-21 01:42:48 -03:00
ivan 0bd07ef211 Ivan - Add token ticket for backend [skip ci] 2017-01-21 01:17:28 -03:00
ivan eff51acc90 Merge branch 'master' into os-157-disable-user-system-views 
# Conflicts:
#	client/src/data/languages/en.js
 2017-01-21 00:34:45 -03:00
ivan 9db530f2dd Ivan - Add ticket view page for no user system[skip ci] 2017-01-21 00:20:25 -03:00
Ivan Diaz 4e0669c4ae Ivan - WIP [skip ci] 2017-01-20 22:01:18 -03:00
Ivan Diaz ec18363058 Ivan - Add check ticket page [skip ci] 2017-01-19 19:48:55 -03:00
Ivan Diaz 4119509cc4 Ivan - Add create ticket for no user system [skip ci] 2017-01-19 17:37:51 -03:00
ivan cf7dbffbf3 Max Red - WIP [skip ci] 2017-01-17 23:51:22 -03:00
ivan 18b736dea7 Max Red - add items from fixtures to registration api keys [skip ci] 2017-01-17 21:39:16 -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 e20760e8bb Ivan - Update home page for user system disabled [skip ci] 2017-01-17 16:27:46 -03:00
ivan e04d967c14 Max Red - space things up adding some css [skip ci] 2017-01-17 16:12:49 -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 ee5ba9dfad Max Red - WIP [skip ci] 2017-01-17 14:55:00 -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
ivan 577ce49d6f Max Red - Created top bars [skip ci] 2017-01-16 20:07:41 -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
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