Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit b05b4bb2e6695ebe4773a47e641da8be8a834c92
Merge: 2ffef25 7dbed6a
Author: Justin Sacbibit <[email protected]>
Date:   Sat Oct 18 11:02:38 2014 -0400

    Merge branch 'master' into meanjsheroku

commit 2ffef25e7617aff88c315eeedc98e09fbbfd9096
Author: Nick Dandakis <[email protected]>
Date:   Sun Aug 24 16:02:54 2014 -0400

    Added heroku:production grunt task.

commit e1fb8c85a9b49ccaf70417d4bee22944c9d9d599
Author: Nick Dandakis <[email protected]>
Date:   Sun Aug 24 16:00:44 2014 -0400

    Added load-grunt-tasks dependancy to production.

commit 0917e6a98fe2d2651e58887146c57475d5f48e08
Author: Nick Dandakis <[email protected]>
Date:   Sun Aug 24 15:59:51 2014 -0400

    Renamed gruntfile.js to Gruntfile.js so Heroku can recognise it.

commit 090006488085174cfc0444ed434a1dd456195889
Author: Nick Dandakis <[email protected]>
Date:   Sun Aug 24 15:58:31 2014 -0400

    Updated README.md to include instructions for Heroku deployment.

commit f67b7d950e1f0814eae76519472a0bd7a0eab259
Merge: 4cca972 5934970
Author: Roie Cohen <[email protected]>
Date:   Fri Oct 10 23:15:34 2014 -0700

    Merge pull request #167 from wesleyfsmith/master

    Removed localhost from env files

commit 4cca97212534f01d4b67f3866b37c2329316fb89
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:30:45 2014 +0300

    Bump minor version

commit ea04c9e55afb216e575712f453cdff6649f51a27
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:29:06 2014 +0300

    Small Update

commit d5d2f2e023fa8aa4f5ede03ac3c4dbbf680adaeb
Merge: 7b52309 26d8a12
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:08:35 2014 +0300

    Merge branch 'pr/177'

commit 7b52309ac835f8222d5ccfef19ddb0d8697ca7a8
Merge: 8da9856 b12a3b4
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:07:47 2014 +0300

    Merge pull request #197 from Nepoxx/patch-4

    Tiny fixes

commit 8da98564d1b0efc0d1c57956a0a0af17b311527d
Merge: f5431da d80a46b
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:04:43 2014 +0300

    Merge pull request #165 from neon5/master

    Fixed typo of div attribute

commit f5431da175e141f90150bf9f57f7365f8f5bf12c
Merge: b699d12 6c7f03f
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:02:54 2014 +0300

    Merge pull request #156 from miguelcoba/issue-144

    Rise gunt-concurrent task limit.

commit b699d1290748cf936657e9d1905d8f539710e5d3
Merge: e5e2616 99b6756
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 17:00:11 2014 +0300

    Merge pull request #141 from NeverOddOrEven/remove-redundant-variable-declaration

    Remove redundant variable declaration

commit e5e2616039b8aee4c2a4f0a02e269c08e48128f5
Merge: 8519f6b aeb0272
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 16:59:35 2014 +0300

    Merge pull request #139 from macsj200/patch-2

    Genericize invalid username or password message

commit 8519f6bd4782d46d2954b50920c5d81d0210cc48
Merge: 2c319c5 867cf5e
Author: Amos Haviv <[email protected]>
Date:   Tue Oct 7 16:59:21 2014 +0300

    Merge pull request #132 from macsj200/patch-1

    Fix typo in Error handling controller code

commit b12a3b47ba06a2138fcd357c6b368c1af11941a9
Author: Pier-Luc Gagnon <[email protected]>
Date:   Mon Oct 6 17:18:29 2014 -0400

    Tiny fixes

    Removed double requires and unused variables.

commit 26d8a121c4f00f416af9f6f7a3f6c5224f30f94b
Author: Joseph Race <[email protected]>
Date:   Thu Sep 11 12:51:34 2014 +0100

    Use ng-annotate instead of ngmin

commit 593497027c17b3ddd4ec13d6a1df3d9d2ae02e79
Author: Wesley Smith <[email protected]>
Date:   Mon Sep 1 17:41:11 2014 -0600

    Removed localhost from env files, as it is not necesary and can introduce bugs in non-local environments.

commit d80a46bfc233a41834ae9580ae03e847ed056e4b
Author: neon5 <[email protected]>
Date:   Sat Aug 30 11:07:00 2014 -0400

    Fixed typo of div attribute

commit 6c7f03f6f80072229d6f33ea57d7d56ab43b0426
Author: Miguel Coba <[email protected]>
Date:   Tue Aug 26 03:50:57 2014 +0000

    Rise gunt-concurrent task limit.

    Fixes issue with default value for grunt-concurrent limit in machines with few cpu/cores.

    From grunt-concurrent docs:

    	limit

    	Type: Number
    	Default: Number of CPU cores (require('os').cpus().length) with a minimum of 2

    	Limit of how many tasks that are run concurrently.

    In machines with few cpus/cores, the default limit of 2 the 'grunt debug' task
    can't start enough tasks for starting the node-inspector task, so the command fails
    and the capp can't be debugged.

    Fixes issue #144

commit 99b6756861b049109564a0ac0a373f6faa86228f
Author: Alex Suttmiller <[email protected]>
Date:   Sat Aug 16 11:02:56 2014 -0400

    Remove redundant variable declaration

commit aeb02720f2d3c7b9da0c00c56aa214c99ce76273
Author: Max <[email protected]>
Date:   Thu Aug 14 00:23:42 2014 -0600

    Genericize invalid username or password message

    https://github.com/meanjs/mean/issues/133
    The message given to the user upon an invalid login attempt, for security reasons, should not reveal that the username or password was incorrect.  Rather, a generic message should be displayed when the username or password is incorrect.

commit 867cf5e329762a20dd46ea65a731fa75975284b3
Author: Max <[email protected]>
Date:   Wed Aug 6 19:28:24 2014 -0600

    Fix typo in Error handling controller code

    On the frontend, the error message 'Username already exist' appears when creating a user with the same username as an existing user.  Grammatically, this error looks strange.  A more proper error message would be 'Username already exists'.  Possibly later on support can be added to properly conjugate this error message for a 'plural' field.

commit 2c319c5e65d27871827b5826d92a8ae4e4bb9c4b
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 16:49:33 2014 +0300

    Update to config tabs

commit 50677508eb011086951bab057c850cc3348fd607
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 15:39:34 2014 +0300

    Removing swig from controller

commit b311b7b72c8d5e70ed439e3ccfe222770f9d2bf8
Merge: 5087895 3dcf45c
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 15:35:49 2014 +0300

    Fix menu service defaults

commit 50878957ad316d3b6c94732cfd383cb19ce9775b
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 14:35:31 2014 +0300

    Fixing password headers

commit e56c76a85098a0084e729cbe81c7699bcfcc0be4
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 13:18:22 2014 +0300

    Use form validation in articles

commit ee95616e6d08c4caeeacbcd427d15d2ef6f20e19
Merge: e98554e 3949400
Author: Amos Haviv <[email protected]>
Date:   Tue Aug 5 11:48:57 2014 +0300

    Merge branch 'pr/125'

commit 3949400cffba649d1518ce3926b71b3d50d17d87
Author: KOENIG Romain <[email protected]>
Date:   Sun Aug 3 23:34:02 2014 +0200

    Update create-article.client.view.html

    Little mistake (copy-paste probably) where there is title instead of content. Am I right ?

commit e98554eda76a375cbdfc1dcc7ddca67c45243079
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 23:07:59 2014 +0300

    Updating Deprecated res.send

commit 7091f6a4f422aafb8aef15dc86f0ac73f11949f0
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 22:08:38 2014 +0300

    Adding Dist files

commit 7b0b860e9828dbba5243404c07ab6b96062aaf77
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 22:07:10 2014 +0300

    Adding Dist files

commit b11bd0755d6bf7c89b10b3dc57932db4276086c0
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 22:06:31 2014 +0300

    Adding Dist files

commit 315024e98f80c78c72991224900bdb234827fc32
Merge: ba0a6a0 b6cd10f
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 21:56:37 2014 +0300

    Merge branch '0.3.2'

commit b6cd10f72e3c09a39777aa993fe911cb5a1f56ab
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 21:37:42 2014 +0300

    Add app name in email

commit f6e19093eb1752b43c44fb3ce821ef036e7b9a88
Author: Amos Haviv <[email protected]>
Date:   Sat Aug 2 21:29:38 2014 +0300

    Update 0.3.2

commit 3dcf45c55ad36d478dac1453bb9688e618289232
Author: anooprh <[email protected]>
Date:   Fri Aug 1 02:23:00 2014 -0400

    Added github signin/signup to the list of signups/signi's

commit f4b62ca8199227c6791d535bbf67bba5d2db91f0
Author: Amos Haviv <[email protected]>
Date:   Thu Jul 31 11:27:14 2014 +0300

    Adding Password Reset

commit 9fb6e411cf3412ffd1fea96c4f58a88678a20e64
Merge: f59befc 6730ae3
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 14:07:05 2014 +0300

    Merge branch 'pr/116' into 0.3.2

commit f59befc2950fd4bd06b79127dc401700d7e0648d
Merge: 83d6630 c918f93
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 14:04:43 2014 +0300

    Merge branch 'pr/101' into 0.3.2

commit 83d6630afdeda55e1c5b34654116b5f8cb9e21f6
Merge: 15a898d 4451ba7
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 13:45:50 2014 +0300

    Merge branch 'pr/87' into 0.3.2

    Conflicts:
    	public/dist/application.min.js
    	public/modules/users/controllers/authentication.client.controller.js
    	public/modules/users/tests/authentication.client.controller.test.js

commit 15a898d7a34ade4fd9dddcd1433ab62ad9fd5dee
Merge: 65d3d40 a4d79bd
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 13:44:17 2014 +0300

    Merge branch 'pr/77' into 0.3.2

commit 65d3d4040c73fb33c13f5df3e8004d957e13a226
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 13:43:32 2014 +0300

    Deleting Dist folder

