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 b26db547dc Guillermo - add supported languages[skip ci] 2016-12-20 23:29:19 -03:00
Ivan Diaz 6d9d3e8248 Merged in OS131-Path-system-edit-settings (pull request #100) 
Os131 path system edit settings
 2016-12-20 23:28:02 -03:00
ivan 7ef2eec14b Ivan - Add icon to drag and drop [skip ci] 2016-12-20 23:26:46 -03:00
AntonyAntonio 83edf85f3d Guillermo - path edit-settings tests[skip ci] 2016-12-19 23:17:35 -03:00
AntonyAntonio 8aaca982d6 Merge branch 'master' into OS131-Path-system-edit-settings 2016-12-18 23:43:41 -03:00
ivan 04f1d12e7d Ivan - Fix drag and drop os-172 multiple topics [skip ci] 2016-12-16 01:58:27 -03:00
ivan e0d1fd0e40 Ivan - Add delete article button[skip ci] 2016-12-16 01:22:26 -03:00
ivan 0d921472e2 Ivan - Fix bug os-171 - fixed width for add article modal[skip ci] 2016-12-16 01:02:34 -03:00
ivan 65630d1b15 Ivan - Add pagination to table [skip ci] 2016-12-15 18:33:54 -03:00
AntonyAntonio da2373e013 Guillermo - path edit-settings[skip ci] 2016-12-14 22:27:31 -03:00
Ivan Diaz abea0bbb97 Merged in OS128-add-additionals-settings (pull request #96) 
Os128 add additionals settings
 2016-12-13 23:25:07 -03:00
Ivan Diaz 839bc0bf9e Merged in OS-168-update-dates (pull request #97) 
OS-168 update dates
 2016-12-13 22:06:58 -03:00
Ivan Diaz c0b3546e47 Merged in os-126-deploy (pull request #98) 
Os 126 deploy
 2016-12-13 21:37:56 -03:00
ivan 8d2033ec31 Ivan - Updates needed for dev3 deploy [skip ci] 2016-12-13 21:10:49 -03:00
Max Red 5dd9ae10a9 Max - makes second paremeter of DateTransformer.transformToString optional [skip ci] 2016-12-13 20:33:58 -03:00
ivan 959c9525ed Merge branch 'master' into os-126-deploy 2016-12-13 20:20:06 -03:00
Ivan Diaz 4ef41d08a0 Merged in os-127-view-restrictions (pull request #95) 
Ivan - Add view restrictions for admin
 2016-12-13 20:19:40 -03:00
ivan 05380fdfda Ivan - Add transfer to department [skip ci] 2016-12-13 20:19:17 -03:00
Max Red 0dff819838 Max - error with spaces #2 [skip ci] 2016-12-13 16:48:53 -03:00
Max Red 2c3e5fe5e6 Max - error with spaces [skip ci] 2016-12-13 16:47:09 -03:00
Max Red 49b902fa12 Max - upsi, sin querer habia cambiado esto... [skip ci] 2016-12-13 16:44:02 -03:00
Max Red 02e799cc9f Max - Modifies frontend to make sure date is displayed correctly at each place and adds at when showing hours and minutes [skip ci] 2016-12-13 16:33:58 -03:00
AntonyAntonio 0000fe5159 Guillermo - path edit-settings[skip ci] 2016-12-13 02:03:35 -03:00
AntonyAntonio 2a1176516c Guillermo - additional settings[skip ci] 2016-12-13 00:21:06 -03:00
AntonyAntonio d13ff18528 Guillermo - add new settings[skip ci] 2016-12-13 00:19:57 -03:00
ivan c66a73df8e Ivan - Add view restrictions for admin [skip ci] 2016-12-12 21:41:48 -03:00
Ivan Diaz 8b69934d36 Merged in os-125-admin-departments-view (pull request #94) 
Os 125 admin departments view
 2016-12-12 21:41:14 -03:00
ivan 69de6d57ee Ivan - Add department transfer dropdown when deleting [skip ci] 2016-12-12 19:36:02 -03:00
ivan 2d1ad93f3b Ivan - Add internationalization for departments view [skip ci] 2016-12-12 18:15:37 -03:00
ivan dbc7f155f4 Merge branch 'master' into os-125-admin-departments-view 
# Conflicts:
#	client/src/data/fixtures/staff-fixtures.js
 2016-12-12 18:05:12 -03:00
ivan 1b72c23844 Ivan - Update departments view styling [skip ci] 2016-12-12 18:02:28 -03:00
Ivan Diaz 5fca935c8d Merged in 114-staff-member-view (pull request #92) 
114 staff member view
 2016-12-12 17:57:47 -03:00
ivan a45f39adab Ivan - Use departmentId instead of id for edit-department and delete-department [skip ci] 2016-12-12 17:48:48 -03:00
Ivan Diaz 763e83331b Merged in OS-124-departments-paths (pull request #93) 
Guillermo -   department parths/ department tests
 2016-12-12 17:47:33 -03:00
ivan e3f50c28c6 Ivan - Add admin departments view [skip ci] 2016-12-12 17:45:53 -03:00
Max Red be3cdf25f9 Max - modifies backend date function [skip ci] 2016-12-12 15:56:25 -03:00
Max Red 3d2fe3f1c9 Max - modifies date transformer (transformToString now takes an extra argument) [skip ci] 2016-12-12 15:49:48 -03:00
AntonyAntonio 496dc9d939 Guillermo - department parths/ department tests[skip ci] 2016-12-12 02:12:17 -03:00
Ivan Diaz 54151612f7 Ivan - Add my account and fix styling issues [skip ci] 2016-12-12 01:46:50 -03:00
Ivan Diaz 27b42c6112 Ivan - Complete staff edit component [skip ci] 2016-12-12 00:01:21 -03:00
Ivan Diaz b424016721 Merged in os-123-add-owned-property-to-department (pull request #91) 
Os 123 add owned property to department
 2016-12-11 17:56:54 -03:00
Ivan Diaz c0d34c68fc Ivan - Add form [skip ci] 2016-12-10 19:41:21 -03:00
AntonyAntonio 1d90b80c90 Guillermo - department add owners property add tests[skip ci] 2016-12-10 19:06:21 -03:00
AntonyAntonio 49a4620457 Guillermo - department add owners property[skip ci] 2016-12-10 18:55:12 -03:00
Ivan Diaz adfb1c7335 Merge branch 'master' into 114-staff-member-view 
Conflicts:
	client/src/data/languages/en.js
 2016-12-10 16:38:28 -03:00
Ivan Diaz 33fa5996d2 Merged in OS-118-add-staff-modal (pull request #90) 
OS-118 add staff modal
 2016-12-10 16:37:02 -03:00
Ivan Diaz 5ce4fa1f44 Ivan - Add API call to add staff modal [skip ci] 2016-12-10 16:33:49 -03:00
ivan 1e69ca3651 Ivan - Update checkbox styling, add custom scroll style for chrome [skip ci] 2016-12-09 18:59:26 -03:00
ivan 77f8976896 Ivan - Add Checkbox group component [skip ci] 2016-12-09 17:51:30 -03:00
ivan 8a5474ffc4 Max - Create add staff modal [skip ci] 2016-12-08 18:37:41 -03:00