Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-19 12:31:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
861 Commits 4 Branches 0 Tags
39e428244573241dde5b35e4e7cb5b579849459f
Commit Graph

861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liran Tal
39e4282445 updating README file with more elaborate instructions on running grunt in different environment modes (dev/prod/secure ssl) 
updating title for the SSL section and added information about the port number in secure environment mode
 2015-07-12 19:15:08 +03:00
Liran Tal
9e8ee9ea13 Merge branch 'Robaum-0.4.0' into 0.4.0 2015-07-11 01:00:12 +03:00
Liran Tal
6bb5b8cfd5 Merge branch '0.4.0' of https://github.com/Robaum/mean into Robaum-0.4.0 
Conflicts:
	README.md
	config/env/development.js
	config/env/test.js
 2015-07-11 00:59:35 +03:00
Ilan Biala
cff3efe5b3 Merge pull request #637 from Gym/0.4.0 
formatting: indent
 2015-07-10 13:07:31 -04:00
Ryan Hutchison
b8d6fa7e24 formatting: indent 2015-07-10 07:21:47 -04:00
Liran Tal
e8c79e4a0b Merge pull request #634 from Gym/0.4.0 
[Bug]: Remove social account.
 2015-07-10 09:24:14 +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
Ryan Hutchison
16aa646673 Merge branch '0.4.0' of github.com:meanjs/mean into 0.4.0 2015-07-09 14:10:01 -04:00
Ryan Hutchison
d0bb4a3cd3 duplicate controller. This was moved under settings/ 2015-07-09 14:04:16 -04:00
Ryan Hutchison
b18a7dda99 bug: remove social account. 2015-07-09 13:49:48 -04:00
Ilan Biala
ade074cf37 Merge pull request #599 from loulin/0.4.0 
Add return for done(err) in test
 2015-07-09 13:32:27 -04:00
Ryan Hutchison
9e19493f50 Remove unused scope declarations. 2015-07-09 13:10:39 -04:00
Liran Tal
11b37f25a5 Merge pull request #633 from Gym/package-formatting 
Update package.json to indent space-2.
 2015-07-09 19:31:56 +03:00
Liran Tal
8aa9dfaa2a Merge pull request #632 from danaronoff/0.4.0 
Remove duplicate assets definition
 2015-07-09 19:28:50 +03:00
Ryan Hutchison
f345d20c3e Update package.json to indent space-2. 2015-07-08 19:51:54 -04:00
Daniel Aronoff
50937ea5de Remove duplicate assets definition 2015-07-08 19:43:20 -04:00
Liran Tal
c2bcfa3acd Merge pull request #616 from meanjs/master_to_0.4.0 
Master to 0.4.0
 2015-07-08 21:13:58 +03:00
Liran Tal
99e0ea8b06 Merge pull request #622 from Gym/0.4.0 
update dependencies
 2015-07-08 20:20:15 +03:00
Ryan Hutchison
b6818b63d3 fix btn-large class names. 2015-07-07 20:32:24 -04:00
Ryan Hutchison
67e38aec01 fix failing tests 2015-07-07 10:22:21 -04:00
Ryan Hutchison
9ca71c8cde remove href attribute. 2015-07-07 08:18:47 -04:00
Ryan Hutchison
73b5fa3df0 Revert "load bootstrap (doh)" 
This reverts commit 7d8cea159b.
 2015-07-07 08:18:38 -04:00
Ilan Biala
21590940ae Merge pull request #621 from simison/patch-10 
Sort out gitignore
 2015-07-06 15:24:25 -04:00
