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
|
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 |
|
ivan
|
43dcf6c76a
|
Ivan - Change discard button label edit topic [skip ci]
|
2016-12-02 02:00:37 -03:00 |
|
ivan
|
5abb62da3a
|
Ivan - Update font awesome, add edit topic form with icon and icon color components [skip ci]
|
2016-12-02 01:57:59 -03:00 |
|
Ivan Diaz
|
7b9b3392a3
|
Ivan - WIP [skip ci]
|
2016-12-01 15:34:22 -03:00 |
|
Ivan Diaz
|
88f7e82e77
|
Merge branch 'master' into os-107-create-articles-list
|
2016-11-30 03:07:47 -03:00 |
|
ivan
|
7f94773abb
|
Ivan - Fix conflicts [skip ci]
|
2016-11-29 19:51:37 -03:00 |
|
ivan
|
793c11fe0f
|
Merge branch 'master' into os-103-ban-users
# Conflicts:
# client/src/core-components/search-box.js
# client/src/data/languages/en.js
|
2016-11-29 19:50:04 -03:00 |
|
ivan
|
d7eb9f702f
|
Ivan - frontend Add ban users [skip ci]
|
2016-11-29 19:47:29 -03:00 |
|
ivan
|
116fb6ce44
|
Ivan - Add user delete fixture [skip ci]
|
2016-11-28 20:00:10 -03:00 |
|
ivan
|
55e6f344c3
|
Ivan - Add user view [skip ci]
|
2016-11-28 19:56:42 -03:00 |
|
ivan
|
d5cdbd723f
|
Ivan - Add sorting arrows to table and list users [skip ci]
|
2016-11-28 16:04:38 -03:00 |
|
ivan
|
9c027c91c0
|
Ivan - Add list users view with search [skip ci]
|
2016-11-28 15:37:27 -03:00 |
|
ivan
|
0324decae3
|
Max - WIP
|
2016-11-25 18:36:45 -03:00 |
|
ivan
|
b0bb878e4b
|
Ivan - WIP
|
2016-11-25 14:46:01 -03:00 |
|
ivan
|
ee5d2b4ad1
|
Ivan - Fix fixtures [skip ci]
|
2016-11-20 23:05:53 -03:00 |
|
ivan
|
9aceff4313
|
Ivan - Fixes for Deploy
|
2016-11-20 23:01:38 -03:00 |
|
Ivan Diaz
|
43ceca55e5
|
Merged in os-163-add-search (pull request #77)
Ivan - Add all ticket search and server pagination [skip ci]
|
2016-11-20 19:09:32 +00:00 |
|
ivan
|
89837b0726
|
Ivan - Add all ticket search and server pagination [skip ci]
|
2016-11-18 01:40:43 -03:00 |
|
Ivan Diaz
|
7610293398
|
user-fixtures.js edited online with Bitbucket [skip ci]
|
2016-11-05 17:05:20 +00:00 |
|
Ivan Diaz
|
141197ba73
|
ticket-fixtures.js edited online with Bitbucket [skip ci]
|
2016-11-05 17:03:13 +00:00 |
|
Ivan Diaz
|
cef6ccd9e3
|
staff-fixtures.js edited online with Bitbucket
|
2016-11-05 17:01:04 +00:00 |
|
ivan
|
d8e48fc190
|
Merge branch 'master' into OS-78-My-tickets-view
# Conflicts:
# client/src/data/languages/en.js
|
2016-10-30 15:13:18 -03:00 |
maxred
|
5d887e63f4
|
Max - deletes comments [skip ci]
|
2016-10-29 00:49:06 -03:00 |
|
ivan
|
32b4775a49
|
Ivan - Add test to ticket list[skip ci]
|
2016-10-28 22:57:58 -03:00 |
Max Red
|
940b72bf6f
|
Max - add i18n [skip ci]
|
2016-10-28 21:21:06 -03:00 |
|
Max Red
|
59bfdf1128
|
Max - add styling to tooltip [skip ci]
|
2016-10-28 20:04:50 -03:00 |
|
Max Red
|
af29c62d82
|
Max - create info tooltip WIP [skip ci]
|
2016-10-28 19:21:55 -03:00 |