Commit Graph

480 Commits

Author SHA1 Message Date
Charles Packer
666abdefbd Added newlines 2014-05-22 21:19:58 -07:00
Charles Packer
c5e4c16296 Removed test case files from other pull request 2014-05-22 21:08:25 -07:00
Charles Packer
58cfb2e515 Implemented password reset core feature 2014-05-22 21:02:36 -07:00
Charles Packer
2aebecaa40 Added user test file 2014-05-19 15:39:58 -07:00
Amos Haviv
95037207f8 Fixing some typos 2014-05-09 20:20:59 +03:00
Amos Haviv
4930d8120e Merge pull request #57 from netusco/master
Wrong property on removeMenuItem
2014-05-09 20:12:31 +03:00
netusco
fca7e9ed6e fixing removeMenuItem on menu service
Object menus had an unknown property menuItem that corresponded to link property (see addMenuItem).
2014-05-09 13:22:48 +02:00
Amos Haviv
0e7ebb6da8 Fixing OAuth authentication 2014-05-08 00:14:59 +03:00
Amos Haviv
a180daeace Merge pull request #47 from darksniper87/master
Update init.js
2014-05-05 14:36:11 +03:00
darksniper87
bcbf2af07f Update init.js
Just fixing some grammatical errors
2014-05-05 11:21:31 +03:00
Amos Haviv
5a2eb6e779 Fixing grunt build task 2014-05-04 23:12:27 +03:00
Amos Haviv
9246d301c4 Merge branch '0.3.0' 2014-05-04 22:46:52 +03:00
Amos Haviv
51b2f31259 Updating Credits 2014-05-04 15:14:44 +03:00
Amos Haviv
9420d93118 Merge branch 'pr/46' into 0.3.0 2014-05-04 14:41:01 +03:00
Michael Cole
b8340cb6b3 Fixes #45 - Npm install error on 3.0 2014-05-03 12:30:58 -05:00
Amos Haviv
38f08ff6c3 Fixing articles 2014-05-02 19:16:18 +03:00
Amos Haviv
0b3dead3f0 Clean up article example 2014-05-02 18:50:09 +03:00
Amos Haviv
31a193196f Fix swig templates 2014-05-02 18:41:52 +03:00
Amos Haviv
1c7ae6ecb5 Configuring Extensions 2014-05-02 18:28:24 +03:00
Amos Haviv
14c3ce7cc9 Fix Config 2014-04-28 22:04:44 +03:00
Amos Haviv
27dfdfe622 Delete unused travis file 2014-04-28 21:46:26 +03:00
Amos Haviv
90d412a8ed Merge pull request #37 from sahat/patch-1
Thank you @sahat
2014-04-28 21:07:25 +03:00
Amos Haviv
7c0078cdaa Fix Karma and Menus 2014-04-28 20:52:29 +03:00
Sahat Yalkabov
30cd5209da SVG Badges 2014-04-27 21:59:45 -04:00
Amos Haviv
14f5d06d4f Fixed asset management structure 2014-04-27 21:51:42 +03:00
Amos Haviv
c91a3301bf Clean up 2014-04-26 20:44:37 +03:00
Amos Haviv
5ff49a7115 Fixing article and express 4 modification 2014-04-26 15:33:53 +03:00
Amos Haviv
36acc484bd Fixing roles security issues 2014-04-26 15:17:31 +03:00
Amos Haviv
8cccae2d40 Support CDN Assets 2014-04-25 05:51:30 +03:00
Amos Haviv
56fd75ebad Updating To Helmet 2014-04-23 22:04:52 +03:00
Amos Haviv
81254e0b27 Fixing Karma To Load Libraries Independently 2014-04-23 20:44:19 +03:00
Amos Haviv
c7a14f8386 Merge branch 'pr/24' into 0.3.0
Conflicts:
	config/env/all.js
	config/express.js
	package.json
2014-04-23 19:53:59 +03:00
Amos Haviv
f132e1084f Fixing Articles Issues 2014-04-23 03:57:09 +03:00
Amos Haviv
430e66b207 Fix intdentation 2014-04-22 21:18:35 +03:00
Amos Haviv
7c796f12b7 Merge branch 'pr/29' into 0.3.0 2014-04-22 21:17:16 +03:00
Kentaro
e585231ab5 add missing dependencies
The packages connect-mongo and connect-flash are missing in the package.json
2014-04-22 13:23:20 +02:00
Amos Haviv
5eed915dd6 Added role based middleware authorisation 2014-04-21 22:52:34 +03:00
Amos Haviv
edd549db8c More Naming Fixes, articles cleanup 2014-04-21 02:32:59 +03:00
Amos Haviv
8ad4728140 Comment Fixes 2014-04-21 01:13:14 +03:00
Amos Haviv
779295793d Merge branch 'pr/18' into 0.3.0
Conflicts:
	app/routes/core.server.routes.js
	config/express.js
	package.json
2014-04-21 01:07:05 +03:00
Amos Haviv
44bf81a494 0.3RC
Express 4 Support
New naming convention
Glob patterns
CSS Linting
Uglify
CSS Min
Environmental Asset Management
DI Menu System
2014-04-21 00:01:01 +03:00
Amos Haviv
09f1eab636 Adding the salt part to the hashPassword FN 2014-04-16 12:53:22 +03:00
Amos Haviv
a976eb993e Merge branch 'pr/25' 2014-04-16 12:51:23 +03:00
Kentaro Wakayama
8f09b8b776 Add check of password and salt in user auth 2014-04-16 09:51:31 +02:00
David Morris
ff4ae8bacc workaround for express 4 connectMongo session bug 2014-04-15 23:15:35 -05:00
David Morris
114ce6af0c merge upstream 0.2.3 2014-04-15 20:18:27 -05:00
Amos Haviv
c6a8a9babd Merge branch '0.2.3' 2014-04-16 02:47:43 +03:00
Amos Haviv
ac3ffca366 Adding Accounts View 2014-04-16 02:45:26 +03:00
Amos Haviv
7ae98d5e21 Adding Comments 2014-04-16 02:44:55 +03:00
Amos Haviv
279eb39694 Finalizing the User Accounts Module 2014-04-16 02:00:23 +03:00