Commit Graph

926 Commits

Author SHA1 Message Date
mleanos
65c6d1ffe0 Socket IO client enhancement with connect() method
Updated the Socket client service, with a connect() method. Moved state
redirect out of from Socket service.  Added the Authentication.user
check to the Chat client controller, and added a check to make sure the
Socket client service is connected to the server; if not, then connect
using the new connect() method.

Had to do a hard reset from 0.4.0 due to conflicts when merging and
pushing to remote.
2015-07-25 00:36:01 -07:00
Liran Tal
c8880ea65d Merge pull request #700 from trainerbill/requireLogin
Require login
2015-07-25 01:18:33 +03:00
Andrew Throener
1b54d35305 Final Clean Up after code review 2015-07-24 17:06:55 -05:00
Liran Tal
0e3f194d13 Merge pull request #699 from lirantal/bugfix/unused-variable
Removing unused passport variable in express.js library file
2015-07-25 01:06:28 +03:00
Liran Tal
c671f65c47 Merge pull request #693 from lirantal/feature/clean_angular_hashbang_urls
Feature/clean angular hashbang urls
2015-07-25 01:06:03 +03:00
Andrew Throener
03a4042a33 Updated routes and a logic fix 2015-07-24 16:43:46 -05:00
Liran Tal
de3b890f9d removed /#! in user controllers
Resolved 0.4.0 related conflicts:
	modules/users/server/controllers/users/users.authentication.server.controller.js
