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

799 Commits

Author SHA1 Message Date
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
Ivan Diaz 3b1529fee3 Merged in os-167-add-last-login (pull request #89) 
Guillermo - staff/add-last-login [skip ci]
 2016-12-08 17:58:18 -03:00
Ivan Diaz 97ef914d27 Guillermo - staff/add-last-login [skip ci] 2016-12-08 17:39:47 -03:00
Ivan Diaz 5f3eb6c00f Merged in OS-112-people-list (pull request #87) 
OS-112 people list
 2016-12-08 15:32:13 -03:00
Ivan Diaz b30c9acc4f Merged in OS-117-all-staff-paths (pull request #88) 
OS-117 all staff paths
 2016-12-08 14:45:50 -03:00
Ivan Diaz 980904f86e Guillermo - staff/edit[skip ci] 2016-12-08 14:30:19 -03:00
ivan 895fbf011f GUILLERMO - all test staff [skip ci] 2016-12-08 03:21:37 -03:00
Ivan Diaz 823126d930 Max - Delete some console.logs [skip ci] 2016-12-08 02:09:05 -03:00
Ivan Diaz 84c25e46c1 Max - Prettify StaggeredMotion [skip ci] 2016-12-08 01:55:57 -03:00
Ivan Diaz 7dbdac126f Max - Fix pagination bug by adding controlled pattern [skip ci] 2016-12-08 01:39:38 -03:00
Ivan Diaz 8722c85742 Max - Add CSS styling to dropdown and button [skip ci] 2016-12-08 01:27:50 -03:00
Ivan Diaz 80f4281ab1 Max - Add filter by department in staff members [skip ci] 2016-12-08 01:01:57 -03:00
Ivan Diaz 829e6060f5 Guillermo - staff/edit[skip ci] 2016-12-07 23:43:32 -03:00
ivan c2ab1f9b6e Max - WIP [skip ci] 2016-12-07 21:13:39 -03:00
ivan d67d9ebfb1 Max - WIP people list and admin panel staff members [skip ci] 2016-12-07 20:20:43 -03:00
Ivan Diaz 6bad194903 Guillermo - staff/edit[skip ci] 2016-12-07 19:30:31 -03:00
Ivan Diaz d57baa6cd8 Guillermo - staff/dellete[skip ci] 2016-12-07 17:24:42 -03:00
Ivan Diaz 630e121bfb Guillermo - staff/add [skip ci] 2016-12-07 16:59:42 -03:00
AntonyAntonio 60211c2b3c Guillermo - path / staff/delete[skip ci] 2016-12-07 02:06:50 -03:00
AntonyAntonio 1a3adfe418 Guillermo - path / staff/get-all[skip ci] 2016-12-07 01:37:18 -03:00
ivan 74f230abbd Ivan - WIP [skip ci] 2016-12-06 21:56:45 -03:00
AntonyAntonio b2547ce5f8 Guillermo - path / staff/add[skip ci] 2016-12-06 01:32:00 -03:00
AntonyAntonio 8dd11af96b Guillermo - path / staff/add[skip ci] 2016-12-05 23:17:18 -03:00
ivan 7954a1a12a Ivan - Fix fiture 2016-12-05 15:34:53 -03:00
ivan cbc4c15101 Ivan - Fix issues with release block 2 part 2 2016-12-04 23:51:45 -03:00
Ivan Diaz e27e0c66de Merged in os-107-create-articles-list (pull request #86) 
Os 107 create articles list
 2016-12-05 01:43:06 +00:00
ivan 5b5b7c329a Ivan - fix minor issues [skip ci] 2016-12-04 22:40:08 -03:00