commit 83d3cd4dc5c409b5f04e8f82ad140a6c4f24f10c
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 13:43:07 2014 +0300

    Updating Gitignore

commit 6c1de94fea29fe8b21e3cbe1fdc492186eaacda7
Merge: ba0a6a0 666abde
Author: Amos Haviv <[email protected]>
Date:   Sat Jul 19 13:42:38 2014 +0300

    Revert "Added newlines"

    Conflicts:
    	public/dist/application.min.js
    	public/modules/users/controllers/authentication.client.controller.js
    	public/modules/users/tests/authentication.client.controller.test.js

commit 6730ae32d47be32e27f96c6e8210ab9790dd0233
Author: Alexandre Valdetaro <[email protected]>
Date:   Wed Jul 16 19:08:40 2014 -0300

    bug fix: MenuItem and SubMenuItem can now be private independently of parent

commit c918f933203c76a96919238df46b1ebea28a7ae5
Author: Matthias Luebken <[email protected]>
Date:   Thu Jul 3 14:52:25 2014 +0200

    checking for Env injected by fig/docker

commit 83686b82d9a126374d3a36f3bb97a511bc11ef85
Author: Matthias Luebken <[email protected]>
Date:   Thu Jul 3 10:04:11 2014 +0200

    - reading the right port in production
    - changed default back to development

commit 1bd958e40de2498243785bf7d6fcc06b184c260d
Author: Matthias Luebken <[email protected]>
Date:   Thu Jul 3 09:50:29 2014 +0200

    env

commit ba0a6a0918f623eff606c99a4d6424a69aeb4757
Merge: 75bf264 f6f0c9f
Author: Amos Haviv <[email protected]>
Date:   Sun Jun 29 16:15:07 2014 +0300

    Merge pull request #97 from ar1g/master

    Minor language fixes for front page.

commit 75bf26452ea55f03bb14413e1423b7b54757ec5a
Merge: 9da3bc8 38c87c0
Author: Amos Haviv <[email protected]>
Date:   Sun Jun 29 16:14:31 2014 +0300

    Merge pull request #100 from eshaham/meanjs

    Remove space which messes up the url local variable

commit 0cbb6c5902f46fd53300689797952e1aa27f0982
Author: Matthias Luebken <[email protected]>
Date:   Tue Jun 24 14:44:17 2014 +0200

    how to enable live reload

commit 38c87c02fc07f5bf090c97f7169fa5f6d1236163
Author: Elad Shaham <[email protected]>
Date:   Mon Jun 23 16:02:54 2014 +0300

    remove space which messes up the url local variable

commit 7257f2e3c1b5e710a5ef00d7dad0e03c5dab25b0
Author: Matthias Luebken <[email protected]>
Date:   Fri Jun 20 10:57:47 2014 +0200

    removed fig workaround

commit c93abfeae7a8102e861c3cd353ab756ccdc68bd3
Author: Matthias Luebken <[email protected]>
Date:   Wed Jun 18 18:47:08 2014 +0200

    workaround fig bug

commit c62e1c1e4e1b0d9ee06412c50a8e3d068c9be08a
Author: Matthias Luebken <[email protected]>
Date:   Wed Jun 18 18:40:15 2014 +0200

    fig bug workaround

commit 9b81e3f98388b48d8afcc358483d833f48511ec8
Author: Matthias Luebken <[email protected]>
Date:   Wed Jun 18 18:34:42 2014 +0200

    manual docker build and run

commit 04e74f20fedc4f9e84ad1fc4ed30faa39c892e95
Author: Matthias Luebken <[email protected]>
Date:   Wed Jun 18 18:34:25 2014 +0200

    workaround manual bower install

commit a68b58888061584b532fe153b309270626a21e6c
Author: Matthias Luebken <[email protected]>
Date:   Wed Jun 18 15:59:24 2014 +0200

    first docker version with fig

commit f6f0c9fb4fb43c6f6fa9f7fac7d2830e79a0df1c
Author: ar1g <[email protected]>
Date:   Mon Jun 16 17:48:55 2014 +0100

    Update home.client.view.html

     are great resources ->  offer excellent starting points to get to grasps with node (Node blurb)

commit b3a996959ce6d175baf8950d8a9cf380a432435a
Author: ar1g <[email protected]>
Date:   Mon Jun 16 17:44:19 2014 +0100

    Update home.client.view.html

    webiste -> website (Angular blurb)

commit 005162ad35c1940bc57873b38428c4e087292b6b
Author: ar1g <[email protected]>
Date:   Mon Jun 16 17:43:11 2014 +0100

    Update home.client.view.html

    alot -> a lot (in Angular blurb)

commit 595f858756b0418205622419407e63106ac7b757
Author: ar1g <[email protected]>
Date:   Mon Jun 16 17:38:21 2014 +0100

    Update home.client.view.html

    Added missing words to MongoDB blurb.

commit 9da3bc87fba91e534f41f82b494e0816a8c248ce
Merge: d0c553d 83ceb27
Author: Amos Haviv <[email protected]>
Date:   Wed Jun 11 23:14:27 2014 +0300

    Merge pull request #90 from Squ34k3rZ/patch-1

    Update header.client.view.html

commit d0c553d27b6a36973ba5cadec8ef1dc6d2c9f490
Merge: 9db5e71 1625479
Author: Amos Haviv <[email protected]>
Date:   Wed Jun 11 23:12:10 2014 +0300

    Merge pull request #83 from neilsh/master

    Corrected "Yoeman" typo in client HTML home

commit 4451ba75cf5d9bfbe753c9160fab4d91414c56ce
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:42:53 2014 -0700

    tab indent fix

commit d7bb81da175016fae8ea22a17465414c4c6d11ff
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:34:06 2014 -0700

    Client-side Validation updates

commit cec748e7c32032032c7713c5b27ac31aa7115ea3
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:33:42 2014 -0700

    Client-side Validation updates

commit cfb0e1b9702fa8392f76ba7a3358b2249a32d972
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:32:32 2014 -0700

    Client-side Validation updates

commit 725cc4ce333783e3e9ad6ca67fc43c44185d2d8f
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:31:32 2014 -0700

    Client-side Validation updates

commit fa00fe98803d26585183a6a358c8c9436d0b6966
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:27:22 2014 -0700

    Client-side Validation updates

commit b468d683cb7bc477bb8f77a1f938e1c98e8f437b
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:26:02 2014 -0700

    Client-side Validation updates

commit 8524d5ff069a19e028e3a2157cc96608f689eb62
Author: Keith <[email protected]>
Date:   Thu Jun 5 22:23:36 2014 -0700

    Client-side Validation updates

commit 83ceb27f8416c656e299af1dfe41c69fc8907769
Author: Squ34k3rZ <[email protected]>
Date:   Thu Jun 5 15:38:59 2014 -0500

    Update header.client.view.html

    Correct spelling

commit 19e937cc3bd3cfc4d7021bfe738512b14d756346
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:33:45 2014 -0700

    Update edit-profile.client.view.html

commit 9221ee981565926ccaa4e15d233fc69c044fe978
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:30:46 2014 -0700

    utilize angular valid / email directive

commit d4a87748df312477d9f7444893afdccc891e81f0
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:29:49 2014 -0700

    utilize angular valid / email directive

commit 0857f8b1cd70d92953d32fadd384cf196a873da9
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:23:07 2014 -0700

    utlize angular .ng-dirty / .ng-valid / .ng-invalid

commit aab268972b67c0f5a4d59a340d2a8ba84ee82b09
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:07:45 2014 -0700

    .ng-dirty.ng-valid angular classes

    utlize .ng-dirty.ng-valid.ng-invalid

commit c291a23c6b603cf69e63e3527934ad69b3794344
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:05:05 2014 -0700

    angular form $valid

    utilize angular $valid to validate form

commit f51ccca4d090f164f38664f5ac398c5fe7772815
Author: Keith <[email protected]>
Date:   Wed Jun 4 11:03:24 2014 -0700

    angular form $valid

    utilize angular dirty / valid / invalid data

commit 16254795138a88fe1d36dad56c5d68ca63cdb363
Author: Neil Halelamien <[email protected]>
Date:   Mon Jun 2 22:51:59 2014 -0700

    Corrected "Yoeman" typo in client HTML home

commit 9db5e718308c8758512740c787011a185a5dedff
Author: Amos Haviv <[email protected]>
Date:   Sun Jun 1 23:46:17 2014 +0300

    Fix password validation error in change password

commit a4d79bd21d42836feb9a049dfece19cb08ead997
Author: Michael Cole <[email protected]>
Date:   Sun May 25 19:31:13 2014 -0500

    .editorconfig based on Felix style guide

commit 5e3b1af5ef3524d2c9592f630f430e338c629547
Merge: 9503720 2f6a0ce
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 02:21:04 2014 +0300

    Merge branch '0.3.1'

commit 2f6a0cebd308f4ceb4f28badc9783eb727f1ed9f
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 02:11:31 2014 +0300

    Updating Build Files

commit d9231ccc3f897695ab783c1822ead7bb368b4e01
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 01:56:08 2014 +0300

    Fixing Grunt Watch

commit 987634ee2aa16d0b65a11df8972d603d06e12711
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 01:04:29 2014 +0300

    Fixing Salt Save Error

    This fixes #75

commit a7cb2b8dbc161da1c798ad88eb64f29199b09047
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 00:55:18 2014 +0300

    Revert "Merge branch 'pr/76' into 0.3.1"

    This reverts commit cdd6aacd09df8a9af5e91ea8457053c2ab9bbe92, reversing
    changes made to a29ec2435fa0a6e8d0f3fb85fdbcb63debde419c.

commit cdd6aacd09df8a9af5e91ea8457053c2ab9bbe92
Merge: a29ec24 7770ccc
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 00:54:57 2014 +0300

    Merge branch 'pr/76' into 0.3.1

    Conflicts:
    	public/modules/articles/views/list-articles.client.view.html

