Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-02-03 04:59:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,000 Commits 4 Branches 0 Tags
ea97f2e7d83281a5bf34cb294ce9f1483135dbf2
Commit Graph

95 Commits

Author SHA1 Message Date
Liran Tal
609d95824d Merge pull request #771 from lirantal/bugfix/fix_user_module_async_tests 
Fixing user model test's last test which fail or report a false positive
 2015-08-13 13:42:19 +03:00
Liran Tal
0be1b11a20 Merge pull request #781 from codydaig/bug/listArticlesAuth 
Allow Guests to view Articles
 2015-08-12 19:21:29 +03:00
Ryan Hutchison
cb9d7e3db6 fix indentation 2015-08-11 01:01:12 -04:00
Cody B. Daig
cbebed9188 Allow Guests to view Articles 2015-08-08 18:40:59 -07:00
Liran Tal
463f5b944f fixing up a user model test which was not setup correctly without the async done() callback, which led to false postivies. Adding timeouts to the test ensures that the test completes in time, otherwise mocha's 2s timeout will fail the test 2015-08-08 00:42:11 +03:00
Liran Tal
c967a98562 refactoring the async nature in the user model tests to account for mocha 2 second timeouts causing travis-ci build fails 2015-08-06 16:49:50 +03:00
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
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
Ryan Hutchison
ef3a3f9548 formatting reboot (space-2 and consistency) 
JSCS fixes

update editorconfig
 2015-07-31 10:04:02 -04:00
Cody B. Daig
c539cdb281 Modify Generator Refrences/Docs 2015-07-29 23:48:24 -07: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
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
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
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
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
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
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
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
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
c671f65c47 Merge pull request #693 from lirantal/feature/clean_angular_hashbang_urls 
Feature/clean angular hashbang urls
 2015-07-25 01:06:03 +03:00
Andrew Throener
03a4042a33 Updated routes and a logic fix 2015-07-24 16:43:46 -05:00
Liran Tal
de3b890f9d removed /#! in user controllers 
Resolved 0.4.0 related conflicts:
	modules/users/server/controllers/users/users.authentication.server.controller.js
 2015-07-25 00:39:28 +03:00
Andrew Throener
fb71619e0c Refactor 2015-07-24 15:37:26 -05:00
Igor Freire
e21805f20a Prepare for role-based access control of states 2015-07-24 16:59:13 -03:00
Igor Freire
9fc88e6e5b Filter states for which login is required during state change 
A state parameter was added for the routes that require user authentication. Now, everytime a statechange occurs, the destination state is checked and user is redirected to signin page if necessary. Note the state parameter is added within `data`, so that nested states can inherent its value.
 2015-07-24 16:17:14 -03:00
Ilan Biala
8a81cf0168 Merge pull request #688 from codydaig/bugfix/github_undefined_displayname 
If displayName in GitHub is undefined use username
Fixes #519
 2015-07-24 10:13:26 -04:00
Liran Tal
ac35f0fec8 adding couple more tests to confirm users model works as expected 2015-07-24 09:38:49 +03:00
Cody B. Daig
a62c4dd16d Move livereload, image, and favicon to config 2015-07-23 20:05:34 -07:00
Cody B. Daig
7605956c99 displayName undefined 2015-07-23 17:00:22 -07:00
Liran Tal
00a4c0603a Merge pull request #566 from simison/error-404-pages 
#501 Handle 404 errors at Express backend and at Angular frontend
 2015-07-20 22:25:33 +03:00
Liran Tal
82d2377754 Merge pull request #439 from igorauad/uniqueEmail 
Make emails unique
 2015-07-20 22:12:51 +03:00
Igor Freire
0efc82db0f Fix message catching the field for which a duplicate key error ocurred 2015-07-20 14:39:44 -03:00
Cody B. Daig
a8dae99173 Remove console.log from an article test 2015-07-20 10:04:45 -07:00
cdriscol
9e7239baf7 appending a base tag to the head before jasmine tests run. 2015-07-19 22:24:39 -06:00
Igor Freire
5d4d7cecfe Make emails unique 
Emails are made unique. When user attempts to sign in through a provider in which his email is one that is already registered, user is redirected to the signin page with an error passed as a query string parameter.
 2015-07-17 14:52:27 -03:00
git-admin
a23290b46e Use validator.js for email validation 2015-07-17 09:27:16 +02:00
trainerbill
a98a84fd20 Fix merge conflicts 2015-07-14 15:46:23 -05: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
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
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