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 |
AntonyAntonio
|
4e92a0d7a0
|
Merge branch 'master' into OS175-registration-with-verification-token
Conflicts:
tests/system/edit-settings.rb
|
2016-12-26 00:27:50 -03:00 |
|
ivan
|
01748a2a25
|
Ivan - Update redbean version to support php7 [skip ci]
|
2016-12-24 16:53:33 -03:00 |
|
Ivan Diaz
|
bac7ea444e
|
Merged in OS-132-add-supported-lenguages (pull request #101)
OS-132 add supported lenguages
|
2016-12-23 17:12:28 -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 |
|
AntonyAntonio
|
e24f46c278
|
Guillermo - add path /user/verify [skip ci]
|
2016-12-23 01:56:01 -03:00 |
|
AntonyAntonio
|
be2e492aa4
|
Guillermo - add path /user/verify [skip ci]
|
2016-12-23 01:27:21 -03:00 |
|
ivan
|
6351666258
|
Ivan - Add error messages for admin tickets view [skip ci]
|
2016-12-23 00:18:41 -03:00 |
|
AntonyAntonio
|
5c2f482c10
|
Guillermo - add path /user/verify [skip ci]
|
2016-12-22 03:07:06 -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
|
488633b0c2
|
Ivan - Avoid staff deleting himself and avoid level change to oneself [skip ci]
|
2016-12-21 17:54:02 -03:00 |
|
Ivan Diaz
|
70a341176f
|
Merged in os-166-pagination (pull request #99)
Ivan - Add pagination to table
|
2016-12-21 17:08:08 -03:00 |
|
ivan
|
91f8394ef6
|
Ivan - Add 6000 as max characters for commit [skip ci]
|
2016-12-21 17:07:34 -03:00 |
|
AntonyAntonio
|
69c3410e03
|
Guillermo - add test supported languages [skip ci]
|
2016-12-21 01:09:35 -03:00 |
|
AntonyAntonio
|
7f9c12df36
|
Guillermo - add supported and allowed editable [skip ci]
|
2016-12-21 00:00:19 -03:00 |
|
AntonyAntonio
|
d30d14d58b
|
Merge branch 'master' into OS-132-add-supported-lenguages
|
2016-12-20 23:29:55 -03:00 |
|
AntonyAntonio
|
b26db547dc
|
Guillermo - add supported languages[skip ci]
|
2016-12-20 23:29:19 -03:00 |
|
Ivan Diaz
|
6d9d3e8248
|
Merged in OS131-Path-system-edit-settings (pull request #100)
Os131 path system edit settings
|
2016-12-20 23:28:02 -03:00 |
|
ivan
|
7ef2eec14b
|
Ivan - Add icon to drag and drop [skip ci]
|
2016-12-20 23:26:46 -03:00 |
|
AntonyAntonio
|
83edf85f3d
|
Guillermo - path edit-settings tests[skip ci]
|
2016-12-19 23:17:35 -03:00 |
|
AntonyAntonio
|
8aaca982d6
|
Merge branch 'master' into OS131-Path-system-edit-settings
|
2016-12-18 23:43:41 -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 |
|
AntonyAntonio
|
da2373e013
|
Guillermo - path edit-settings[skip ci]
|
2016-12-14 22:27:31 -03:00 |
|
Ivan Diaz
|
abea0bbb97
|
Merged in OS128-add-additionals-settings (pull request #96)
Os128 add additionals settings
|
2016-12-13 23:25:07 -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 Diaz
|
c0b3546e47
|
Merged in os-126-deploy (pull request #98)
Os 126 deploy
|
2016-12-13 21:37:56 -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
|
959c9525ed
|
Merge branch 'master' into os-126-deploy
|
2016-12-13 20:20:06 -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 |
|
ivan
|
05380fdfda
|
Ivan - Add transfer to department [skip ci]
|
2016-12-13 20:19:17 -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 |
|
AntonyAntonio
|
0000fe5159
|
Guillermo - path edit-settings[skip ci]
|
2016-12-13 02:03:35 -03:00 |
|
AntonyAntonio
|
2a1176516c
|
Guillermo - additional settings[skip ci]
|
2016-12-13 00:21:06 -03:00 |
|
AntonyAntonio
|
d13ff18528
|
Guillermo - add new settings[skip ci]
|
2016-12-13 00:19:57 -03:00 |
|
ivan
|
c66a73df8e
|
Ivan - Add view restrictions for admin [skip ci]
|
2016-12-12 21:41:48 -03:00 |