commit a29ec2435fa0a6e8d0f3fb85fdbcb63debde419c
Author: Amos Haviv <[email protected]>
Date:   Mon May 26 00:49:26 2014 +0300

    Fixing menu

commit 7770cccc8bdd4b7e6d72ccfe19176f3d3993e718
Author: Dylan Johnson <[email protected]>
Date:   Sun May 25 10:41:58 2014 -0400

    Remove ng-init directive from article list.

commit 666abdefbdade4dd7f17504ebc8fa7248d6c28c8
Author: Charles Packer <[email protected]>
Date:   Thu May 22 21:19:58 2014 -0700

    Added newlines

commit c5e4c16296553a2eb68672748b534e6c7e8d0b96
Author: Charles Packer <[email protected]>
Date:   Thu May 22 21:08:25 2014 -0700

    Removed test case files from other pull request

commit 58cfb2e515c271f81fea0a1518ce07f07e87196a
Author: Charles Packer <[email protected]>
Date:   Thu May 22 21:02:36 2014 -0700

    Implemented password reset core feature

commit 3ee0e8631adb33312a124212e2d7ea9ba08f8c46
Author: Amos Haviv <[email protected]>
Date:   Thu May 22 14:43:02 2014 +0300

    Update UIBootstrap Version

commit 3cc8caf11172c5c6bce727b670f0dfa76c2daa53
Author: Amos Haviv <[email protected]>
Date:   Thu May 22 12:32:55 2014 +0300

    Fixing Header Active items

commit 6455bdceaec8270ccb4666b5c9bfceb45a8b0d26
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 20:36:39 2014 +0300

    Fixing HTML issues with home

commit 62bf313c6a774a73219ababdfea45347334fb033
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 20:19:51 2014 +0300

    Simplified Gruntfile, Minor Bug Fixing

commit c290dc90a2769a3b37317aae2f36e9330c602a05
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 19:03:18 2014 +0300

    Fix indentation

commit d98205a005089125be3d1d0293e3d5265349aaac
Merge: 30f977c 2aebeca
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 18:59:03 2014 +0300

    Merge branch 'pr/70' into 0.3.1

commit 30f977cb38686bf1f2d91c586f842eb76d13773b
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 18:58:10 2014 +0300

    Support ngmin

commit 6354178e1266778df65b8acfed6458fd543eb107
Merge: a7aa199 9067499
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 18:51:26 2014 +0300

    Merge branch 'pr/72' into 0.3.1

    Conflicts:
    	app/tests/user.server.model.test.js
    	public/modules/articles/config/articles.client.config.js
    	public/modules/core/controllers/home.client.controller.js
    	public/modules/core/services/menus.client.service.js

commit a7aa199019bf11591052c515a23187bc5433c59c
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 18:22:38 2014 +0300

    Fixing indentation

commit 75a9eda55e9f42e8083636eda7a383ef7f725a83
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 18:15:04 2014 +0300

    Moving to ng-bind fixing submenus

commit 5c6efe2f60f1aab5ccafc4bbd6fb5f0e5f84f1ec
Merge: dba1e8b c8e62e1
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 16:59:09 2014 +0300

    Merge branch 'pr/69' into 0.3.1

commit dba1e8b2f28febe02a241d627464ee2b593ff2fb
Author: Amos Haviv <[email protected]>
Date:   Tue May 20 16:58:45 2014 +0300

    Fixing grunt and version issues

commit 9067499056861e3d0b55495ae0997ef040bed3ef
Author: arve0 <[email protected]>
Date:   Tue May 20 14:22:54 2014 +0200

    use ngmin, save some typing

commit 2aebecaa40ed2c872aa75eada6f885036da78a78
Author: Charles Packer <[email protected]>
Date:   Mon May 19 15:39:58 2014 -0700

    Added user test file

commit c8e62e1005395e7a8d003d0e63cb91ccc48bd10f
Author: Michael Cole <[email protected]>
Date:   Mon May 19 12:26:07 2014 -0500

    Typo

commit e7467496501b538bb1c768e9272cc30f0eb40f09
Author: Michael Cole <[email protected]>
Date:   Mon May 19 12:22:55 2014 -0500

    Add 'grunt debug' task

commit 2f3b9517119f5615d14490784272cede87656b03
Author: Amos Haviv <[email protected]>
Date:   Mon May 19 17:40:11 2014 +0300

    Fixing Versions

commit 9575fdcfd41714444446f0b0781dabc34a74cf18
Author: Amos Haviv <[email protected]>
Date:   Mon May 19 17:38:07 2014 +0300

    Fixing Conflicts

commit 59fc0de43dc61387d273ada53d289591a961b465
Merge: be7cd4c 7cf1fc2
Author: Amos Haviv <[email protected]>
Date:   Mon May 19 17:33:01 2014 +0300

    Merge branch 'pr/63' into 0.3.1

    Conflicts:
    	app/tests/user.server.model.test.js
    	public/modules/articles/config/articles.client.config.js
    	public/modules/core/controllers/home.client.controller.js
    	public/modules/core/services/menus.client.service.js

commit be7cd4c4224abbc97fa718063e4549f2b967e034
Merge: 1c5a732 66bf2dc
Author: Amos Haviv <[email protected]>
Date:   Mon May 19 17:31:47 2014 +0300

    Merge branch 'pr/61' into 0.3.1

commit 1c5a7323e2638ef8bc407f911b32f694997abe6b
Merge: 9503720 4fd55e4
Author: Amos Haviv <[email protected]>
Date:   Mon May 19 17:31:26 2014 +0300

    Merge branch 'pr/60' into 0.3.1

commit 66bf2dca4c515a0b20e2c80f7cbd5c85af3abb9a
Author: Michael Cole <[email protected]>
Date:   Wed May 14 07:08:08 2014 -0500

    Typo in test message:

commit 7cf1fc2adbace8eab23d6ee35d0c078730ab00be
Author: Samuel Vijaykumar M <[email protected]>
Date:   Wed May 14 16:05:15 2014 +0530

    Changed all the indents to the spaces(tab size 4)

commit 57f1e242fc6fd48a11ae99807b7494810dbdb6f6
Author: Michael Cole <[email protected]>
Date:   Mon May 12 22:36:14 2014 -0500

    Add a little info about the sample app

commit 46092dd1d26ff1f6cd57db8d9b28ba2b100fff18
Author: Michael Cole <[email protected]>
Date:   Mon May 12 22:24:14 2014 -0500

    Reformat and bootstrappify the client home view.

commit 4fd55e4f6ba00d429f66c19486825a480f062c12
Author: Ernest Conill <[email protected]>
Date:   Sun May 11 00:31:38 2014 +0200

    minor fixes on client view

commit c89c8911f99db5de03457cb7e7dad9b3b91670f3
Author: netusco <[email protected]>
Date:   Sun May 11 00:18:34 2014 +0200

    minor change on addMenuItem

commit e0fc7457b9b48bea45206860162c878d34bf9ef3
Author: netusco <[email protected]>
Date:   Sat May 10 13:47:36 2014 +0200

    little fix on removeSubMenuItem()

commit 95037207f8cce0e9cfca987cf2ba4f73f96ffdb6
Author: Amos Haviv <[email protected]>
Date:   Fri May 9 20:20:59 2014 +0300

    Fixing some typos

commit 4930d8120eb83834c8e30c13c064217b806c2f1c
Merge: 0e7ebb6 fca7e9e
Author: Amos Haviv <[email protected]>
Date:   Fri May 9 20:12:31 2014 +0300

    Merge pull request #57 from netusco/master

    Wrong property on removeMenuItem

commit 12e81fd673569beceb7dc2da236eb8f881afe610
Author: netusco <[email protected]>
Date:   Fri May 9 13:54:00 2014 +0200

    Create dropdown on menuitems with submenus

commit d0268ed319bbfbb26e57040e05080f97ae6fec25
Author: netusco <[email protected]>
Date:   Fri May 9 13:48:35 2014 +0200

    updating calls to addMenuItem and addSubMenuItem

    We can still create normal MenuItems without the 'dropdown' class.

commit 7adb7f3ea2b2aaf5c4b13f201b5c3964942b379e
Author: netusco <[email protected]>
Date:   Fri May 9 13:44:03 2014 +0200

    adding submenus functionality to the menu service

    When having few modules like Articles, Blog, Services, etc... it's good to add the 'New Whatever' or other functionalities within a submenu structure.

commit fca7e9ed6e1eaeda6c7c3cf3e5c4d3b68d8376af
Author: netusco <[email protected]>
Date:   Fri May 9 13:22:48 2014 +0200

    fixing removeMenuItem on menu service

    Object menus had an unknown property menuItem that corresponded to link property (see addMenuItem).

commit 0e7ebb6da89c9e5870a18bb802e791aad72e665d
Author: Amos Haviv <[email protected]>
Date:   Thu May 8 00:14:59 2014 +0300

    Fixing OAuth authentication

commit a180daeace4adc42098cda33d5901e8702b0e565
Merge: 5a2eb6e bcbf2af
Author: Amos Haviv <[email protected]>
Date:   Mon May 5 14:36:11 2014 +0300

    Merge pull request #47 from darksniper87/master

    Update init.js

commit bcbf2af07ff4a8a1498423c28c0e8becbcb01575
Author: darksniper87 <[email protected]>
Date:   Mon May 5 11:21:31 2014 +0300

    Update init.js

    Just fixing some grammatical errors

commit 5a2eb6e7792899324f827b6912e5ce5fa930c0ba
Author: Amos Haviv <[email protected]>
Date:   Sun May 4 23:12:27 2014 +0300

    Fixing grunt build task

commit 9246d301c4557d92955e7c1c0f1a1bda80f1a5a6
Merge: 90d412a 51b2f31
Author: Amos Haviv <[email protected]>
Date:   Sun May 4 22:46:52 2014 +0300

    Merge branch '0.3.0'

commit 51b2f3125962757253c85b320d0c65a16100600b
Author: Amos Haviv <[email protected]>
Date:   Sun May 4 15:14:44 2014 +0300

    Updating Credits