Liran Tal
96f8ab5289 keeping nodejs versions 0.10 and 0.12 as the test servers for travis configuration 2015-07-06 21:09:58 +03:00
Ryan Hutchison
73be7943b1 package.json will always use 2 spaces indent 2015-07-05 19:01:54 -04:00
Ryan Hutchison
00a4668c2a update javascript libs 2015-07-05 17:51:19 -04:00
Ryan Hutchison
30c916030e setup dropdown menu 2015-07-05 17:51:04 -04:00
Ryan Hutchison
7d8cea159b load bootstrap (doh) 2015-07-05 17:50:41 -04:00
Ryan Hutchison
d4c880b89c update dependencies 2015-07-05 16:15:06 -04:00
Mikael Korpela
75aad2e0ba Sorting out .gitignore 
- remove access.log (*.log is enough)
- Move local.js config under MEAN.JS
- Rename iOS/Apple => OS (this is a mix of windows/osx stuff anyways)
 2015-07-05 23:09:53 +03:00
Liran Tal
d5b22e35c4 addressing missing newlines and node 0.12 version for travis-ci 2015-07-05 01:12:54 +03:00
Liran Tal
2be8f71199 support for test:server and test:client grunt tasks which were removed from the merge of 0.4.0 into master 2015-07-04 01:42:11 +03:00
Liran Tal
52fe443429 fixing err object which isnt present in this check, replacing it with a text message 2015-07-03 10:48:06 +03:00
Liran Tal
834bfd6cf8 removing left-overs of merge diff from 0.4 to master 2015-07-03 07:51:08 +03:00
Roberto
08b2f746d6 Fig changed to Compose 2015-07-02 08:03:46 -05:00
Liran Tal
b76c2cd13b updating 0.4.0 merged branch to support the declerative db connection object instead of just a connection string 2015-07-02 12:29:09 +03:00
Liran Tal
67e96a4f22 0.4.0 branch merged into master 2015-07-02 12:08:09 +03:00
loulin
d00f4ce0cc should return done(err) in article server route test 2015-06-30 11:15:52 +08:00
Liran Tal
6003085e89 Merge pull request #586 from cdriscol/remove-target-on-signin 
Remove targets on signin and signup anchors
 2015-06-09 07:58:47 +03:00
cdriscol
2a3516e2a6 Removing target on signin and signup anchors to prevent a complete page reload when changing to those states. 2015-06-03 21:44:40 -06:00
Ilan Biala
b1d95e0a34 Merge pull request #582 from simison/patch-9 
Fix deprecated ExpressJS req.param('provider')
 2015-06-03 19:41:35 -04:00
Ilan Biala
cd5db4ad4d Merge pull request #575 from pgrodrigues/0.4.0 
Abstract the local strategy login error to thwart hackers
 2015-06-03 19:39:19 -04:00
Mikael Korpela
10d35d1df9 Fix deprecated ExpressJS req.param('provider') 
>"Deprecated. Use either req.params, req.body or req.query, as applicable."
http://expressjs.com/api.html#req.param
 2015-06-02 15:36:56 +03:00
Liran Tal
716925b29f Merge pull request #579 from lirantal/0.4.0-backport-local-config-feature-553 
porting pull request from master to 0.4.0 branch: Local environment ariables to address issue #553 #557
 2015-06-01 10:53:55 +03:00
Ilan Biala
801ba33d98 Merge pull request #576 from simison/patch-8 
Remove unused hasAuthorization and requiresLogin
 2015-05-31 18:12:22 -03:00
Liran Tal
1ea9f55600 porting pull request from master to 0.4.0 branch: Local environment variables to address issue #553 #557 2015-05-31 11:54:17 +03:00
Mikael Korpela
fcb6f90293 Remove un-used hasAuthorization and requiresLogin 
Looks like these aren't needed now that we have ACL.
 2015-05-29 00:36:07 +03:00
Pedro Rodrigues
e11ffda6e5 Add some abstraction to local strategy login error 2015-05-28 16:56:49 +01:00
Ilan Biala
3ea400f354 Merge pull request #548 from jloveland/generate-sslcerts 
Add SSL support back into 0.4.0
 2015-05-28 06:42:23 -04:00