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

700 Commits

Author SHA1 Message Date
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 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
ivan c99b5fc881 Ivan Diaz - update backend logs [skip ci] 2017-01-05 16:26:43 -03:00
Ivan Diaz 9098a36df2 Ivan - Add some infobox to system fixtures [skip ci] 2017-01-05 16:11:53 -03:00
ivan e0b10f5cae Max Red - created activity-list component [skip ci] 2017-01-05 16:10:38 -03:00
ivan 53aa8cc7f6 Max Red - Created menu type 'horizontal-list-bright', modified fixtures and add button load more with functionality [skip ci] 2017-01-05 15:45:46 -03:00
Ivan Diaz 35efa73fdb Merge branch 'master' into 184-add-info-tooltip-form-fields 2017-01-05 15:05:46 -03:00
Ivan Diaz fe0ac93311 Merged in OS-130-create-system-preferences-view (pull request #111) 
OS-130 create system preferences view
 2017-01-05 15:04:57 -03:00
Ivan Diaz 1e7b2e86e9 Merge branch 'master' into OS-130-create-system-preferences-view 
Conflicts:
	client/src/data/languages/en.js
 2017-01-05 14:53:41 -03:00
Ivan Diaz 3c4a2e3e04 Merged in os-183-update-get-settings (pull request #110) 
Ivan - Update settings values
 2017-01-05 14:49:23 -03:00
Ivan Diaz d550e01358 Ivan - Add formfield infotooltip and staff editor level info [skip ci] 2017-01-05 14:49:10 -03:00
ivan ff8ae643b3 Max Red - Created activity-row component [skip ci] 2017-01-05 14:42:48 -03:00
ivan 6ddac56bc5 Max Red - Create system and staff fixtures for last-events and get-logs [skip ci] 2017-01-05 13:31:09 -03:00
Ivan Diaz bfd01dfc36 Merged in os-136-email-templates-view (pull request #109) 
Os 136 email templates view
 2017-01-05 13:26:43 -03:00
Ivan Diaz dad5d0bd86 Ivan - Update settings values [skip ci] 2017-01-04 19:29:23 -03:00
ivan 68fe99f395 Max Red - Add functionality to "Discard changes" button, modified fixtures [skip ci] 2017-01-04 19:28:53 -03:00
ivan 3af899efcd Max Red - Add default language select [skip ci] 2017-01-04 18:39:15 -03:00
ivan f6a0ab29a0 Max Red - Modified fixtures, added recoverSettings and modified visual layout [skip ci] 2017-01-04 17:57:20 -03:00
Ivan Diaz 8e05054ef4 Ivan - Remove debugger [skip ci] 2017-01-04 17:42:51 -03:00
Ivan Diaz f9194b1b03 Merged in OS-137-mail-template-paths (pull request #108) 
OS-137 mail template paths
 2017-01-04 17:41:42 -03:00
Ivan Diaz 251af39615 Merge branch 'master' into os-136-email-templates-view 2017-01-04 17:29:52 -03:00
Ivan Diaz c1671b7e1a Ivan - Complete email templates view [skip ci] 2017-01-04 17:16:07 -03:00
Ivan Diaz a86fdc72ee Ivan - Update system fixtures for email templates 2017-01-04 15:46:57 -03:00
ivan 37ae4b1bfe Merge branch 'master' into OS-130-create-system-preferences-view 2017-01-04 15:28:51 -03:00
ivan a077a19639 Max Red - Admin panel system preferences first layout WIP [skip ci] 2017-01-04 15:27:16 -03:00
Ivan Diaz 28ae0d1bd1 Merged in 133-language-architecture-frontend (pull request #106) 
Ivan - Add supported and allowed languages architecture for frontend
 2017-01-04 15:08:41 -03:00
AntonyAntonio d7cd5086bd Guillermo - tests get/edit/recover-mail-templates [skip ci] 2017-01-03 21:06:45 -03:00
AntonyAntonio 51357c2cd8 Guillermo - path edit/recover-mail-templates [skip ci] 2017-01-03 20:35:46 -03:00
AntonyAntonio 1a600f4c61 Guillermo - path get-mail-templates [skip ci] 2017-01-03 19:36:26 -03:00
Ivan Diaz fefe274d63 Merged in OS-142-path-staff-last-events (pull request #107) 
Guillermo -   path and tests staff/last-events
 2017-01-03 19:04:15 -03:00
AntonyAntonio 78e3a4383a Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 19:02:08 -03:00
AntonyAntonio af4853ed51 Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 18:52:18 -03:00
ivan 088f1de941 Ivan - Email templates view initial approach [skip ci] 2017-01-02 14:23:19 -03:00
Ivan Diaz 6b3a24370a Ivan - Add supported and allowed languages architecture for frontend [skip ci] 2016-12-31 15:34:29 -03:00
Ivan Diaz a0d1c401b8 Merged in OS-129-maintenancemode (pull request #104) 
OS-129 maintenancemode
 2016-12-29 23:57:03 -03:00
Ivan Diaz 805e78f0a2 Merged in OS141create-Log-Architectur (pull request #105) 
Os141create log architectur
 2016-12-29 23:56:20 -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
Ivan Diaz 8be3fddac5 Merged in OS175-registration-with-verification-token (pull request #102) 
Os175 registration with verification token
 2016-12-29 17:35:23 -03:00
AntonyAntonio 93fbd1cbf0 Guillermo - add TESTS log [skip ci] 2016-12-29 17:25:45 -03:00
AntonyAntonio cab43cf5e0 Guillermo - add creatae log architecture [skip ci] 2016-12-29 02:50:53 -03:00
AntonyAntonio c7cdfd7318 Guillermo - add creatae log architecture [skip ci] 2016-12-29 02:04:35 -03:00
AntonyAntonio b718598f32 Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00