commit 9420d93118259f2a62860c4651b3f5ac46151245
Merge: 38f08ff b8340cb
Author: Amos Haviv <[email protected]>
Date:   Sun May 4 14:41:01 2014 +0300

    Merge branch 'pr/46' into 0.3.0

commit b8340cb6b35a9118cd93bd1abef744c773d89b33
Author: Michael Cole <[email protected]>
Date:   Sat May 3 12:30:58 2014 -0500

    Fixes #45 - Npm install error on 3.0

commit 38f08ff6c360d4187dcb12d3352c5d696ac514d9
Author: Amos Haviv <[email protected]>
Date:   Fri May 2 19:16:18 2014 +0300

    Fixing articles

commit 0b3dead3f02c8fd792b95f46d1bf7f297be37b7b
Author: Amos Haviv <[email protected]>
Date:   Fri May 2 18:50:09 2014 +0300

    Clean up article example

commit 31a193196fcbb17626a3c27f9ca76f07be73deaa
Author: Amos Haviv <[email protected]>
Date:   Fri May 2 18:41:52 2014 +0300

    Fix swig templates

commit 1c7ae6ecb59505f44b7809648b9a50d1de11bcda
Author: Amos Haviv <[email protected]>
Date:   Fri May 2 18:28:24 2014 +0300

    Configuring Extensions

commit 14c3ce7cc995a3267b12e86a7a1f0e8bf33be140
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 28 22:04:44 2014 +0300

    Fix Config

commit 27dfdfe62244e0fa66399e68ddc8b04c1b7ee13e
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 28 21:46:26 2014 +0300

    Delete unused travis file

commit 90d412a8ede27f60604c8fb9dd39704305639f90
Merge: 09f1eab 30cd520
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 28 21:07:25 2014 +0300

    Merge pull request #37 from sahat/patch-1

    Thank you @sahat

commit 7c0078cdaaf5709886fea1da32e906f17081403e
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 28 20:52:29 2014 +0300

    Fix Karma and Menus

commit 30cd5209da8e48c9564c6eee1ef1a740fd397ef3
Author: Sahat Yalkabov <[email protected]>
Date:   Sun Apr 27 21:59:45 2014 -0400

    SVG Badges

commit 14f5d06d4fcee9d66fa54b0205a3fc86af8bc237
Author: Amos Haviv <[email protected]>
Date:   Sun Apr 27 21:51:42 2014 +0300

    Fixed asset management structure

commit c91a3301bf805560fc37c77162a787740857f89f
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 26 20:44:37 2014 +0300

    Clean up

commit 5ff49a7115ee220c0879c7c1e32c789a43093d04
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 26 15:33:53 2014 +0300

    Fixing article and express 4 modification

commit 36acc484bd80648c22ba5632b64fad623b0a1eae
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 26 15:17:31 2014 +0300

     Fixing roles security issues

commit 8cccae2d40500f95585069d2cc7af22441fe5266
Author: Amos Haviv <[email protected]>
Date:   Fri Apr 25 05:51:30 2014 +0300

    Support CDN Assets

commit 56fd75ebadd406534e4cf617af121ba0a0381353
Merge: 81254e0 72c813d
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 23 22:04:52 2014 +0300

    Updating To Helmet

commit 81254e0b27d931269defbf94269bb9bd82cca1ab
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 23 20:44:19 2014 +0300

    Fixing Karma To Load Libraries Independently

commit c7a14f8386e1a88985d7379b77f4fc6a6ae5d1be
Merge: f132e10 ff4ae8b
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 23 19:53:59 2014 +0300

    Merge branch 'pr/24' into 0.3.0

    Conflicts:
    	config/env/all.js
    	config/express.js
    	package.json

commit f132e1084f24f126bcb4caedd763562ce5e73672
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 23 03:57:09 2014 +0300

    Fixing Articles Issues

commit 430e66b2071d6ff390746f46386107e465a49971
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 22 21:18:35 2014 +0300

    Fix intdentation

commit 7c796f12b72d51d0c94148b1a73614c4edac5b20
Merge: 5eed915 e585231
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 22 21:17:16 2014 +0300

    Merge branch 'pr/29' into 0.3.0

commit e585231ab5fe6d034da69fb8f4c1d7b040de075e
Author: Kentaro <[email protected]>
Date:   Tue Apr 22 13:23:20 2014 +0200

    add missing dependencies

    The packages connect-mongo and connect-flash are missing in the package.json

commit 5eed915dd63b45f87de49bb6be9171e17edfe258
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 21 22:52:34 2014 +0300

    Added role based middleware authorisation

commit edd549db8c68ccf9086634a09b49d7186c092de2
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 21 02:32:59 2014 +0300

    More Naming Fixes, articles cleanup

commit 8ad4728140810f2500acdfec707779843bc8efef
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 21 01:13:14 2014 +0300

    Comment Fixes

commit 779295793d429c6a43671f0139e8ce2fa46e357d
Merge: 44bf81a 16f3393
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 21 01:07:05 2014 +0300

    Merge branch 'pr/18' into 0.3.0

    Conflicts:
    	app/routes/core.server.routes.js
    	config/express.js
    	package.json

commit 44bf81a49433d4781f3ef83c2dc7a6d9a93c2fd0
Author: Amos Haviv <[email protected]>
Date:   Mon Apr 21 00:01:01 2014 +0300

    0.3RC

    Express 4 Support
    New naming convention
    Glob patterns
    CSS Linting
    Uglify
    CSS Min
    Environmental Asset Management
    DI Menu System

commit 09f1eab636ea8cda7b795ec63df2b2e79a7dfeac
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 12:53:22 2014 +0300

    Adding the salt part to the hashPassword FN

commit a976eb993e152a1f467e2bb5415ecf65d79640cd
Merge: c6a8a9b 8f09b8b
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 12:51:23 2014 +0300

    Merge branch 'pr/25'

commit 8f09b8b776c1d9e6d9662112c65a47f4fa83ebef
Author: Kentaro Wakayama <[email protected]>
Date:   Wed Apr 16 09:51:31 2014 +0200

    Add check of password and salt in user auth

commit ff4ae8bacce6748cb05792a26b656284f8d525b6
Author: David Morris <[email protected]>
Date:   Tue Apr 15 23:15:35 2014 -0500

    workaround for express 4 connectMongo session bug

commit 114ce6af0c7f1ba81bd1e7afbbdf9cd561b1b7b1
Merge: dbdb827 c6a8a9b
Author: David Morris <[email protected]>
Date:   Tue Apr 15 20:18:27 2014 -0500

    merge upstream 0.2.3

commit c6a8a9babd42083e4d89d5e5c865d67b6feaed92
Merge: f150407 ac3ffca
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 02:47:43 2014 +0300

    Merge branch '0.2.3'

commit ac3ffca366c6726250b97e0ed3de7a9dc214119f
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 02:45:26 2014 +0300

    Adding Accounts View

commit 7ae98d5e2155de8054f7d0ce55f8ac6ad82beb1a
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 02:44:55 2014 +0300

    Adding Comments

commit 279eb396941ac221e81b5903d7b6076ebc56e6c7
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 16 02:00:23 2014 +0300

    Finalizing the User Accounts Module

commit 766e6289328c391ef5bded6100efec4a1fda418d
Merge: 08a2c0f 56b0c31
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 15 16:08:57 2014 +0300

    Merge branch 'pr/15' into 0.2.3

commit 08a2c0fc72924986c928bbe03d588a4131022ea4
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 15 16:08:02 2014 +0300

    Fixed Comments and README

commit 956ec259820e3f197639260e6b21a3985adf032d
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 15 15:44:10 2014 +0300

    Fixing License and Readme

commit 8d83a29aa5d19fbd7941d196890904ccbf4ede0a
Merge: f150407 2f6427a
Author: Amos Haviv <[email protected]>
Date:   Tue Apr 15 15:27:39 2014 +0300

    Merge branch 'pr/23' into 0.2.3

commit 2f6427aa42486a2ddb31e520852fce6e929ef996
Author: Michael Cole <[email protected]>
Date:   Mon Apr 14 17:06:13 2014 -0500

    Update README.md to include where to download the MEAN.JS boilerplate

commit 8479e46f1e3d102b8aa4d222b04f5c0c00845f00
Author: Michael Cole <[email protected]>
Date:   Mon Apr 14 16:25:51 2014 -0500

    Move license to it's own file.  Easier to see what the license is when first encountering the repo

commit 16f33939f7794bbde188c46c05f95fb4a6f99459
Author: Marc-André Bélanger <[email protected]>
Date:   Sat Apr 12 12:15:08 2014 -0400

    Fixed locals.cache when NODE_ENV==='production'

commit dbdb827e2b9c265557452b982113c2e25e950e72
Merge: 2a114ee 56b0c31
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 12 04:51:38 2014 +0300

    Merge branch 'pr/15' into 0.2.3

commit 2a114eefee45210892224a650b0e955c84ab1832
Merge: 97dfc69 fa1171f
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 12 04:51:02 2014 +0300

    Merge branch 'pr/14' into 0.2.3

commit 97dfc69e322f3075a087feb5fa211646a756b7dc
Merge: f150407 c9d641e
Author: Amos Haviv <[email protected]>
Date:   Sat Apr 12 04:50:22 2014 +0300

    Merge branch 'pr/18' into 0.2.3

commit c9d641e2bcddce80492943269e449c4f8e4737cd
Author: Marc-André Bélanger <[email protected]>
Date:   Thu Apr 10 22:26:41 2014 -0400

    Migration to Express 4.x

    Please see the Express documentation for details.

    connect-mongo NPM package is currently broken with Express 4.x. Use
    this fix in the meantime:
    https://github.com/kcbanner/connect-mongo/issues/103#issuecomment-400800
    50 .

commit 56b0c3112015ed7695e95460e5aa1df0f022a032
Author: Kentaro Wakayama <[email protected]>
Date:   Wed Apr 9 10:11:24 2014 +0200

    Add account buttons to join more accounts

commit 00f3940d8f82db5dceafd812d62cb4dc82751db7
Author: Kentaro Wakayama <[email protected]>
Date:   Wed Apr 9 10:10:22 2014 +0200

    Add joining of multiple accounts

