Ivan Diaz
|
e9854341f0
|
Merged in 184-add-info-tooltip-form-fields (pull request #113)
184 add info tooltip form fields
|
2017-01-06 16:36:37 -03:00 |
|
ivan
|
4213c77e6e
|
Ivan Diaz - Fix activity list minor issues [skip ci]
|
2017-01-05 21:31:43 -03:00 |
|
Ivan Diaz
|
9288067958
|
Ivan - Add language list validation [skip ci]
|
2017-01-05 18:22:36 -03:00 |
|
ivan
|
5ea4137e41
|
Max Red - Finally we did it! [skip ci]
|
2017-01-05 18:01:56 -03:00 |
|
Ivan Diaz
|
e78808eb6c
|
Ivan - Language selection for system preferences [skip ci]
|
2017-01-05 17:15:20 -03:00 |
|
ivan
|
1465a53616
|
Merge branch 'master' into os-143-last-activity
# Conflicts:
# client/src/data/languages/en.js
|
2017-01-05 16:27:19 -03:00 |
|
Ivan Diaz
|
9098a36df2
|
Ivan - Add some infobox to system fixtures [skip ci]
|
2017-01-05 16:11:53 -03:00 |
|
ivan
|
e0b10f5cae
|
Max Red - created activity-list component [skip ci]
|
2017-01-05 16:10:38 -03:00 |
|
ivan
|
53aa8cc7f6
|
Max Red - Created menu type 'horizontal-list-bright', modified fixtures and add button load more with functionality [skip ci]
|
2017-01-05 15:45:46 -03:00 |
|
Ivan Diaz
|
35efa73fdb
|
Merge branch 'master' into 184-add-info-tooltip-form-fields
|
2017-01-05 15:05:46 -03:00 |
|
Ivan Diaz
|
1e7b2e86e9
|
Merge branch 'master' into OS-130-create-system-preferences-view
Conflicts:
client/src/data/languages/en.js
|
2017-01-05 14:53:41 -03:00 |
|
Ivan Diaz
|
d550e01358
|
Ivan - Add formfield infotooltip and staff editor level info [skip ci]
|
2017-01-05 14:49:10 -03:00 |
|
ivan
|
ff8ae643b3
|
Max Red - Created activity-row component [skip ci]
|
2017-01-05 14:42:48 -03:00 |
|
ivan
|
6ddac56bc5
|
Max Red - Create system and staff fixtures for last-events and get-logs [skip ci]
|
2017-01-05 13:31:09 -03:00 |
|
ivan
|
68fe99f395
|
Max Red - Add functionality to "Discard changes" button, modified fixtures [skip ci]
|
2017-01-04 19:28:53 -03:00 |
|
ivan
|
3af899efcd
|
Max Red - Add default language select [skip ci]
|
2017-01-04 18:39:15 -03:00 |
|
ivan
|
f6a0ab29a0
|
Max Red - Modified fixtures, added recoverSettings and modified visual layout [skip ci]
|
2017-01-04 17:57:20 -03:00 |
|
Ivan Diaz
|
8e05054ef4
|
Ivan - Remove debugger [skip ci]
|
2017-01-04 17:42:51 -03:00 |
|
Ivan Diaz
|
251af39615
|
Merge branch 'master' into os-136-email-templates-view
|
2017-01-04 17:29:52 -03:00 |
|
Ivan Diaz
|
c1671b7e1a
|
Ivan - Complete email templates view [skip ci]
|
2017-01-04 17:16:07 -03:00 |
|
Ivan Diaz
|
a86fdc72ee
|
Ivan - Update system fixtures for email templates
|
2017-01-04 15:46:57 -03:00 |
|
ivan
|
37ae4b1bfe
|
Merge branch 'master' into OS-130-create-system-preferences-view
|
2017-01-04 15:28:51 -03:00 |
|
ivan
|
a077a19639
|
Max Red - Admin panel system preferences first layout WIP [skip ci]
|
2017-01-04 15:27:16 -03:00 |
|
Ivan Diaz
|
28ae0d1bd1
|
Merged in 133-language-architecture-frontend (pull request #106)
Ivan - Add supported and allowed languages architecture for frontend
|
2017-01-04 15:08:41 -03:00 |
|
ivan
|
088f1de941
|
Ivan - Email templates view initial approach [skip ci]
|
2017-01-02 14:23:19 -03:00 |
|
Ivan Diaz
|
6b3a24370a
|
Ivan - Add supported and allowed languages architecture for frontend [skip ci]
|
2016-12-31 15:34:29 -03:00 |
|
ivan
|
6f58c28af5
|
Merge branch 'master' into OS-129-maintenancemode
# Conflicts:
# client/src/data/languages/en.js
|
2016-12-27 18:41:53 -03:00 |
|
ivan
|
1d224dd5b1
|
Ivan - Add maintenance mode styling [skip ci]
|
2016-12-27 18:34:59 -03:00 |
|
Ivan Diaz
|
5874cf279e
|
Merged in fix-some-bugs (pull request #103)
Fix some bugs
|
2016-12-27 16:05:42 -03:00 |
|
ivan
|
e842755b9e
|
Ivan - Add maintenance mode structure [skip ci]
|
2016-12-27 16:05:24 -03:00 |
|
ivan
|
42cd025433
|
Ivan - Add delete button for staff [skip ci]
|
2016-12-26 01:30:04 -03:00 |
|
ivan
|
cb7885f5d9
|
Ivan - Add messages to staff editor [skip ci]
|
2016-12-26 01:07:40 -03:00 |
|
ivan
|
0fd70ec441
|
Ivan - Add error messages for admin articles view [skip ci]
|
2016-12-23 17:07:21 -03:00 |
|
ivan
|
5b68997437
|
Ivan - Add error messages for admin users view [skip ci]
|
2016-12-23 04:28:32 -03:00 |
|
ivan
|
6351666258
|
Ivan - Add error messages for admin tickets view [skip ci]
|
2016-12-23 00:18:41 -03:00 |
|
ivan
|
d2c2327a60
|
Ivan - Add message for ticket comment error [skip ci]
|
2016-12-21 19:16:21 -03:00 |
|
ivan
|
b6af2f44ab
|
Ivan - Improve ticketinfo styling [skip ci]
|
2016-12-21 18:56:54 -03:00 |
|
ivan
|
84810ba57d
|
Ivan - Improve TicketInfo style [skip ci]
|
2016-12-21 18:55:12 -03:00 |
|
ivan
|
750251311c
|
Ivan - Improve tooltip styling and animation [skip ci]
|
2016-12-21 18:33:10 -03:00 |
|
ivan
|
91f8394ef6
|
Ivan - Add 6000 as max characters for commit [skip ci]
|
2016-12-21 17:07:34 -03:00 |
|
ivan
|
7ef2eec14b
|
Ivan - Add icon to drag and drop [skip ci]
|
2016-12-20 23:26:46 -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 |
|
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 |