AntonyAntonio
|
1a3adfe418
|
Guillermo - path / staff/get-all[skip ci]
|
2016-12-07 01:37:18 -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
|
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 |
|
Ivan Diaz
|
b4b94a883e
|
Ivan - Add search article list [skip ci]
|
2016-12-04 14:10:16 -03:00 |
|
Ivan Diaz
|
a314f6d989
|
Merged in OS-96-user/get-users (pull request #85)
OS-96 user/get users
|
2016-12-04 16:04:18 +00:00 |
|
AntonyAntonio
|
d40327f0ce
|
Guillermo - ban-on-signup[skip ci]
|
2016-12-04 04:08:42 -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
|
e962afba67
|
guillermo- add all test #os-101 #os-96 #os-97 #os-100[skip ci]
|
2016-12-01 15:07:11 -03:00 |
|
Ivan Diaz
|
efa715751c
|
Merged in os-103-ban-users (pull request #84)
Ivan - frontend Add ban users [skip ci]
|
2016-12-01 17:08:47 +00:00 |
|
ivan
|
f6ae50ef87
|
guillermo- banning architecture [skip ci]
|
2016-11-30 19:16:18 -03:00 |
|
ivan
|
f3c1882a13
|
guillermo- delete-user [skip ci]
|
2016-11-30 17:30:00 -03:00 |
|
ivan
|
5907cbda00
|
guillermo- get-user [skip ci]
|
2016-11-30 14:13:57 -03:00 |
|
ivan
|
8ab6240385
|
guillermo- get-users [skip ci]
|
2016-11-30 03:33:46 -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 Diaz
|
5c4eef12e5
|
Merged in OS-102-user-view (pull request #83)
Ivan - Add user view [skip ci]
|
2016-11-29 22:47:53 +00: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 Diaz
|
b2ac69a8ad
|
Merged in OS-99-list-users-view (pull request #82)
OS-99 list users view
|
2016-11-28 22:58:35 +00: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
|
2703f82253
|
Ivan - Fix master issues. Improve error handling
|
2016-11-24 18:02:18 -03:00 |
|
Ivan Diaz
|
9ec10a356b
|
Merged in OS-105-topic-articles-models (pull request #81)
OS-105 topic articles models
|
2016-11-24 17:13:50 +00:00 |
|
ivan
|
94fd359098
|
Ivan - Add articles paths [skip ci]
|
2016-11-22 22:27:05 -03:00 |
|
ivan
|
d227b3f34d
|
Ivan - Create article and topic datastore [skip ci]
|
2016-11-21 16:55:05 -03:00 |
|
Ivan Diaz
|
8c25561f8a
|
Merged in OS-93-admin-tIcket-deploy (pull request #80)
Ivan - Fixes for Deploy
|
2016-11-21 02:48:37 +00: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
|
79dcbe030e
|
Merged in OS-116-Ticket-events (pull request #79)
Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events
|
2016-11-20 22:48:33 +00:00 |
|
ivan
|
c8ee619000
|
Merge branch 'master' into OS-116-Ticket-events
# Conflicts:
# tests/init.rb
|
2016-11-20 19:02:47 -03:00 |