commit fa1171fe280496fa97a6a8eed1027776922e5c65
Author: Miguel Cobá <[email protected]>
Date:   Tue Apr 8 10:38:56 2014 -0500

    Add envvars for deploying to cloud providers

commit f150407e0658766d327d2516ef4182a5cba877eb
Author: Amos Haviv <[email protected]>
Date:   Thu Apr 3 13:11:17 2014 +0300

    Removed old images

commit 1a7a2d6934835435abc5a42264cffc05391924de
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 2 19:58:59 2014 +0300

    Update Bower Dependencies

commit d7fb3984a21d2b470c928c25df3bee1e2836a59c
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 2 19:34:32 2014 +0300

    Complete Cleanup

commit c11c42888c48522295ebc926279d4bb11ec186a4
Author: Amos Haviv <[email protected]>
Date:   Wed Apr 2 19:16:40 2014 +0300

    Article Cleanup

commit 47561ce3edc996392f11dd6c50cfe326efa8bfec
Author: Amos Haviv <[email protected]>
Date:   Mon Mar 31 02:39:07 2014 +0300

    Fixed password hashing in general

commit c0a7c054baf49e11449a26468494f5838c8247dd
Author: Amos Haviv <[email protected]>
Date:   Sun Mar 30 18:23:25 2014 +0300

    Update Dev Depenedencies + Password Change Fix

commit 72c813d3847f7e2fccdbf840294427c5d8a5a992
Author: Yutaka Yamaguchi <[email protected]>
Date:   Sun Mar 30 14:55:40 2014 +0900

    keep enable Cache-Control

    helmet.defaults() disabeles Cache-Control. I guess it's controversial to disable it.

commit afb0f973c820e4dd0028595fc314bb9b29a87ac9
Author: Yutaka Yamaguchi <[email protected]>
Date:   Sun Mar 30 14:38:00 2014 +0900

    use helmet module to more secure application

    Helmet module is the middleware to add security headers for Application.
    I think these headers is so important for security that we should also use in MEAN.js.

    We need to install the latest one from github currently because it looks old on the npm site.
    The old one is not working on my local MEAN.js stack.

commit 12cb3bfb93c9e164b1049945a4b4c573eba756ea
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 27 20:02:15 2014 +0200

    Update Dev Dependencies Versions

commit d7d4518595c2c87b65cf71d86835fc717baf3a74
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 27 19:57:58 2014 +0200

    Updating Dependencies

commit acf1df57b8e58ec6515a59410226789df7880df8
Merge: c054ec8 31ec93a
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 27 19:44:19 2014 +0200

    Merge pull request #1 from jshultz/master

    fixes db deployment issue on heroku. production db value needs to be set...

commit c054ec8649ab0fc959ffd284996ce020ef0de43b
Merge: f17c48c 6b57516
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 27 19:22:11 2014 +0200

    Merge pull request #10 from fyockm/master

    ensure NODE_ENV is valid and default regex for walk

commit 6b575164dd6adf6389668f0104003b72fc0e97c8
Author: Drew Fyock <[email protected]>
Date:   Thu Mar 27 09:37:21 2014 -0400

    ensure NODE_ENV is valid, default regex for walk

commit f17c48cfca5bbbca549c8754c35e8469416df85f
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:54:33 2014 +0200

    Added Dependencies Badge

commit e84746fd577d503360fd2e0d8c6b89631a80c9ed
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:33:13 2014 +0200

    Fix indentation

commit 76732bbfb104c20a21a3d2c020e46bfacf2de95a
Merge: 7ba7dcf 921bb41
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:31:13 2014 +0200

    Merge branch 'master' of https://github.com/meanjs/mean

commit 7ba7dcfd2155773fb3c8bffe516547793a370d6f
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:30:58 2014 +0200

    Adding New files

commit 921bb41036fda818b8a4841d6e64f318d081e596
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:27:09 2014 +0200

    Fix Development Config

commit 38bffbcdbbb714b43d6d831a61f90446c4f8c44d
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:23:04 2014 +0200

    Users Module Version

commit 36f71fa279bf7b6ca6c74f1adf1a25aca1894012
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 26 01:11:24 2014 +0200

    Users Module Revamp

commit 994a220d454bcd79b0a2709c8d1361fa69ae80d6
Merge: 6705319 feaef31
Author: Amos Haviv <[email protected]>
Date:   Mon Mar 17 19:42:43 2014 +0200

    Merge pull request #8 from viczam/patch-1

    added permission request for email

commit feaef3155b64157ec3154cf59e0eb9ba4025c94c
Author: Victor Zamfir <[email protected]>
Date:   Sun Mar 16 19:25:16 2014 +0200

    added permission request for email

    the application will trigger an error is this is not added here, since you won't have access to user's email in passport's facebook strategy.

commit 670531911ee9c5fe5d81d7153ce9f86f400e0ce6
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 12 20:14:22 2014 +0200

    Fixing Karma Version

commit d6339040e9b5b747e39ea82782f313ca037e4749
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 12 19:41:33 2014 +0200

    Update twitter.js

commit 31ec93af31569f310900f806f7df2890cd64d2ed
Merge: c06a9ae 7edb6b8
Author: Jason Shultz <[email protected]>
Date:   Sun Mar 9 17:37:33 2014 -0600

    Merge branch 'master' of github.com:jshultz/mean-1

commit c06a9aece29aed6825fe2119a6f56663eecaa575
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:51:10 2014 +0200

    Update README.md

commit 285e6052b98af14616bb6d6c6116a5919c8babc2
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:48:50 2014 +0200

    Adding Travis Tag

commit 584ccf16568d48e7de53442f5163453a0a8c3373
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:46:47 2014 +0200

    FIxing Jasmine tests to fit new version

commit f077caf204914fb0770e8f7bdee02c22636b1a79
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:35:27 2014 +0200

    Fixing Travis Grunt Issues

commit 8b8da52a4cdcbc1495a7fc27942b3c9995b077ac
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:32:58 2014 +0200

    Fixing Travis Grunt Issues

commit b50ac6127141468cdc508bc47b026895fa1a36bd
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:29:51 2014 +0200

    Fixing Travis Grunt Issues

commit e7b1fe081413bdf63fe26aeead0bf1061d2dd822
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:25:37 2014 +0200

    Fixing Heroku Bower Issues

commit a3a712906de66aa889344bcaba5cd5698a7a60c8
Author: Amos Haviv <[email protected]>
Date:   Thu Mar 6 01:01:04 2014 +0200

    Fixing Bower Versions, Fix Flickering

commit 8c825ff1964316000ef1b5ef38ea3f6e174dc40f
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 5 22:25:09 2014 +0200

    Locking NPM versions

commit 271bd1b8f69c6b40c2474b6a06d33368845c8d80
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 5 01:40:44 2014 +0200

    Adding twitter meta tags

commit 89e2da7740098ae1de34fca92607eb1aea57437e
Author: Amos Haviv <[email protected]>
Date:   Wed Mar 5 01:39:02 2014 +0200

    Adding twitter meta tags

commit 458987cad3cf2e27b9a2b6e339c8f40edcbc4cd6
Author: Amos Haviv <[email protected]>
Date:   Tue Feb 25 11:30:08 2014 +0200

    Deleting Shrinkwrap since its notworking with hosted cloud services

commit f15e9141f5032caffd6e4eecad723103f2352d1d
Author: Amos Haviv <[email protected]>
Date:   Sat Feb 22 16:45:26 2014 +0200

    Adding Shrinkwrap.json to lock versions - https://www.npmjs.org/doc/shrinkwrap.html

commit 61ce5097e46439b5d86aa39d5daa5ab6634a7aaf
Author: Amos Haviv <[email protected]>
Date:   Sat Feb 22 16:22:24 2014 +0200

    Fixing Jasmine

commit 9e0317f84657c9bb5e1053f1673c22524dbfbced
Author: Amos Haviv <[email protected]>
Date:   Sat Feb 22 15:49:16 2014 +0200

    Locking Versions Using Shrinkwrap

commit 1004a880a0c61c334d824c2872d6f0c6cbd72e89
Merge: 311605a fdeffbf
Author: Amos Haviv <[email protected]>
Date:   Fri Feb 21 00:47:09 2014 +0200

    Merge branch 'master' of https://github.com/meanjs/mean

commit 311605a4e2165256a7b54532fa0b14bfe8b530dd
Author: Amos Haviv <[email protected]>
Date:   Fri Feb 21 00:41:21 2014 +0200

    Replacing ngRoute with UI-Router

commit fdeffbf3f9926d869abb50c9d2abc928ccfabfdf
Merge: f0508e3 5654e1f
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 19 14:50:25 2014 +0200

    Merge pull request #2 from jshultz/patch-1

    Update config.js

commit 5654e1f26e2952b6061871a1f16b76297e93959c
Author: Jason Shultz <[email protected]>
Date:   Mon Feb 17 21:13:53 2014 -0700

    Update config.js

    super simple, just fixing a typo.

commit 7edb6b89b38c7d04db69b453d8b4214c725a7c5f
Author: Jason Shultz <[email protected]>
Date:   Mon Feb 17 16:07:38 2014 -0700

    fixes db deployment issue on heroku. production db value needs to be set in production.js and removed db variable from all.js.

commit f0508e3b7be72947ddcadc523f89e7f41f1f00f8
Author: Amos Haviv <[email protected]>
Date:   Sat Feb 15 15:36:22 2014 +0200

    Fix Tests to Fit New Jasmine

commit 1c20b31b5c8268695d5902ccc2c03947dae02c35
Author: Amos Haviv <[email protected]>
Date:   Fri Feb 14 20:33:13 2014 +0200

    Added Madhums Credit

commit d9be8d85cf0901d26b0b171e4415cbb62fa8cacb
Author: Amos Haviv <[email protected]>
Date:   Fri Feb 14 20:05:58 2014 +0200

    Fixing Session Hash Secret

commit b87b37679a8b21b5d09dde3d6c3ca2e6d6a9c323
Author: Amos Haviv <[email protected]>
Date:   Fri Feb 14 20:03:43 2014 +0200

    Fixing Karma Tests

