Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-03-05 11:41:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,954 Commits 4 Branches 0 Tags
37899b2ef2fe77df5f0fef2df875975089bb83d6
Commit Graph

1954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Liran Tal
2ff24903c6 removing unused passport variable in express.js library file 2015-07-25 00:26:05 +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
e3405d2f2b Merge pull request #683 from mleanos/gitignore_VS 
Added Visual Studio files to gitignore
Rearranged gitignore to prioritize general files over editor files
 2015-07-24 10:14:10 -04: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
Ilan Biala
3a39f0a88b Merge pull request #666 from Gym/task-enhancements 
Grunt and Gulp task enhancements
 2015-07-24 10:12:11 -04:00
Liran Tal
0369db4cc2 Merge pull request #691 from lirantal/feature/missing_ssl_better_log 
Enhancing SSL error message
 2015-07-24 11:11:19 +03:00
Liran Tal
315187e021 enhancing error message with an actual instruction on how to fix the missing ssl problem when running in prod mode and secured enabled 2015-07-24 10:03:14 +03:00
Liran Tal
a62f25e66d Merge pull request #684 from lirantal/feature/users_tests_email_unique 
Enhancing users model tests
 2015-07-24 09:47:35 +03:00
Liran Tal
ac35f0fec8 adding couple more tests to confirm users model works as expected 2015-07-24 09:38:49 +03:00
mleanos
c7ec27ee03 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-23 22:51:36 -07: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
mleanos
c3380bf74f 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-22 16:21:16 -07:00
Ilan Biala
29d264dff7 Merge pull request #682 from codydaig/patch-2 
Switch TravisCI and DavidDM to 0.4.0 branch
 2015-07-22 17:00:30 -04:00
Cody B. Daig
a7e065e626 Added Master and Dev Badges to README 2015-07-22 12:39:59 -07:00