Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-07 13:02:32 +02:00
Code Issues Packages Projects Releases Wiki Activity
974 Commits 4 Branches 0 Tags
346ebd6a67ca4ae588c8228b27a4baf32c1fadbe
Commit Graph

974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liran Tal
346ebd6a67 re-factoring the server model tests to create user model from schema only during tests, so that we can re-use mongodb's _v versioning fields, and also cleaning up user tests on each test iteration 2015-08-05 14:08:09 +03:00
Liran Tal
d0613cea79 Merge branch '0.4.0' 
Releasing MEAN.JS 0.4.0 version on-top of previously MEAN.JS 0.3.3 on master branch
 2015-08-03 18:30:03 +03:00
Liran Tal
c2c0c621b3 Merge pull request #737 from lirantal/feature/0.4.0_prepare_release 
Updating README with reference to new development branch
 2015-08-03 17:44:21 +03:00
Liran Tal
5bdd8f95f0 Merge pull request #750 from lirantal/bugfix/gitignore_jekyll_assets 
Gitignore for Jekyll assets
 2015-08-03 17:44:09 +03:00
Liran Tal
379f58e3b0 updating gitignore file to disregard the _site/ directory which gets created when using jekyll for generating the gh-pages documentation branch locally 2015-08-03 17:14:01 +03:00
Liran Tal
a66c3fe5a7 Merge pull request #744 from Gym/0.4.0 
BUG: Removed a ng-binding to article.content in user-list.client.view…
 2015-08-01 09:43:42 +03:00
Ryan Hutchison
2747df6310 BUG: Removed a ng-binding to article.content in user-list.client.view.html 2015-07-31 23:45:56 -04:00
Liran Tal
9c0068cf07 Merge pull request #706 from Gym/formatting-reboot 
formatting reboot (space-2 and consistency)
 2015-07-31 19:45:41 +03:00
Ryan Hutchison
ef3a3f9548 formatting reboot (space-2 and consistency) 
JSCS fixes

update editorconfig
 2015-07-31 10:04:02 -04:00
Liran Tal
f8750b3393 updating the new 0.4.1 dev branch for when 0.4.0 will actually be released 2015-07-30 23:20:31 +03:00
Liran Tal
7aaf363fc7 Merge pull request #736 from lirantal/feature/refactor-app-service 
Refactoring server application service
 2015-07-30 23:13:08 +03:00
Liran Tal
edb62344bc Refactoring server application service to enable modularity and callbacks, as well as provide app, db, config variables outside of server.js 2015-07-30 23:04:29 +03:00
Ilan Biala
b8b8d01008 Merge pull request #734 from codydaig/docs/040release 
Update generator references from readme and index
 2015-07-30 15:23:19 -04:00
Cody B. Daig
c539cdb281 Modify Generator Refrences/Docs 2015-07-29 23:48:24 -07:00
Ilan Biala
8104c98817 Merge pull request #733 from codydaig/enhancement/pull662 
Get site title from default environment config
 2015-07-29 12:29:29 -04:00
Cody B. Daig
40878bb076 Get site title from default 2015-07-29 08:43:56 -07:00
Ilan Biala
b7aebf35e1 Merge pull request #731 from simison/mkdir-uploads 
Add Grunt task to make sure uploads directory exists
 2015-07-29 11:34:02 -04:00
Mikael Korpela
eba4754ba1 Add Grunt task to make sure uploads directory exists 2015-07-29 16:40:36 +02:00
Ilan Biala
612a76cda6 Merge pull request #728 from cdriscol/angular_tests 
Add client side tests
Fixes #663
 2015-07-29 10:31:29 -04:00
Liran Tal
99a8168ff5 Merge pull request #487 from igorauad/0.4.0 
Enable redirection to previous page after login
 2015-07-29 17:02:16 +03:00
Liran Tal
3bc1de2543 Merge pull request #568 from floydpink/feature-fix-535 
Fix the Google OAuth Redirect Bug - #535
 2015-07-29 16:57:51 +03:00
Igor Freire
e6a35a7f9a Enable redirection to previous page after login 
Two different strategies are adopted, one for when the user authenticates locally and the other through providers. When authenticating locally, the signin function in the client controller redirects to the previous state (storing and using a state name) after successful login. When authenticating through a provider, the first call to provider stores the previous URL (not state, URL) in the session. Then, when provider actually calls the authentication callback, session redirect_to path is used for redirecting user.
 2015-07-29 10:55:47 -03:00
Liran Tal
09870db9ce Merge pull request #720 from vaucouleur/getErrorMessage 
Article middleware was calling getErrorMessage with a null argument
 2015-07-29 16:53:54 +03:00
cdriscol
d5ea5c99d2 Adding client test coverage. 2015-07-29 06:51:38 -06:00
Liran Tal
88b8f9e74a Merge pull request #713 from Gym/0.4.0 
BUG: fix non-admin user edit route.  Broke with admin feature
 2015-07-29 09:25:24 +03:00
Ilan Biala
6b3220ccd3 Merge pull request #729 from mleanos/angular-file-upload-static-dep 
Update angular-file-upload to use static dependency
Fixes #722, Fixes #724
 2015-07-28 22:02:40 -04:00
mleanos
a5bceb9c30 Updated angular-file-upload to use static dependency 
Setting angular-file-upload version in Bower.json to be static at 1.1.5
 2015-07-28 18:53:31 -07:00
