ivan
|
5126b40538
|
Ivan - Fix AreYouSure design, fix stats, rename get-api-keys, use allow-attachment, fix login verificationToken, fix deletion, fix ticket view permission, fix last events when empty, fix configuration in frontend, fix system preferences and my account
|
2017-02-24 03:56:25 -03:00 |
ivan
|
f9ad440bf2
|
Ivan - Fix download get
|
2017-02-15 16:14:27 -03:00 |
ivan
|
6f1638e5fe
|
Ivan - Update backend methods [skip ci]
|
2017-02-08 15:09:15 -03:00 |
AntonyAntonio
|
35ac87ab88
|
Merge branch 'master' into OS156-Disable-user-system
Conflicts:
server/controllers/system.php
tests/init.rb
|
2017-01-17 15:03:48 -03:00 |
AntonyAntonio
|
1c0c16f7f6
|
Merge branch 'master' into OS156-Disable-user-system
Conflicts:
server/controllers/system.php
server/controllers/system/init-settings.php
server/data/ERRORS.php
server/libs/Controller.php
tests/init.rb
|
2017-01-16 16:13:40 -03:00 |
AntonyAntonio
|
fdd35ed2c1
|
Guillermo - disable-user-system [skip ci]
|
2017-01-16 16:07:53 -03:00 |
AntonyAntonio
|
6eae5f9299
|
Guillermo - csv import [skip ci]
|
2017-01-14 18:19:21 -03:00 |
AntonyAntonio
|
0108414a70
|
Guillermo - registration api keys [skip ci]
|
2017-01-13 17:06:49 -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 |
AntonyAntonio
|
397246aa4b
|
Guillermo - paths enable/disable registration[skip ci]
|
2017-01-10 16:04:25 -03:00 |
Ivan Diaz
|
a113d547d2
|
Ivan - Add verification token return data for backend [skip ci]
|
2017-01-10 13:19:36 -03:00 |
ivan
|
c99b5fc881
|
Ivan Diaz - update backend logs [skip ci]
|
2017-01-05 16:26:43 -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 |
AntonyAntonio
|
cab43cf5e0
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-29 02:50:53 -03:00 |
AntonyAntonio
|
b718598f32
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-28 21:55:00 -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
|
8d2033ec31
|
Ivan - Updates needed for dev3 deploy [skip ci]
|
2016-12-13 21:10:49 -03:00 |
Ivan Diaz
|
97ef914d27
|
Guillermo - staff/add-last-login [skip ci]
|
2016-12-08 17:39:47 -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
|
cc7c5bfb3d
|
Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]
|
2016-09-25 01:16:10 -03:00 |
ivan
|
06ad75b688
|
Ivan - Backend - Fixes to make frontend work with API [skip ci]
|
2016-09-09 02:24:12 -03:00 |
ivan
|
da7aad3576
|
Ivan - Backend - Create /user/get path [skip ci]
|
2016-09-09 00:38:58 -03:00 |
ivan
|
5972427cf2
|
Merge branch 'master' into captcha
|
2016-08-20 19:22:17 -03:00 |
ivan
|
4f5f91994d
|
Ivan - Backend - Add Captcha validation [skip ci]
|
2016-08-20 18:24:22 -03:00 |
AntonyAntonio
|
2aa2c59722
|
(Guillermo) actualization recover-password [skip ci]
|
2016-08-15 20:15:09 -03:00 |
AntonyAntonio
|
23604cc713
|
(Guillermo) add ruby testing for user-edit [skip ci]
|
2016-08-09 23:54:39 -03:00 |
AntonyAntonio
|
54da0699dd
|
(Guillermo) path-user-edit and mailsender [skip ci]
|
2016-08-07 23:21:48 -03:00 |
ivan
|
3c3c11027d
|
Ivan - Fix Recover Password validations
|
2016-08-04 16:01:24 -03:00 |
ivan
|
d6853b3a4b
|
Ivan - Fix all list/beanInstance functionality
|
2016-08-04 00:59:04 -03:00 |
Ivan Diaz
|
4d5ce7022e
|
Merged in settings-options-backend (pull request #29)
Settings options backend
|
2016-08-02 15:09:16 -03:00 |
ivan
|
eccc0b5a29
|
Ivan - Implent NullDataStore pattern, refactor login controller, add get-setting and set-setting controllers
|
2016-07-27 13:58:19 -03:00 |
ivan
|
e0dd5cbf39
|
Ivan - Add name to user bean [skip ci]
|
2016-07-27 00:50:20 -03:00 |
Ivan Diaz
|
8fa096f662
|
Merged in remember-me-frontend (pull request #25)
Remember me frontend
|
2016-07-25 21:19:30 -03:00 |
AntonyAntonio
|
7497bd0d6c
|
guillermo - code review changes again [skip ci]
|
2016-07-25 14:36:29 -03:00 |
AntonyAntonio
|
1f39e4d845
|
Merge branch 'master' into Recover-Password
Conflicts:
server/models/ERRORS.php
|
2016-07-25 11:00:43 -03:00 |
AntonyAntonio
|
dc3df30ef6
|
(Guillermo) recover password
|
2016-07-22 04:44:55 -03:00 |
Ivan Diaz
|
63813f2425
|
Merged in validation-user-sign-up (pull request #23)
Validation user sign up
|
2016-07-21 21:49:36 -03:00 |
Ivan Diaz
|
9d378d07e5
|
Ivan - Add local storage class [skip ci]
|
2016-07-20 20:39:36 -03:00 |
Ivan Diaz
|
d648aff2b3
|
Ivan - Add local storage class [skip ci]
|
2016-07-20 18:38:20 -03:00 |
AntonyAntonio
|
8b8ac11b97
|
(Guillermo) recover password
|
2016-07-20 01:38:34 -03:00 |
ivan
|
b3cd09ba00
|
Ivan - Update remember logic using local storage [skip ci]
|
2016-07-20 01:31:07 -03:00 |
Ivan Diaz
|
4c075d3821
|
Merged in Add-email-sender-class (pull request #22)
Add email sender class
|
2016-07-19 17:49:21 -03:00 |
AntonyAntonio
|
5fd68fdc6e
|
(Guillermo) code review changes
|
2016-07-19 16:41:04 -03:00 |