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 |
|
AntonyAntonio
|
8fc5ed0e57
|
(Guillermo) code review changes
|
2016-07-19 02:38:43 -03:00 |
|
AntonyAntonio
|
70b42ed39d
|
(Guillermo) code review changes
|
2016-07-19 02:35:37 -03:00 |
|
Ivan Diaz
|
35a968652a
|
[AntonyAntonio] - Add remember me test [skip ci]
|
2016-07-16 03:57:42 -03:00 |
|
Ivan Diaz
|
5949c85aeb
|
[AntonyAntonio] - Add remember me test [skip ci]
|
2016-07-16 03:54:29 -03:00 |
|
Ivan Diaz
|
342aab48b7
|
[AntonyAntonio] - Add remember me test [skip ci]
|
2016-07-15 22:16:22 -03:00 |
|
AntonyAntonio
|
466bb85d34
|
(Guillermo) code review changes
|
2016-07-15 17:12:06 -03:00 |
|
ivan
|
8b810f7bd5
|
Ivan - Add MailTemplate and MailSender
|
2016-07-14 19:06:47 -03:00 |
|
AntonyAntonio
|
48fe22c536
|
(Guillermo) Add-email-sender-class
|
2016-07-14 03:34:13 -03:00 |
|
ivan
|
948b476c12
|
Merge branch 'master' into Add-email-sender-class
# Conflicts:
# server/composer.json
# server/controllers/user/signup.php
|
2016-07-14 01:45:50 -03:00 |
|
AntonyAntonio
|
533e34c395
|
(Guillermo) Add-email-sender-class
|
2016-07-13 20:30:23 -03:00 |
|
ivan
|
2a5fbae490
|
Ivan - Fix email sender issues [skip ci]
|
2016-07-08 18:00:52 -03:00 |
|
ivan
|
ab6b2326b9
|
Ivan - Fix master phpunit build: Undesired property
|
2016-07-08 04:27:17 -03:00 |
|
Ivan Diaz
|
89b2e52e87
|
Merged in create-ticket/comment (pull request #18)
Create ticket/comment
|
2016-07-08 04:02:55 -03:00 |