Commit Graph

1954 Commits

Author SHA1 Message Date
Liran Tal
51196c54b3 Merge pull request #841 from Gym/master
local.example.js still has old fb auth callback
2015-08-23 14:13:45 +03:00
Ryan Hutchison
c6d26831fc do not save state to previous (history) for routes marked ignoreState. 2015-08-23 04:09:36 -04:00
Ryan Hutchison
9fdd2a0b9c mask exception route, but show not-found page. 2015-08-23 03:59:43 -04:00
Ryan Hutchison
b2495120c3 use pushstate, fall back to window.location.hash.
current implementation does double redirect due to '#!'
2015-08-23 00:48:17 -04:00
Ryan Hutchison
27d2818834 Closes #202 - if user does not authorize email scope, email will not be mapped. Username will be generated from first initial of first name and last name.
.jshint latedef set to nofunc.
2015-08-23 00:32:36 -04:00
Ryan Hutchison
3527537258 local.example.js still has old fb auth callback 2015-08-22 21:06:43 -04:00
Liran Tal
b1f814e82a Merge pull request #836 from Gym/0.4.1
Correct <br /> Tags and set Title
2015-08-22 19:31:47 +03:00
Meistercoach83
4b43c4ef32 Correct <br /> Tags and set Title 2015-08-21 18:18:15 -04:00
Liran Tal
7b880e986d Merge pull request #830 from codydaig/bug/password
[fix] Was storing a 6 char password in plain text [fixes #829]
2015-08-22 00:40:30 +03:00
Liran Tal
9450c82a73 Merge pull request #790 from ryanjbaxter/bluemix-button
Added Deploy To Bluemix button to the README
2015-08-22 00:40:17 +03:00
Liran Tal
37b0bdde41 Merge pull request #835 from simison/patch-12
Link to editorconfig.org from CONTRIBUTING.md
2015-08-21 22:39:06 +03:00
Mikael Korpela
601cf9f3c5 Link to editorconfig from CONTRIBUTING.md 2015-08-21 15:36:22 +02:00
Liran Tal
bed01ceb32 Merge pull request #815 from codydaig/docs/Contributing
Created Contributing.md
2015-08-21 15:02:55 +03:00
Liran Tal
7c286b00bb adding support for coveralls integration for mean.js to report live project code coverage information 2015-08-21 14:58:29 +03:00
Cody B. Daig
ef7ce74675 [docs] Contributing.md 2015-08-20 19:05:35 -07:00
Cody B. Daig
814b856c97 [fix] Install ruby and SASS with Docker 2015-08-20 14:40:57 -07:00
Cody B. Daig
5c287f583b [fix] Was storing a 6 char password in plain text [fixes #829] 2015-08-20 09:26:07 -07:00
Liran Tal
72067fda63 Merge pull request #827 from mleanos/hotfix/default-env-client-path
[hotfix] Added missing /client/ path
2015-08-20 09:13:50 +03:00
Liran Tal
6474718f3b Merge pull request #826 from codydaig/test/userEmail
[test] Allow an email with sub domains
2015-08-20 09:10:35 +03:00
mleanos
195cbe55a5 Added missing /client/ path
Added the missing /client/ path to the favicon & log in the default env
config.
2015-08-19 19:35:43 -07:00
Cody B. Daig
74f58bbbd6 [test] Allow an email with sub domains 2015-08-19 19:08:44 -07:00
Liran Tal
bc31d4538c Merge pull request #821 from codydaig/fix/editorconfig
Changed .html files to have 2 spaces instead of tabs
2015-08-19 22:17:17 +03:00
Liran Tal
2e8d659e70 Merge pull request #824 from lirantal/bugfix/localjs-env-params-used-for-tests
Fixed issue where if local.js exists then grunt test will run on that…
2015-08-19 22:15:15 +03:00
Liran Tal
d18832641a Fixed issue where if local.js exists then grunt test will run on that environment config and possibly delete collections
We only extend the config object with the local.js custom/local environment if we are on production or development environment. If test environment is used we don't merge it with local.js to avoid running test suites on a prod/dev environment (which delete records and make modifications)
2015-08-19 22:05:08 +03:00
Liran Tal
a1570c41cf Merge pull request #825 from seanemmer/master
Corrected 'prod' task in gulpfile
2015-08-19 21:51:14 +03:00
Sean Emmer
d737696ab0 Corrected 'prod' task in gulpfile 2015-08-19 11:41:05 -07:00
Liran Tal
98f3e8cff5 Merge pull request #816 from lirantal/feature/secure-mode-sslcerts-configurable
Configurable SSL mode options
2015-08-19 13:14:53 +03:00
Liran Tal
d6d2b410ac Merge pull request #820 from pgrodrigues/master
fix default session cookie maxAge
2015-08-19 09:13:26 +03:00
Cody B. Daig
5754b03fa0 Changed .html files to have 2 spaces instead of tabs 2015-08-18 09:35:56 -07:00
Pedro Rodrigues
3b5e13e356 fix default session cookie maxAge 2015-08-18 16:26:01 +01:00
Liran Tal
793187cffe Merge pull request #810 from cdriscol/menus_service_issue
Fixing Menus service remove bugs.
2015-08-18 08:22:20 +03:00
Liran Tal
5b787069be Merge pull request #812 from mleanos/bug/socket-session-key
Fixed bug with Socket IO session
2015-08-17 23:11:35 +03:00
Liran Tal
384fb7d24c adding support for a configurable ssl-mode and and ssl cert/key files in the environment configuration 2015-08-17 09:05:35 +03:00
mleanos
792488e47f Fixed bug with Socket IO session
New enhancements to the Express session, added "sessionId" as the new
default session key. Previously, the express session was using the
default "connect.sid" key. This caused the Socket configuration to be
unable to find the session id, thus causing issues with the Socket. One
suck issue, was that the same Socket would be used for all users
connected to the server.

This also adds a bit more error handling of the Socket server
configuration. Using the `return next()` pattern.
2015-08-16 15:07:04 -07:00
Liran Tal
7252032007 Adding coverage report for server-side tests using istanbul 2015-08-16 00:19:52 +03:00
cdriscol
ec3af65661 Fixing Menus service remove bugs. 2015-08-15 12:40:00 -06:00
Liran Tal
1f0f1b7d0e Merge pull request #806 from pgrodrigues/master
fix some typos
2015-08-15 10:00:13 +03:00
Liran Tal
114706eff4 Merge pull request #780 from codydaig/feature/issue583
Make TopBar Public By Default
2015-08-15 09:59:31 +03:00
Liran Tal
a5250c36a2 Merge pull request #805 from vaucouleur/master
Fixed end tags in the page header of the user edit page
2015-08-15 09:57:30 +03:00
Cody B. Daig
1f7bfddf0b Make tests pass 2015-08-14 16:01:16 -06:00
Cody B. Daig
9fc6091ab7 Code from mleanos 2015-08-14 16:01:16 -06:00
Cody B. Daig
e68b4226bd Make TopBar Public By Default 2015-08-14 16:01:16 -06:00
Pedro Rodrigues
8fc9b50ad0 fix some typos 2015-08-14 17:27:39 +01:00
Sebastien Vaucouleur
851973f459 Fixed end tags in page header 2015-08-14 17:26:55 +02:00
Liran Tal
86b16c93f6 Merge pull request #758 from trainerbill/PathRefactor
Initial commit to return /client to the URL include paths
2015-08-14 17:21:49 +03:00
Liran Tal
84926abd0f Merge pull request #804 from lirantal/feature/session-expiration-enhancement-2
Adding support for configurable session expiration time
2015-08-14 16:30:20 +03:00
Liran Tal
0aa5e68643 Adding support for configurable session expiration time 2015-08-14 15:24:31 +03:00
Liran Tal
d9a8647a6b Merge pull request #799 from lirantal/feature/users_module_tests_4
Adding suite of tests for the e-mail validation field in the users model
2015-08-14 13:41:47 +03:00
Liran Tal
7200426e28 Merge pull request #798 from lirantal/feature/security-enhancements-session
Express sessionKey configuration option
2015-08-14 10:11:00 +03:00
Liran Tal
d41490c148 Merge pull request #793 from trainerbill/SeedDB2
Database seeding
2015-08-13 22:13:23 +03:00