commit 322d865080a78cc1e15f95d0c3336dbe96a59f13
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 19:21:54 2014 +0200

    Fixing Navbar Flickering

commit 85c97f88beedede9877278be9688380aca025d94
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 18:54:38 2014 +0200

    Fixing Configuration Files

commit 02b977340790d72d6ea2ff24401fcd4a9c673478
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 18:46:15 2014 +0200

    Fixing Passport Split

commit 880ad6a1f71332e586cbaff1a7550bdb424194bb
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 18:29:46 2014 +0200

    Spliting Strategies

commit 22d0e7a3560d00d84cdba4cadd32196e899daeb4
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 18:10:32 2014 +0200

    Spliting Strategies

commit 52dea2bbf8f0552569d5451b851de0ff7bfcc85b
Author: Amos Haviv <[email protected]>
Date:   Wed Feb 12 18:10:28 2014 +0200

    Spliting Strategies

commit 899b65d580e4cba125558e8237a4ffec3b7fb2a6
Author: Amos Haviv <[email protected]>
Date:   Mon Feb 10 16:16:26 2014 +0200

    Fix Production SWIG

commit 72331dec3afbe1e14f18abe2ba7d8e98dd3c046a
Author: Amos Haviv <[email protected]>
Date:   Mon Feb 10 16:15:06 2014 +0200

    Fix Production SWIG

commit c1213e9a7b07f09f3f1ce2d871be0a8bb8780f7e
Author: Amos Haviv <[email protected]>
Date:   Mon Feb 10 13:24:01 2014 +0200

    Fixing Indentation Convention to TABS

commit eae6f2d6bc48e35f0f3f7806f04e73e8e1629c95
Author: Amos Haviv <[email protected]>
Date:   Mon Feb 10 13:09:31 2014 +0200

    Moving to MEAN.JS

commit 17e089ec694132a39948fe47e84a817429b2a189
Author: Amos Haviv <[email protected]>
Date:   Mon Feb 10 13:09:25 2014 +0200

    Moving to MEAN.JS

commit f52d6c3a30ceb22098210bd9775091c306548aff
Author: Lior Kesos <[email protected]>
Date:   Fri Feb 7 02:12:35 2014 +0200

    Revert "Initial commit for the site"

    This reverts commit 4e37a3f2c748e5d2144675a92f15acc28ac8bdb2.

commit 4e37a3f2c748e5d2144675a92f15acc28ac8bdb2
Author: azure provisioned user <[email protected]>
Date:   Thu Feb 6 23:53:00 2014 +0000

    Initial commit for the site

commit 752854fafa9b68e240dfb5481d4b88b04650836e
Author: Lior Kesos <[email protected]>
Date:   Thu Feb 6 23:58:22 2014 +0200

    Fixed consolidate dying on behalf of a cache=true, it needs to be cahce=memory

commit f0eb648cbd7dead42d02ae2cb620fd495a4d4e61
Merge: 8499c45 30d9494
Author: Lior Kesos <[email protected]>
Date:   Thu Feb 6 22:01:47 2014 +0200

    Merge pull request #236 from fyockm/master

    use consolidate to make template engine configurable

commit 30d949428e4f809490830aa7b62a082e5b51ded8
Author: Drew Fyock <[email protected]>
Date:   Thu Feb 6 13:51:41 2014 -0500

    #236 add .idea to gitignore

commit f57b51d4856cb5f901cf268c2faf584c8f3f296e
Author: Drew Fyock <[email protected]>
Date:   Mon Feb 3 14:02:43 2014 -0500

    #236 fix travis asking for user input

commit a0c9de3756b5ea897ba41ea96c1e98ebb0bfdd7f
Author: Drew Fyock <[email protected]>
Date:   Mon Feb 3 13:46:39 2014 -0500

    #236 implement swig instead of jade

commit c2330e574c889973023cc1166099b887c9caf52f
Merge: 412d6b3 8499c45
Author: Drew Fyock <[email protected]>
Date:   Sat Feb 1 11:50:48 2014 -0500

    #326 merge latest

commit 8499c45df451d5b9d00a9691b13bd7cabf162b07
Author: Lior Kesos <[email protected]>
Date:   Sun Jan 26 23:47:14 2014 +0200

    Added requirement to passport-linkedin to the package.json to fulfill missing requirement.

commit febf917679dc07a687ac4fed88da9e7a04b290b9
Merge: 87e701d 58d2cbf
Author: Lior Kesos <[email protected]>
Date:   Sun Jan 26 23:39:37 2014 +0200

    Merge branch 'linkedin' of https://github.com/kalehv/mean into kalehv-linkedin

commit 87e701d05c5efbe382286379535d7ad31d12e1ff
Merge: 7907608 c6b6758
Author: Lior Kesos <[email protected]>
Date:   Sun Jan 26 13:29:20 2014 -0800

    Merge pull request #243 from jonaswindey/patch-2

    Update .bowerrc

commit 79076086a9d8703b7343619b375338c1a42489d7
Author: Lior Kesos <[email protected]>
Date:   Sun Jan 26 23:24:23 2014 +0200

    upgrade to angular 1.2.10 to avoid interaction in bower installed based on https://github.com/linnovate/mean/pull/245 by #sogko

commit 58d2cbf70653a7bc6c8b8a9781ccd2646d8ca6e0
Author: Harshad Kale <[email protected]>
Date:   Sat Jan 25 12:03:26 2014 -0600

    Add linkedin support for login

commit c6b6758cb5250b61cf7490072d945edf9f43d99c
Author: jonaswindey <[email protected]>
Date:   Wed Jan 22 17:52:22 2014 +0100

    Update .bowerrc

    Added fix for Heroku deployment ENOENT issues that occur since bower 1.2.8

commit d59bf8645d2461d7b7942e4bd2464af6dd25526e
Merge: 526fc0a 8324179
Author: Lior Kesos <[email protected]>
Date:   Tue Jan 21 22:51:52 2014 +0200

    Merge branch 'master' of https://github.com/lirantal/mean into lirantal-master

commit 8324179ca283339bbf398dc7ead7c350aef92ffe
Author: Liran Tal <[email protected]>
Date:   Tue Jan 21 21:51:14 2014 +0200

    cleaning up jslint warnings

commit 526fc0a9d717cf95c5e275e68726f14e2b5c3743
Merge: a5410c0 3963892
Author: Lior Kesos <[email protected]>
Date:   Mon Jan 20 23:55:50 2014 +0200

    Merge branch 'enhancement-authtypes_refactor' of https://github.com/lirantal/mean into lirantal-enhancement-authtypes_refactor

commit a5410c0fee92e7c91ff69fe9044c9dae4aef2605
Merge: 6b9826b c0de030
Author: Lior Kesos <[email protected]>
Date:   Sun Jan 19 22:58:31 2014 +0200

    Merge branch 'master' of https://github.com/VikramTiwari/mean into VikramTiwari-master

commit 6b9826b2c480a7fa66d935aa5db088a302f85114
Merge: 02ff85a fac6ab8
Author: Yonatan Ellman <[email protected]>
Date:   Sun Jan 19 00:56:54 2014 -0800

    Merge pull request #240 from ellman/master

    Fixing grunt-nodemon and some dev dependency versions

commit fac6ab852ad3a1ac7446f445ca5cd832f3af2aa1
Author: yonatan <yonatan@yonatan-hp.(none)>
Date:   Sun Jan 19 10:52:33 2014 +0200

    Fixing grunt-nodemon and some dev dependency versions

commit 55aeaadd615d7c2e377548d7c6c8f3ce5214afec
Author: Liran Tal <[email protected]>
Date:   Sat Jan 18 00:22:16 2014 +0200

    fixed defect where no flash (error/success) messages would be displayed due to wrongly placed flash() call (it should go after passport.initialize and passport.session)

commit 412d6b33362fb65c76f3da1f0625ebc53a213229
Author: Drew Fyock <[email protected]>
Date:   Fri Jan 17 10:25:46 2014 -0500

    use consolidate to make template engine configurable

commit 6bacb0c79ed0826f8a377b363e9e702bcfea898b
Merge: f0d9291 dea044c
Author: Liran Tal <[email protected]>
Date:   Thu Jan 16 21:38:04 2014 +0200

    Merge branch 'enhancement-routes_refactor'

commit f0d92918959c415f1dad492ff679f782aa0be79d
Merge: ee63f17 3963892
Author: Liran Tal <[email protected]>
Date:   Thu Jan 16 21:37:55 2014 +0200

    Merge branch 'enhancement-authtypes_refactor'

commit c0de03085d6190c191c7b6a8e3dd5a64ec243831
Author: VikramTiwari <[email protected]>
Date:   Wed Jan 15 14:11:19 2014 +0530

    Current Stable

    Update to Current Stable versions for dependencies.

    angular: 1.2.8
    bootstrap: 3.0.3
    angular-boostrap: 0.10.0
    angular-ui-utils: 0.1.0

commit 57055a355b4715b2ea874b723a86c42933c24f70
Author: VikramTiwari <[email protected]>
Date:   Wed Jan 15 11:57:23 2014 +0530

    Everything Latest

    Bootstrap Latest
    Angular Bootstrap Latest
    Angular UI-Utils Latest

commit 02ff85a50194c0d98040144cc4f0db574ae6c794
Merge: 5c950bf ee63f17
Author: Lior Kesos <[email protected]>
Date:   Tue Jan 14 14:09:10 2014 -0800

    Merge pull request #226 from lirantal/master

    comment fixes, indentation and general cosmetic cleanup

commit dea044c2e1e1bc3d0e4d7eb62485641f4e7079f0
Author: Liran Tal <[email protected]>
Date:   Mon Jan 13 00:42:53 2014 +0200

    further refactoring of the route middlewares so they can be easily shared amongst app routes

commit 0afb2e6ec93b251730d5a7a55b98053c4415ab5b
Author: Liran Tal <[email protected]>
Date:   Sun Jan 12 23:55:34 2014 +0200

    refactoring so that app routes can be maintained more easily from app/ directory (which makes more sense)

