351 Commits

Author SHA1 Message Date
Ivan Diaz
511098e608 Merged in email-sender-architecture (pull request #27)
Email sender architecture
2016-07-27 10:47:06 -03:00
ivan
d23fba451e Ivan - Add smtp settings [skip ci] 2016-07-27 01:04:29 -03:00
ivan
e0dd5cbf39 Ivan - Add name to user bean [skip ci] 2016-07-27 00:50:20 -03:00
ivan
3f01526814 Ivan - Fix issues with mail templating and add it to ruby tests [skip ci] 2016-07-27 00:44:07 -03:00
ivan
4ccbd75759 Ivan - Add initial settings and initial mail templates [skip ci] 2016-07-26 18:30:51 -03:00
Ivan Diaz
d7096f9231 Merged in fix-lost-focus-issue (pull request #26)
Fix lost focus issue
2016-07-26 16:32:26 -03:00
Ivan Diaz
8fa096f662 Merged in remember-me-frontend (pull request #25)
Remember me frontend
2016-07-25 21:19:30 -03:00
Ivan Diaz
b335d5e2bf Merged in Recover-Password (pull request #24)
Recover password
2016-07-25 17:29:37 -03:00
AntonyAntonio
74f9d04824 guillermo - code review changes again [skip ci] 2016-07-25 17:26:14 -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
Ivan Diaz
1e634fe366 Ivan - Remove unnecessary library [skip ci] 2016-07-23 16:58:44 -03:00
Ivan Diaz
8a89efa653 Ivan - Fix lost focus issue [skip ci] 2016-07-23 00:45:47 -03:00
Ivan Diaz
9535aae0ea Ivan - Add SessionStore and UserStore tests [skip ci] 2016-07-22 22:58:55 -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
AntonyAntonio
7c1ee7d6fc guillermo - code review changes [skip ci] 2016-07-21 15:27:57 -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
0c27a96113 Merge remote-tracking branch 'origin/master' 2016-07-19 17:58:36 -03:00
ivan
4d0759a004 Ivan - Fix master build 2016-07-19 17:58:17 -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
4414140343 Merge branch 'master' into validation-user-sign-up 2016-07-19 17:40:36 -03:00
AntonyAntonio
76ecd4ebc3 (Guillermo) add tests for signup validation 2016-07-19 17:39:26 -03:00
AntonyAntonio
5fd68fdc6e (Guillermo) code review changes 2016-07-19 16:41:04 -03:00
ivan
0caa5cb4f9 Ivan - Update localStorage [skip ci] 2016-07-19 15:49:03 -03:00
ivan
6662f0da61 Merge branch 'master' into remember-me-frontend 2016-07-19 11:00:42 -03:00
ivan
c613d886b3 Ivan - Fix master login test 2016-07-19 10:51:43 -03:00
Ivan Diaz
0e6a73f4eb Ivan - Add local storage class [skip ci] 2016-07-19 10:45:35 -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
811f4dc272 Merged in Add-remember-me (pull request #21)
(Guillermo) Add-remember-me
2016-07-16 03:59:09 -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
9aca25c076 Ivan - Add FakeSMTP support 2016-07-14 19:58:54 -03:00
ivan
9a25e7b7ae Ivan - Add FakeSMTP support [skip ci] 2016-07-14 19:53:24 -03:00
ivan
e6fb52791e Ivan - Add Unit testing for MailTemplate [skip ci] 2016-07-14 19:31:23 -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 Diaz
bc66d74f73 Merged in OS-48-login-logout-frontend-logic (pull request #20)
Os 48 login logout frontend logic
2016-07-14 01:47:29 -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 Diaz
b9c7f44a3e Merged in add-dashboard-path (pull request #19)
Create dashboard pages placeholders
2016-07-08 18:42:58 -03:00
ivan
2a5fbae490 Ivan - Fix email sender issues [skip ci] 2016-07-08 18:00:52 -03:00
ivan
9312baa3b0 Ivan - Fix master phpunit build: Add validations to comment 2016-07-08 04:46:28 -03:00
ivan
ab6b2326b9 Ivan - Fix master phpunit build: Undesired property 2016-07-08 04:27:17 -03:00