2015-07-25 00:39:28 +03:00
Liran Tal
2ff24903c6 removing unused passport variable in express.js library file 2015-07-25 00:26:05 +03:00
Andrew Throener
fb71619e0c Refactor 2015-07-24 15:37:26 -05:00
Igor Freire
e21805f20a Prepare for role-based access control of states 2015-07-24 16:59:13 -03:00
Igor Freire
9fc88e6e5b Filter states for which login is required during state change
A state parameter was added for the routes that require user authentication. Now, everytime a statechange occurs, the destination state is checked and user is redirected to signin page if necessary. Note the state parameter is added within `data`, so that nested states can inherent its value.
2015-07-24 16:17:14 -03:00
Ilan Biala
e3405d2f2b Merge pull request #683 from mleanos/gitignore_VS
Added Visual Studio files to gitignore
Rearranged gitignore to prioritize general files over editor files
2015-07-24 10:14:10 -04:00
Ilan Biala
8a81cf0168 Merge pull request #688 from codydaig/bugfix/github_undefined_displayname
If displayName in GitHub is undefined use username
Fixes #519
2015-07-24 10:13:26 -04:00
Ilan Biala
3a39f0a88b Merge pull request #666 from Gym/task-enhancements
Grunt and Gulp task enhancements
2015-07-24 10:12:11 -04:00
Liran Tal
0369db4cc2 Merge pull request #691 from lirantal/feature/missing_ssl_better_log
Enhancing SSL error message
2015-07-24 11:11:19 +03:00
Liran Tal
315187e021 enhancing error message with an actual instruction on how to fix the missing ssl problem when running in prod mode and secured enabled 2015-07-24 10:03:14 +03:00
Liran Tal
a62f25e66d Merge pull request #684 from lirantal/feature/users_tests_email_unique
Enhancing users model tests
2015-07-24 09:47:35 +03:00
Liran Tal
ac35f0fec8 adding couple more tests to confirm users model works as expected 2015-07-24 09:38:49 +03:00
mleanos
c7ec27ee03 Moved all editor setting to bottom
I moved all the editor files underneath all the other settings. As the
editor list grows, it will help keep things organized, and editor
configs are less pertinent to individual developers.
2015-07-23 22:51:36 -07:00
Cody B. Daig
7605956c99 displayName undefined 2015-07-23 17:00:22 -07:00
mleanos
c3380bf74f Added Visual Studio files to gitignore
Adding files to ignore that are related to Visual Studio, and Node.js
development within the VS environment.
2015-07-22 16:21:16 -07:00
Ilan Biala
29d264dff7 Merge pull request #682 from codydaig/patch-2
Switch TravisCI and DavidDM to 0.4.0 branch
2015-07-22 17:00:30 -04:00
Cody B. Daig
a7e065e626 Added Master and Dev Badges to README 2015-07-22 12:39:59 -07:00
Ryan Hutchison
3e378b4a54 BUG: Path separator support for windows. 2015-07-20 21:18:52 -04:00
Ryan Hutchison
0f7cf546fd move task configs to separate properties.
remove watch on gulpfile.js
2015-07-20 21:18:45 -04:00
Liran Tal
00a4c0603a Merge pull request #566 from simison/error-404-pages
#501 Handle 404 errors at Express backend and at Angular frontend
2015-07-20 22:25:33 +03:00
Liran Tal
82d2377754 Merge pull request #439 from igorauad/uniqueEmail
Make emails unique
2015-07-20 22:12:51 +03:00
Liran Tal
e6b8a692ad Merge pull request #673 from codydaig/bugfix/consolelog
Remove console.log from an article test
2015-07-20 21:25:13 +03:00
Liran Tal
bed8ff5533 Merge pull request #671 from lirantal/feature/lint-on-grunt-test
Enable jshint on grunt test tasks
2015-07-20 21:22:19 +03:00
Igor Freire
0efc82db0f Fix message catching the field for which a duplicate key error ocurred 2015-07-20 14:39:44 -03:00
Cody B. Daig
a8dae99173 Remove console.log from an article test 2015-07-20 10:04:45 -07:00
Liran Tal
c90dda93fd enabling the lint task when running tests so we can identify coding convention issues on Pull-Requests in the CI 2015-07-20 15:57:36 +03:00
Liran Tal
53194ffc47 Merge pull request #665 from codydaig/mergeissue
change _.extend to _.merge
2015-07-20 08:18:06 +03:00
Liran Tal
09251d1231 Merge pull request #668 from cdriscol/base_tag
appending a base tag to the head before jasmine tests run.
2015-07-20 08:05:53 +03:00
cdriscol
9e7239baf7 appending a base tag to the head before jasmine tests run. 2015-07-19 22:24:39 -06:00
Cody B. Daig
4d1ae6e14c change _.extend to _.merge 2015-07-19 15:35:47 -07:00
Liran Tal
2f8e20ec1e Merge pull request #659 from lirantal/bugfix/secure-mode-fix
Fixing up SSL support
2015-07-19 23:22:43 +03:00
Igor Freire
5d4d7cecfe Make emails unique
Emails are made unique. When user attempts to sign in through a provider in which his email is one that is already registered, user is redirected to the signin page with an error passed as a query string parameter.
2015-07-17 14:52:27 -03:00
Liran Tal
03b7f6ffda fixing up SSL support on startup to fallback to non-SSL mode if files are not present 2015-07-17 11:25:42 +03:00
Liran Tal
e1605b635b Merge pull request #658 from codydaig/npm3-patch2
Update package.json to include peer dependencies
2015-07-17 11:19:30 +03:00
Cody Daig
5d5d1b7bda Update package.json to include peer dependencies 2015-07-17 01:09:08 -07:00
Liran Tal
a1355a04be Merge pull request #656 from fauria/0.4.0
Use validator.js for email and password length validation.
2015-07-17 10:44:20 +03:00
git-admin
a23290b46e Use validator.js for email validation 2015-07-17 09:27:16 +02:00
Liran Tal
32c12bbc0e Merge pull request #651 from grantgeorge/no-password-ssl-certs
do not use aes when creating ssl certs to prevent password requirement
2015-07-15 21:04:15 +03:00
Grant George
bf777d9404 do not use aes when creating ssl certs to prevent password requirement 2015-07-15 11:05:26 -04:00
Liran Tal
855a39984d Merge pull request #610 from trainerbill/PayPalAuth4
PayPal Authentication
2015-07-15 08:58:49 +03:00
Andrew Throener
fe1d584564 Indentation fixes 2015-07-14 22:05:12 -05:00
trainerbill
a98a84fd20 Fix merge conflicts 2015-07-14 15:46:23 -05:00
Liran Tal
a146a3047f Merge pull request #647 from lirantal/bugfix/cleanup-readme
cleaning up code blocks in README
2015-07-13 23:38:32 +03:00
Liran Tal
8c2156f236 cleaning up code blocks in README 2015-07-13 23:04:53 +03:00