commit 3963892615e378b87eaedbde6aae82ccdff2c6a3
Author: Liran Tal <[email protected]>
Date:   Sun Jan 12 23:30:30 2014 +0200

    small bug fix where Mongoose validation functions must always return booleans

commit 969c6911d8ea530611ba3845782a67cdd5fee428
Author: Liran Tal <[email protected]>
Date:   Sun Jan 12 23:27:17 2014 +0200

    instead of relying on previously hard-coded passport strategies we can assume that any user entry which have no provider set is a local strategy and apply our validations only on those empty provider members of the user model object

commit 5c950bf60508e8a87499193674c1d888b6ad7eb7
Author: Lior Kesos <[email protected]>
Date:   Mon Jan 6 01:31:38 2014 +0200

    Set versions based on npm install --save

commit ee63f1712e617555b6061df6ef1074accc8d67e0
Author: Liran Tal <[email protected]>
Date:   Mon Jan 6 00:11:37 2014 +0200

    moving out configuration items from express.js code to a proper configuration directive

commit e2ea8dace9f4e8b9455142cd0fb23cc28bf2a345
Author: Liran Tal <[email protected]>
Date:   Sun Jan 5 23:27:18 2014 +0200

    fixed small bug where logger was used also on production environment. Makes sense that original intent was to enable only for development environment

commit add000d3a19ff5d157e32ecb446aaf3e761e83b6
Author: Liran Tal <[email protected]>
Date:   Sun Jan 5 23:14:11 2014 +0200

    updating documentation

commit 0e692c5bfc8fa061011d7ce689d521159d6bd96d
Author: Liran Tal <[email protected]>
Date:   Sun Jan 5 22:58:39 2014 +0200

    comment fixes, indentation and general cosmetic cleanup

commit bb910c5981c8d258175c7a4a19a2857abd29878d
Merge: 6876427 8f30cda
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 30 06:18:47 2013 -0800

    Merge pull request #213 from cm0s/master

    replace deprecated grunt-nodemon debug option

commit 6876427698a4872465cdc97d40227d671898541b
Merge: 923f744 6993150
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 30 06:15:21 2013 -0800

    Merge pull request #215 from jonaswindey/patch-1

    Update package.json

commit 923f744eacffbd5df8be958a50dccc6efae95f25
Merge: 963794a c639ae6
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 30 06:14:54 2013 -0800

    Merge pull request #212 from mackstar/master

    Replaced dependency on server.js for mocha tests.

commit 6993150dcfdd99a25a5859ef95e6a049f8fa3e7b
Author: jonaswindey <[email protected]>
Date:   Mon Dec 30 12:48:28 2013 +0100

    Update package.json

    Re-added forever.js reference, since the Procfile for Heroku deployment runs: web: ./node_modules/.bin/forever -m 5 server.js

commit 8f30cda7dfd027f901f8ffda88f2a243f2711792
Author: Nicolas Forney <[email protected]>
Date:   Mon Dec 30 00:31:15 2013 +0100

    replace deprecated grunt-nodemon debug option

    Since grunt-nodemon version 0.1.0 the debug option is deprecated and must
    be replaced by a nodeArgs option.

commit c639ae65c2a0e779a5b45500a47234f270bb890b
Author: Richard McIntyre <[email protected]>
Date:   Wed Dec 18 08:16:46 2013 +0000

    Require server in gruntfile for mocha tests.

commit cf7a3f0486a66e9ec75170848be6b1d9224d1bd4
Author: Richard McIntyre <[email protected]>
Date:   Wed Dec 18 08:16:46 2013 +0000

    Replaced dependency on server.js for mocha tests.

commit 963794a7f7a3176120adb540f5af521a77ad8257
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 18:08:36 2013 +0200

    Removed unnecessary modules

commit 4c0ee357bdd58d23c92793a6bf3549c4e1024592
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 16:54:08 2013 +0200

    Fixing enviornment issue with new JSHint

commit d8fe54d14f26ea8350d6c8f018451c12bb689dd2
Merge: 822d7ca 2435a73
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 16:37:19 2013 +0200

    Properly run JSHint

commit 822d7ca7b2d8bbff405264fbca39c838937bd619
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 16:36:33 2013 +0200

    Properly run JSHint

commit 2435a7329121dd5257147952ea7781bb76a7c3f7
Merge: d35cd02 c919364
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 06:35:45 2013 -0800

    Merge pull request #202 from naartjie/fix-02

    correct the livereload host

commit d35cd02b820fe881e71924e0f90b29ebee9e22b4
Author: Amos Haviv <[email protected]>
Date:   Wed Dec 25 13:20:54 2013 +0200

    Fixing jshint

commit 2cd3512fef9b2a63a6960677c260ef4b12a6ee43
Merge: 5a780aa a2f31f2
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 24 07:13:39 2013 -0800

    Merge pull request #203 from gebrits/patch-1

    update gruntfile.js to let jshint adhere to .jshintrc

commit a2f31f2c5d37aa3e7f54c13986953b8fa49f7a8f
Author: Geert-Jan Brits <[email protected]>
Date:   Tue Dec 24 15:43:27 2013 +0100

    update gruntfile.js to let jshint adhere to .jshintrc

    currently the `jshint:all` task doesn't take the .jshintrc-file into account. This pull corrects that.

commit c9193642c92e12afc9613b9c2bb1258d0efe7a16
Author: Marcin Jekot <[email protected]>
Date:   Tue Dec 24 15:31:28 2013 +0200

    correct the livereload host

    This let's you use an arbitrary host in development mode, and do cross machine/VM testing etc, with a hostname other than localhost

commit 5a780aa34c17725363868748837ae5e9fccb239b
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 19:52:54 2013 +0200

    Adding Bower Resolutions

commit 86186ad151f4113f00c579cb57e6a8ef91d3784e
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 19:45:27 2013 +0200

    Fixing Facebook Redirect

commit ef50e5da0da9061935c9ef60b0ea1b9bf46eaf91
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 19:36:55 2013 +0200

    Fixing Facebook Redirect

commit 46715a126825588f0510ca05ec04faaa12fbecc2
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 19:17:32 2013 +0200

    Fixing Facebook Redirect

commit 14147f7f88674585c71f1bebec3e4a2680f1e292
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 12:40:23 2013 +0200

    Moving router above static

commit 0c869a2ccad5465289a8daadae5c55e3a26e96e5
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 12:37:00 2013 +0200

    Fixing the new Jade issues

commit 614a9dfb12f6788e60d2ec81a616d16986244dab
Merge: 81fea35 270d2c3
Author: Amos Haviv <[email protected]>
Date:   Mon Dec 23 02:06:45 2013 -0800

    Merge pull request #196 from mrzepinski/patch-2

    one more time - update to valid Jade doctype

commit 270d2c3fd61449b809b278dfd687a14c37666ca3
Author: Maciej Rzepiński <[email protected]>
Date:   Sun Dec 22 21:34:52 2013 +0100

    one more time - update to valid Jade doctype

commit 81fea3516ddb5ae4926096530d721011a0a7ee37
Author: Amos Haviv <[email protected]>
Date:   Fri Dec 20 14:15:58 2013 +0200

    Moving from Underscore to LoDash

commit 9c6e5514f0e39a68b32062958d695fc613b98ca3
Author: Amos Haviv <[email protected]>
Date:   Fri Dec 20 14:14:54 2013 +0200

    Moving from Underscore to LoDash

commit bac1a06628ab57358f892a6586875580f8979665
Author: Amos Haviv <[email protected]>
Date:   Thu Dec 19 21:05:27 2013 +0200

    Fixing Heroku Bower Failure

commit 1d9f1a0ce35b7c4dc21a7963bfc527ea9f73a4cb
Author: Amos Haviv <[email protected]>
Date:   Sat Dec 14 20:35:29 2013 +0200

    Update users.js

commit f8ac701c2550df5d8d53d97209d11a79a5d56b57
Author: Amos Haviv <[email protected]>
Date:   Thu Dec 12 18:42:54 2013 +0200

    Fixing errors style

commit d36b852e40cd17594b48c30aeb12c5929a0a914c
Merge: 50b3b88 d3b9852
Author: Amos Haviv <[email protected]>
Date:   Thu Dec 12 06:47:06 2013 -0800

    Merge pull request #173 from andrunix/master

    On the signin page, the error div was always visible even if it was empty.

commit d3b98529be65a1f673731852d366625c6667e58e
Author: Andrew Pierce <[email protected]>
Date:   Wed Dec 11 16:25:46 2013 -0500

    Added check for empty salt before attempting to encrypt password. If you sign up with OAuth provider and then try to login with Email (local strategy), the Salt is empty and authentication fails.

commit 2def71a53e61eaeba9eac9f3c26288c17e45bfbf
Author: Andrew Pierce <[email protected]>
Date:   Wed Dec 11 15:49:19 2013 -0500

    Moved flash messages from auth.jade to signin.jade. Placed within error div.

commit 50b3b88c5808f0539014cac0725f2114c4fd7932
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 14:50:44 2013 +0200

    Fixing Travis Stall

commit 0697df0b6de904c29fe82b5178148c95ca266076
Merge: 209b702 12037bc
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 04:33:06 2013 -0800

    Merge pull request #160 from CREO-Agency/statics_overwrite

    Don't overwrite statics

commit 209b7023da4fbe56d3fcf7df488d6b8f4c9c9df1
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 14:29:14 2013 +0200

    AngularJS latest is good for now

commit b99c166f61fa6b9b6cddab28307f3db750852725
Merge: 4a07cde 1e75b42
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 04:26:30 2013 -0800

    Merge pull request #162 from dizda/angular1.2.4

    Upgrade to latest stable version of AngularJS (1.2.4)

commit 4a07cdec7fe61b0d6126fbaa7155699badcd7775
Merge: 218da62 ebddcd3
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 04:10:46 2013 -0800

    Merge pull request #158 from davychiu/master

    hash password with pbkdf2