Ryan Hutchison
4bbc4a30f6 add user route tests 2015-07-28 18:50:11 -04:00
Ryan Hutchison
839f805172 BUG: fix admin access (blocking user PUT) 2015-07-28 18:50:11 -04:00
Ilan Biala
460ef53aed Merge pull request #714 from cdriscol/fix_karma_errors_html2js 
Fix AngularJS templates not being loaded in tests
 2015-07-28 13:46:55 -04:00
Sebastien Vaucouleur
71167b0e75 The article middleware was calling getErrorMessage with a null argument, causing a crash when this method tried to access 'code' on an null parameter. 
The bug was not exposed by the original test, since it was mixing two (related) aspects:

* An invalid Id (a badly formed mongodb identifier)
* An non-existent Id (an identifier with no corresponding document in the database)

Modifications:

- Fixed the message property in the article controller (the error message follows the wording of the error message in "users.password.server.controller.js", in case of username not found)
- Added a new test to check modifications and avoid regressions
 2015-07-28 11:11:10 +02:00
Liran Tal
4f7aed0107 Merge pull request #707 from lirantal/feature/mongoose_debug_option 
Enabling mongoose debug mode
 2015-07-26 19:47:43 +03:00
cdriscol
c4685392cf Adding karma-ng-html2js-preprocessor to fix karma tests. Adding user mock to articles tests. 2015-07-26 10:21:49 -06:00
Ilan Biala
0faeb31496 Merge pull request #710 from mleanos/Chat-Missing-Auth-DI 
Add missing dependency injection in Chat
 2015-07-25 22:44:31 -04:00
mleanos
0fa9b9579a Added missing dependency injection in Chat 
During my last PR merge, the dependency injection for Authentication and
$location weren't merged properly. I added them back to the Chat client
controller.
 2015-07-25 16:05:48 -07:00
Liran Tal
e1ca1aa334 Merge pull request #676 from Gym/admin-feature 
Admin module
 2015-07-25 21:29:33 +03:00
Liran Tal
0bcadcc08e Enhancing support for development envionrment to enable mongoose debug mode so that we can debug db queries 
Includes support for environment variable MONGODB_DEBUG
 2015-07-25 21:23:20 +03:00
Liran Tal
d7f96227eb Merge pull request #685 from codydaig/pull664 
Move livereload, image, and favicon to config
 2015-07-25 11:35:47 +03:00
Liran Tal
0c76179fa0 Merge pull request #701 from mleanos/socket-connect 
Socket IO client enhancement with connect() method
 2015-07-25 11:33:55 +03:00
Liran Tal
7c5b311216 Merge pull request #698 from simison/patch-11 
Putting the head in order
 2015-07-25 11:15:19 +03:00
Liran Tal
7d7d07671e Merge pull request #703 from lirantal/bugfix/config_chalk_console_log_order 
fixing chalk and console usage for consistency reasons
 2015-07-25 11:13:08 +03:00
mleanos
65c6d1ffe0 Socket IO client enhancement with connect() method 
Updated the Socket client service, with a connect() method. Moved state
redirect out of from Socket service.  Added the Authentication.user
check to the Chat client controller, and added a check to make sure the
Socket client service is connected to the server; if not, then connect
using the new connect() method.

Had to do a hard reset from 0.4.0 due to conflicts when merging and
pushing to remote.
 2015-07-25 00:36:01 -07:00
Ryan Hutchison
60660204ac Admin module base & user admin implementation. 
update displayName

implements #700 (client-side role security) on angular routes.
 2015-07-24 20:03:35 -04:00
Mikael Korpela
28027290b5 Putting the head in order 
- Moving a few meta tags+base tag before title. I've noticed Bootstrap [recommends this](http://getbootstrap.com/getting-started/#template) (wasn't sure why) so I did some quick googling and [IE seems to be the reason](http://blogs.msdn.com/b/ieinternals/archive/2011/07/18/optimal-html-head-ordering-to-avoid-parser-restarts-redownloads-and-improve-performance.aspx) but there some other speculations too. Feel free to search more.

- ...in any case, [charset tag should come before the title](http://www.w3.org/wiki/The_HTML_head_element#Stop_right_there.21_Inline_CSS_and_JavaScript_is_not_too_clever.21).

- Removing keyword tag since it [isn't really used anymore](https://chrisedwards.me/seo/keyword-meta-tag-google/).

- Removing duplicate Content-type/Encoding tag

- Remove IE shim
 2015-07-25 02:47:17 +03:00
mleanos
0a7a715817 Moved all editor setting to bottom 
I moved all the editor files underneath all the other settings. As the
editor list grows, it will help keep things organized, and editor
configs are less pertinent to individual developers.
 2015-07-25 02:47:17 +03:00
mleanos
6c2c77cb75 Added Visual Studio files to gitignore 
Adding files to ignore that are related to Visual Studio, and Node.js
development within the VS environment.
 2015-07-25 02:47:17 +03:00
Liran Tal
411765bb26 fixing chalk and console usage for consistency reasons 2015-07-25 01:57:17 +03:00
Liran Tal
c8880ea65d Merge pull request #700 from trainerbill/requireLogin 
Require login
 2015-07-25 01:18:33 +03:00
Andrew Throener
1b54d35305 Final Clean Up after code review 2015-07-24 17:06:55 -05:00
Liran Tal
0e3f194d13 Merge pull request #699 from lirantal/bugfix/unused-variable 
Removing unused passport variable in express.js library file
 2015-07-25 01:06:28 +03:00