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
|
f9194b1b03
|
Merged in OS-137-mail-template-paths (pull request #108)
OS-137 mail template paths
|
2017-01-04 17:41:42 -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 |
AntonyAntonio
|
d7cd5086bd
|
Guillermo - tests get/edit/recover-mail-templates [skip ci]
|
2017-01-03 21:06:45 -03:00 |
|
AntonyAntonio
|
51357c2cd8
|
Guillermo - path edit/recover-mail-templates [skip ci]
|
2017-01-03 20:35:46 -03:00 |
|
AntonyAntonio
|
1a600f4c61
|
Guillermo - path get-mail-templates [skip ci]
|
2017-01-03 19:36:26 -03:00 |
|
Ivan Diaz
|
fefe274d63
|
Merged in OS-142-path-staff-last-events (pull request #107)
Guillermo - path and tests staff/last-events
|
2017-01-03 19:04:15 -03:00 |
|
AntonyAntonio
|
78e3a4383a
|
Guillermo - path and tests staff/last-events [skip ci]
|
2017-01-03 19:02:08 -03:00 |
|
AntonyAntonio
|
af4853ed51
|
Guillermo - path and tests staff/last-events [skip ci]
|
2017-01-03 18:52:18 -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 Diaz
|
a0d1c401b8
|
Merged in OS-129-maintenancemode (pull request #104)
OS-129 maintenancemode
|
2016-12-29 23:57:03 -03:00 |
|
Ivan Diaz
|
805e78f0a2
|
Merged in OS141create-Log-Architectur (pull request #105)
Os141create log architectur
|
2016-12-29 23:56:20 -03:00 |
|
AntonyAntonio
|
e317bbea38
|
Merge branch 'master' into OS141create-Log-Architectur
Conflicts:
server/controllers/staff/delete.php
tests/system/edit-settings.rb
|
2016-12-29 18:54:17 -03:00 |
|
Ivan Diaz
|
8be3fddac5
|
Merged in OS175-registration-with-verification-token (pull request #102)
Os175 registration with verification token
|
2016-12-29 17:35:23 -03:00 |
|
AntonyAntonio
|
93fbd1cbf0
|
Guillermo - add TESTS log [skip ci]
|
2016-12-29 17:25:45 -03:00 |
|
AntonyAntonio
|
cab43cf5e0
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-29 02:50:53 -03:00 |
|
AntonyAntonio
|
c7cdfd7318
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-29 02:04:35 -03:00 |
|
AntonyAntonio
|
b718598f32
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-28 21:55:00 -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 |
|
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 |