commit 218da624175041c7a1476840f5976a783cd7e64f
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 13:32:05 2013 +0200

    Fixing the Foot.jade to use env var instead of host

commit 2d1542511b1f894cce504e5b08f3cd1be7067d81
Merge: dbe7213 7a872fa
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 10 03:29:38 2013 -0800

    Merge pull request #169 from theblacksmith/master

    Fix bug in foot.jade which tries to assign host instead of comparing it

commit 7a872faecef339bce0b94fd2d551784ec7ca7f72
Author: Saulo Vallory <[email protected]>
Date:   Mon Dec 9 21:39:55 2013 -0200

    Fix bug in foot.jade which tries to assign host instead of comparing it

commit 1e75b420c8fa3ba999046de9c26d5037df369df2
Author: Jonathan Dizdarevic <[email protected]>
Date:   Sat Dec 7 19:41:48 2013 +0100

    lock to specified JS dependencies version

commit f0ae031423ad096a12cf8af4632d69c6de9175ed
Author: Jonathan Dizdarevic <[email protected]>
Date:   Sat Dec 7 19:33:03 2013 +0100

    fix tests

commit f2a85f8dcd2ba5892611d2fb2e7d1f6e9c21dcc5
Author: Jonathan Dizdarevic <[email protected]>
Date:   Sat Dec 7 19:30:41 2013 +0100

    Update to AngularJS 1.2.4

commit 12037bc566f0b2d5570aaf54503a60f90cc1707e
Author: John Williams <[email protected]>
Date:   Thu Dec 5 15:45:52 2013 -0800

    Don't overwrite statics

commit ebddcd319abbf76258a128a710f9ddad63c99da2
Author: Davy Chiu <[email protected]>
Date:   Wed Dec 4 05:20:48 2013 -0800

    hash password with pbkdf2

commit dbe7213f773dcd7f406b9d61dc7f7387fb0c2065
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 3 02:43:52 2013 +0200

    Removed the Show User method

commit f358e810f51bf8a968ee3d43ed555ef9aa8d1b11
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 3 02:19:04 2013 +0200

    Testing Fix

commit 7354e781f15ee66fce246be0b1dd4fdd98a5af00
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 3 02:18:11 2013 +0200

    Testing Fix

commit 0ffe987c69ae42b71b0ee5d93f37441f69d20aaa
Merge: db56846 673ac81
Author: Amos Haviv <[email protected]>
Date:   Tue Dec 3 02:12:47 2013 +…
  • Loading branch information
@justinsacbibit
justinsacbibit committed Oct 18, 2014
1 parent 7dbed6a commit 592c1cc
Show file tree
Hide file tree
Showing 2,627 changed files with 4,833 additions and 495,124 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "public/lib"
}
15 changes: 15 additions & 0 deletions .csslintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"adjoining-classes": false,
"box-model": false,
"box-sizing": false,
"floats": false,
"font-sizes": false,
"important": false,
"known-properties": false,
"overqualified-elements": false,
"qualified-headings": false,
"regex-selectors": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false
}
49 changes: 49 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# EditorConfig is awesome: http://EditorConfig.org

# Howto with your editor:
# Sublime: https://github.com/sindresorhus/editorconfig-sublime

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[**]
end_of_line = lf
insert_final_newline = true

# Standard at: https://github.com/felixge/node-style-guide
[**.js, **.json]
trim_trailing_whitespace = true
indent_style = space
indent_size = 2
max_line_length = 80
quote_type = single
curly_bracket_next_line = false
spaces_around_operators = true
space_after_control_statements = true
space_after_anonymous_functions = false
spaces_in_brackets = false

# https://github.com/jedmao/codepainter
[node_modules/**.js]
codepaint = false

# No Standard. Please document a standard if different from .js
[**.yml, **.html, **.css]
trim_trailing_whitespace = true
indent_style = space
indent_size = 2

# No standard. Please document a standard if different from .js
[**.md]
indent_style = space

# Standard at:
[**.py]
indent_style = space
indent_size = 4

# Standard at:
[Makefile]
indent_style = tab
indent_size = 8
37 changes: 9 additions & 28 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
# SSL Certificate
sslcert

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Deployed apps should consider commenting this line out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
# node_modules
.DS_Store
.nodemonignore
.sass-cache/
npm-debug.log
node_modules/
public/lib
app/tests/coverage/
.bower-*/
.idea/
42 changes: 42 additions & 0 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
"browser": true, // Standard browser globals e.g. `window`, `document`.
"esnext": true, // Allow ES.next specific features such as `const` and `let`.
"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
"curly": false, // Require {} for every new block or scope.
"eqeqeq": true, // Require triple equals i.e. `===`.
"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef": true, // Prohibit variable use before definition.
"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"quotmark": "single", // Define quotes to string values.
"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
"undef": true, // Require all non-global variables be declared before they are used.
"unused": false, // Warn unused variables.
"strict": true, // Require `use strict` pragma in every file.
"trailing": true, // Prohibit trailing whitespaces.
"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
"globals": { // Globals variables.
"jasmine": true,
"angular": true,
"ApplicationConfiguration": true
},
"predef": [ // Extra globals.
"define",
"require",
"exports",
"module",
"describe",
"before",
"beforeEach",
"after",
"afterEach",
"it",
"inject",
"expect"
],
"indent": 4, // Specify indentation spacing
"devel": true, // Allow development statements e.g. `console.log();`.
"noempty": true // Prohibit use of empty blocks.
}
1 change: 1 addition & 0 deletions .slugignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/app/tests
6 changes: 5 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
language: node_js
node_js:
- "0.11"
- "0.10"
env:
- NODE_ENV=travis
services:
- mongodb
29 changes: 29 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM dockerfile/nodejs

MAINTAINER Matthias Luebken, [email protected]

WORKDIR /home/mean

# Install Mean.JS Prerequisites
RUN npm install -g grunt-cli
RUN npm install -g bower

# Install Mean.JS packages
ADD package.json /home/mean/package.json
RUN npm install

# Manually trigger bower. Why doesnt this work via npm install?
ADD .bowerrc /home/mean/.bowerrc
ADD bower.json /home/mean/bower.json
RUN bower install --config.interactive=false --allow-root

# Make everything available for start
ADD . /home/mean

# currently only works for development
ENV NODE_ENV development

# Port 3000 for server
# Port 35729 for livereload
EXPOSE 3000 35729
CMD ["grunt"]
174 changes: 174 additions & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
'use strict';

module.exports = function(grunt) {
// Unified Watch Object
var watchFiles = {
serverViews: ['app/views/**/*.*'],
serverJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'app/**/*.js'],
clientViews: ['public/modules/**/views/**/*.html'],
clientJS: ['public/js/*.js', 'public/modules/**/*.js'],
clientCSS: ['public/modules/**/*.css'],
mochaTests: ['app/tests/**/*.js']
};

// Project Configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
watch: {
serverViews: {
files: watchFiles.serverViews,
options: {
livereload: true
}
},
serverJS: {
files: watchFiles.serverJS,
tasks: ['jshint'],
options: {
livereload: true
}
},
clientViews: {
files: watchFiles.clientViews,
options: {
livereload: true,
}
},
clientJS: {
files: watchFiles.clientJS,
tasks: ['jshint'],
options: {
livereload: true
}
},
clientCSS: {
files: watchFiles.clientCSS,
tasks: ['csslint'],
options: {
livereload: true
}
}
},
jshint: {
all: {
src: watchFiles.clientJS.concat(watchFiles.serverJS),
options: {
jshintrc: true
}
}
},
csslint: {
options: {
csslintrc: '.csslintrc',
},
all: {
src: watchFiles.clientCSS
}
},
uglify: {
production: {
options: {
mangle: false
},
files: {
'public/dist/application.min.js': 'public/dist/application.js'
}
}
},
cssmin: {
combine: {
files: {
'public/dist/application.min.css': '<%= applicationCSSFiles %>'
}
}
},
nodemon: {
dev: {
script: 'server.js',
options: {
nodeArgs: ['--debug'],
ext: 'js,html',
watch: watchFiles.serverViews.concat(watchFiles.serverJS)
}
}
},
'node-inspector': {
custom: {
options: {
'web-port': 1337,
'web-host': 'localhost',
'debug-port': 5858,
'save-live-edit': true,
'no-preload': true,
'stack-trace-limit': 50,
'hidden': []
}
}
},
ngAnnotate: {
production: {
files: {
'public/dist/application.js': '<%= applicationJavaScriptFiles %>'
}
}
},
concurrent: {
default: ['nodemon', 'watch'],
debug: ['nodemon', 'watch', 'node-inspector'],
options: {
logConcurrentOutput: true,
limit: 10
}
},
env: {
test: {
NODE_ENV: 'test'
}
},
mochaTest: {
src: watchFiles.mochaTests,
options: {
reporter: 'spec',
require: 'server.js'
}
},
karma: {
unit: {
configFile: 'karma.conf.js'
}
}
});

// Load NPM tasks
require('load-grunt-tasks')(grunt);

// Making grunt default to force in order not to break the project.
grunt.option('force', true);

// A Task for loading the configuration object
grunt.task.registerTask('loadConfig', 'Task that loads the config into a grunt option.', function() {
var init = require('./config/init')();
var config = require('./config/config');

grunt.config.set('applicationJavaScriptFiles', config.assets.js);
grunt.config.set('applicationCSSFiles', config.assets.css);
});

// Default task(s).
grunt.registerTask('default', ['lint', 'concurrent:default']);

// Debug task.
grunt.registerTask('debug', ['lint', 'concurrent:debug']);

// Lint task(s).
grunt.registerTask('lint', ['jshint', 'csslint']);

// Build task(s).
grunt.registerTask('build', ['lint', 'loadConfig', 'ngAnnotate', 'uglify', 'cssmin']);

// Test task.
grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']);

// Heroku task.
grunt.registerTask('heroku:production', ['lint', 'loadConfig', 'ngmin', 'uglify', 'cssmin']);
};
21 changes: 0 additions & 21 deletions LICENSE
View file

This file was deleted.

Loading

0 comments on commit 592c1cc

Please sign in to comment.