Commit Graph

144 Commits

Author SHA1 Message Date
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
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
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 8d2033ec31 Ivan - Updates needed for dev3 deploy [skip ci] 2016-12-13 21:10:49 -03:00
ivan 05380fdfda Ivan - Add transfer to department [skip ci] 2016-12-13 20:19:17 -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 Diaz 5fca935c8d Merged in 114-staff-member-view (pull request #92)
114 staff member view
2016-12-12 17:57:47 -03:00
Ivan Diaz 763e83331b Merged in OS-124-departments-paths (pull request #93)
Guillermo -   department parths/ department tests
2016-12-12 17:47:33 -03:00
AntonyAntonio 496dc9d939 Guillermo - department parths/ department tests[skip ci] 2016-12-12 02:12:17 -03:00
Ivan Diaz 54151612f7 Ivan - Add my account and fix styling issues [skip ci] 2016-12-12 01:46:50 -03:00
AntonyAntonio 49a4620457 Guillermo - department add owners property[skip ci] 2016-12-10 18:55:12 -03:00
Ivan Diaz 97ef914d27 Guillermo - staff/add-last-login [skip ci] 2016-12-08 17:39:47 -03:00
Ivan Diaz 980904f86e Guillermo - staff/edit[skip ci] 2016-12-08 14:30:19 -03:00
ivan 895fbf011f GUILLERMO - all test staff [skip ci] 2016-12-08 03:21:37 -03:00
Ivan Diaz 829e6060f5 Guillermo - staff/edit[skip ci] 2016-12-07 23:43:32 -03:00
Ivan Diaz 6bad194903 Guillermo - staff/edit[skip ci] 2016-12-07 19:30:31 -03:00
Ivan Diaz d57baa6cd8 Guillermo - staff/dellete[skip ci] 2016-12-07 17:24:42 -03:00
Ivan Diaz 630e121bfb Guillermo - staff/add [skip ci] 2016-12-07 16:59:42 -03:00
AntonyAntonio 60211c2b3c Guillermo - path / staff/delete[skip ci] 2016-12-07 02:06:50 -03:00
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
AntonyAntonio d40327f0ce Guillermo - ban-on-signup[skip ci] 2016-12-04 04:08:42 -03: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 94fd359098 Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
ivan 9aceff4313 Ivan - Fixes for Deploy 2016-11-20 23:01:38 -03:00
ivan c8ee619000 Merge branch 'master' into OS-116-Ticket-events
# Conflicts:
#	tests/init.rb
2016-11-20 19:02:47 -03:00
ivan 8b3c8bf284 Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events [skip ci] 2016-11-20 19:00:39 -03:00
Ivan Diaz 323b481c62 Merged in OS-116-Ticket-events (pull request #78)
OS-116 ticket events
2016-11-20 21:59:18 +00:00
AntonyAntonio 66281df491 Guillermo - staff-get-all-tickets[skip ci] 2016-11-19 22:54:08 -03:00
Ivan Diaz b0bb56fae2 Merged in change-profile-pic-url (pull request #76)
init-settings.php edited online with Bitbucket
2016-11-08 19:48:25 +00:00
Ivan Diaz faf2544d1d init-settings.php edited online with Bitbucket 2016-11-05 16:56:33 +00:00
ivan 83e3672f55 Ivan - Add Get all tickets and search [skip ci] 2016-11-04 19:10:32 -03:00
AntonyAntonio 7693f030f0 Guillermo - staff-get-all-tickets[skip ci] 2016-10-22 00:40:56 -03:00
ivan 47f9042c15 Guillermo - Ticket-seen [skip ci] 2016-10-21 16:38:08 -03:00
ivan 221288402e Guillermo - Ticket-seen [skip ci] 2016-10-21 16:12:17 -03:00
AntonyAntonio ef3bd809aa Guillermo - ticket-seen[skip ci] 2016-10-21 01:08:06 -03:00
Ivan Diaz 20b3f6ebc0 GuilleSabe-ticket-seen[skip ci] 2016-10-20 18:34:06 -03:00
AntonyAntonio d9124eb21a Guillermo - staff-un-assign-ticket[skip ci] 2016-10-17 23:19:04 -03:00