tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
900 Commits 77 Branches 19 Tags 15 MiB
Commit Graph

228 Commits

Author SHA1 Message Date
ivan f2401dcec7 Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci] 2017-01-12 18:29:50 -03:00
AntonyAntonio 8763264a01 Merge branch 'master' into OS-144Stats-Architecture 
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	tests/init.rb
 2017-01-12 17:10:37 -03:00
AntonyAntonio 1d514dda58 Guillermo - path-delete-all-users [skip ci] 2017-01-12 17:06:41 -03:00
ivan 134540fed9 Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci] 2017-01-12 16:45:01 -03:00
AntonyAntonio b8d24b601d Guillermo - stats architecture [skip ci] 2017-01-12 16:30:58 -03:00
AntonyAntonio 868d08ecb2 Guillermo - stats architecture [skip ci] 2017-01-12 02:50:45 -03:00
AntonyAntonio 845939f089 Guillermo - stats architecture [skip ci] 2017-01-11 04:25:26 -03:00
ivan 9383fd0d3e Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react 
# Conflicts:
#	server/controllers/system/get-settings.php
 2017-01-11 03:50:47 -03:00
ivan a7ef5c10f2 Merge branch 'master' into OS4#150Enable-registration 
# Conflicts:
#	server/controllers/system/get-settings.php
 2017-01-11 03:49:32 -03:00
Ivan Diaz 3299c3dd8d Ivan - Deploy changes [skip ci] 2017-01-11 00:21:27 -03:00
Ivan Diaz 1ca57e1b76 Ivan - Add deploy on dev 3 changes and fixes [skip ci] 2017-01-10 17:07:49 -03:00
AntonyAntonio 397246aa4b Guillermo - paths enable/disable registration[skip ci] 2017-01-10 16:04:25 -03:00
AntonyAntonio a317f6a29c Guillermo - paths enable/disable registration[skip ci] 2017-01-10 15:22:36 -03:00
Ivan Diaz a113d547d2 Ivan - Add verification token return data for backend [skip ci] 2017-01-10 13:19:36 -03:00
ivan 5ea4137e41 Max Red - Finally we did it! [skip ci] 2017-01-05 18:01:56 -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 c99b5fc881 Ivan Diaz - update backend logs [skip ci] 2017-01-05 16:26:43 -03:00
Ivan Diaz dad5d0bd86 Ivan - Update settings values [skip ci] 2017-01-04 19:29:23 -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
AntonyAntonio af4853ed51 Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 18:52:18 -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 Diaz 5874cf279e Merged in fix-some-bugs (pull request #103) 
Fix some bugs
 2016-12-27 16:05:42 -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
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
AntonyAntonio 5c2f482c10 Guillermo - add path /user/verify [skip ci] 2016-12-22 03:07:06 -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 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
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
ivan 73633278e6 guillermo- wip [skip ci] 2016-10-15 05:03:56 -03:00
ivan 920d7248f5 guillermo- path-ticket-change-priority [skip ci] 2016-10-15 04:32:38 -03:00
ivan 073a429231 guillermo- path-ticket-close and path-ticket-re-open [skip ci] 2016-10-15 03:23:12 -03:00
ivan ea586072eb guillermo- path- tickets-change-department [skip ci] 2016-10-15 01:32:44 -03:00
ivan 59099a3bbf guillermo- path- staff-get-ticket [skip ci] 2016-10-14 21:59:11 -03:00
ivan fd42574d15 guillermo- path- staff-un-assign-ticket [skip ci] 2016-10-14 16:32:32 -03:00
ivan 5034ba71a3 guillermo- path- staff-un-assign-ticket [skip ci] 2016-10-14 16:12:54 -03:00
ivan 6083c8731d Ivan - Add delete custom response [skip ci] 2016-10-13 20:29:36 -03:00
ivan db97ee09b7 guillermo - add asign staff ticket [skip ci] 2016-10-07 19:03:21 -03:00
ivan 2eed29e910 Merge branch 'master' into OS-79-assign-ticket-to-staff 2016-10-07 17:40:55 -03:00
ivan 84b33ea871 Ivan - Add CustomResponse model and paths [skip ci] 2016-10-03 16:44:41 -03:00
Ivan Diaz 4f127b1d21 Ivan - Add text editor to text area [skip ci] 2016-09-30 18:47:04 -03:00
ivan 4512d4b484 Ivan - Create Ticket::addEvent function [skip ci] 2016-09-29 14:46:31 -03:00
ivan 0bed4bef45 Ivan - Add events to backend [skip ci] 2016-09-29 14:34:20 -03:00
ivan cc7c5bfb3d Ivan - STAFF LOGIN - Add Staff login to backend [skip ci] 2016-09-25 01:16:10 -03:00
ivan 9fadaa74f0 Ivan - Add staff DataStore [skip ci] 2016-09-24 16:26:37 -03:00