Commit Graph

241 Commits

Author SHA1 Message Date
ivan 65630d1b15 Ivan - Add pagination to table [skip ci] 2016-12-15 18:33:54 -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 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 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
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
ivan c66a73df8e Ivan - Add view restrictions for admin [skip ci] 2016-12-12 21:41:48 -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 a45f39adab Ivan - Use departmentId instead of id for edit-department and delete-department [skip ci] 2016-12-12 17:48:48 -03:00
ivan e3f50c28c6 Ivan - Add admin departments view [skip ci] 2016-12-12 17:45:53 -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
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 c0d34c68fc Ivan - Add form [skip ci] 2016-12-10 19:41:21 -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 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 5f3eb6c00f Merged in OS-112-people-list (pull request #87)
OS-112 people list
2016-12-08 15:32:13 -03:00
Ivan Diaz 980904f86e Guillermo - staff/edit[skip ci] 2016-12-08 14:30:19 -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 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 74f230abbd Ivan - WIP [skip ci] 2016-12-06 21:56:45 -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 5b5b7c329a Ivan - fix minor issues [skip ci] 2016-12-04 22:40:08 -03:00
Ivan Diaz b4b94a883e Ivan - Add search article list [skip ci] 2016-12-04 14:10:16 -03:00
Ivan Diaz c774df46f4 Merge branch 'master' into os-107-create-articles-list
Conflicts:
	client/src/data/languages/en.js
2016-12-04 02:02:59 -03:00
Ivan Diaz efa6d75387 Ivan - Add margin breadcrumb [skip ci] 2016-12-04 01:59:31 -03:00
Ivan Diaz b1331ee97d Ivan - Add breadcrumb [skip ci] 2016-12-04 01:56:39 -03:00
Ivan Diaz 17f809aeca Ivan - Add articles in user dashboard [skip ci] 2016-12-03 20:26:57 -03:00
Ivan Diaz e676330334 Ivan - Add edit article functionality [skip ci] 2016-12-03 20:03:33 -03:00
ivan 1174be9e02 Ivan - Add article preview [skip ci] 2016-12-02 07:50:16 -03:00
ivan a193acd51a Ivan - Add articles reducer and view article view [skip ci] 2016-12-02 07:38:02 -03:00
ivan bbe7b0c3d5 Ivan - boton Add topic y list articles [skip ci] 2016-12-02 06:11:11 -03:00
ivan 0862889039 Ivan - add topic viewer drag n drop functionality [skip ci] 2016-12-02 05:06:41 -03:00
ivan fb43e904d6 Ivan - font awesome add missing files [skip ci] 2016-12-02 02:51:25 -03:00
ivan b737b28a64 Ivan - Add add article modal [skip ci] 2016-12-02 02:40:36 -03:00