cdriscol
|
9e7239baf7
|
appending a base tag to the head before jasmine tests run.
|
2015-07-19 22:24:39 -06: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 |
|
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 |
|
Liran Tal
|
6d199a5925
|
Merge pull request #645 from djorak/patch-1
JSHint test failing because of missing semicolon
|
2015-07-12 23:55:29 +03:00 |
|
Julien Mazé
|
c572ed7eec
|
JSHint test failing because of missing semicolon
I just cloned the branch and both gulp and grunt fail on the lint task because of the missing semicolon.
|
2015-07-12 20:54:59 +02:00 |
|
Liran Tal
|
d9c15e2a5c
|
Merge pull request #642 from lirantal/bugfix/password-changing-on-user-save
Fixing user's passwords keep changing when saving the user model
|
2015-07-12 19:48:38 +03:00 |
|
Liran Tal
|
ab68fd286f
|
Merge pull request #643 from lirantal/enhancement/README-update-grunt-startup
Update README about grunt environment modes
|
2015-07-12 19:26:33 +03:00 |
|
Liran Tal
|
bf79c17bd0
|
updating the schema save pre hook so that it checks for a modified version of the password field before it tries to re-calculate the new password to save for the user model
|
2015-07-12 19:25:40 +03:00 |
|
Liran Tal
|
e1001b89f8
|
Merge pull request #640 from lirantal/bugfix/server-startup-log
cleaning up application startup information
|
2015-07-12 19:19:58 +03:00 |
|
Liran Tal
|
00879f56d6
|
Merge pull request #641 from lirantal/bugfix/db-name-per-environment
updated the development.js environment configuration to use mean-dev database
|
2015-07-12 19:19:11 +03:00 |
|
Liran Tal
|
39e4282445
|
updating README file with more elaborate instructions on running grunt in different environment modes (dev/prod/secure ssl)
updating title for the SSL section and added information about the port number in secure environment mode
|
2015-07-12 19:15:08 +03:00 |
|
Liran Tal
|
2e03d13c12
|
updated the development.js environment configuration file to use the mean-dev database instead of mean-test which is used for testing/stages environment
|
2015-07-11 01:05:07 +03:00 |
|
Liran Tal
|
9e8ee9ea13
|
Merge branch 'Robaum-0.4.0' into 0.4.0
|
2015-07-11 01:00:12 +03:00 |
|
Liran Tal
|
6bb5b8cfd5
|
Merge branch '0.4.0' of https://github.com/Robaum/mean into Robaum-0.4.0
Conflicts:
README.md
config/env/development.js
config/env/test.js
|
2015-07-11 00:59:35 +03:00 |
|
Liran Tal
|
9fb2215854
|
cleaning up application startup information
|
2015-07-11 00:42:43 +03:00 |
|
Ilan Biala
|
cff3efe5b3
|
Merge pull request #637 from Gym/0.4.0
formatting: indent
|
2015-07-10 13:07:31 -04:00 |
|
Ryan Hutchison
|
b8d6fa7e24
|
formatting: indent
|
2015-07-10 07:21:47 -04:00 |
|
Liran Tal
|
e8c79e4a0b
|
Merge pull request #634 from Gym/0.4.0
[Bug]: Remove social account.
|
2015-07-10 09:24:14 +03:00 |
|
Ryan Hutchison
|
786c546d84
|
Update users.authentication.server.controller.js
|
2015-07-09 15:44:38 -04:00 |
|
Ryan Hutchison
|
75c80524b7
|
remove unused dependcies.
|
2015-07-09 14:23:31 -04:00 |
|
Ryan Hutchison
|
16aa646673
|
Merge branch '0.4.0' of github.com:meanjs/mean into 0.4.0
|
2015-07-09 14:10:01 -04:00 |
|
Ryan Hutchison
|
d0bb4a3cd3
|
duplicate controller. This was moved under settings/
|
2015-07-09 14:04:16 -04:00 |
|
Ryan Hutchison
|
b18a7dda99
|
bug: remove social account.
|
2015-07-09 13:49:48 -04:00 |
|
Ilan Biala
|
ade074cf37
|
Merge pull request #599 from loulin/0.4.0
Add return for done(err) in test
|
2015-07-09 13:32:27 -04:00 |
|
Ryan Hutchison
|
9e19493f50
|
Remove unused scope declarations.
|
2015-07-09 13:10:39 -04:00 |
|
Liran Tal
|
11b37f25a5
|
Merge pull request #633 from Gym/package-formatting
Update package.json to indent space-2.
|
2015-07-09 19:31:56 +03:00 |
|
Liran Tal
|
8aa9dfaa2a
|
Merge pull request #632 from danaronoff/0.4.0
Remove duplicate assets definition
|
2015-07-09 19:28:50 +03:00 |
|
Ryan Hutchison
|
f345d20c3e
|
Update package.json to indent space-2.
|
2015-07-08 19:51:54 -04:00 |
|
Daniel Aronoff
|
50937ea5de
|
Remove duplicate assets definition
|
2015-07-08 19:43:20 -04:00 |
|
Liran Tal
|
c2bcfa3acd
|
Merge pull request #616 from meanjs/master_to_0.4.0
Master to 0.4.0
|
2015-07-08 21:13:58 +03:00 |
|
Liran Tal
|
99e0ea8b06
|
Merge pull request #622 from Gym/0.4.0
update dependencies
|
2015-07-08 20:20:15 +03:00 |
|
Ryan Hutchison
|
b6818b63d3
|
fix btn-large class names.
|
2015-07-07 20:32:24 -04:00 |
|
Ryan Hutchison
|
67e38aec01
|
fix failing tests
|
2015-07-07 10:22:21 -04:00 |
|
Ryan Hutchison
|
9ca71c8cde
|
remove href attribute.
|
2015-07-07 08:18:47 -04:00 |
|
Ryan Hutchison
|
73b5fa3df0
|
Revert "load bootstrap (doh)"
This reverts commit 7d8cea159b.
|
2015-07-07 08:18:38 -04:00 |
|
Ilan Biala
|
21590940ae
|
Merge pull request #621 from simison/patch-10
Sort out gitignore
|
2015-07-06 15:24:25 -04:00 |
|
Liran Tal
|
96f8ab5289
|
keeping nodejs versions 0.10 and 0.12 as the test servers for travis configuration
|
2015-07-06 21:09:58 +03:00 |
|
Ryan Hutchison
|
73be7943b1
|
package.json will always use 2 spaces indent
|
2015-07-05 19:01:54 -04:00 |
|
Ryan Hutchison
|
00a4668c2a
|
update javascript libs
|
2015-07-05 17:51:19 -04:00 |
|