tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-31 01:35:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,812 Commits 77 Branches 19 Tags
Commit Graph

526 Commits

Author SHA1 Message Date
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