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
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
Andrew Throener
8694b7e976 PayPal Authentication 2015-07-02 07:44:58 -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
Hari Menon
7c015e27ad Correct the issue of Google OAuth2 redirect missing the hashbang after enabling GooglePlus API - Fixes #535 2015-05-19 23:24:48 -04:00
Mikael Korpela
7070796c53 Prettier res.status().format() 
(due tabs — my editor has tab-spacing set to 2 so I don’t notice when
stuff like this looks crappy)
 2015-05-18 19:25:02 +03:00
Mikael Korpela
fd170261ec #501 Use req.format() to content-negotiate correct response 2015-05-18 19:22:56 +03:00
Mikael Korpela
ba1a4475e9 #501 Handle 404 errors at Express backend at at Angular frontend 
- `/{api|modules|lib}/*` returns error page when path doesn’t exist
(from Express).
- `/*` always returns index (from Express), but if `$state` doesn’t
exist, Angular redirects to `/not-found` (no 404 status in that case
though!)
- If `Accept: application/json` header is present without `Accept:
text/html`, return error as json. Hence looking at non existing /api/*
paths with browser would show html error, but querying them with script
would return json.
- Slightly prettier 404 error

Test:
```bash
curl http://localhost:3000/api/notfound -4 -H "Accept: application/json"
```
=> json error.

```bash
curl http://localhost:3000/api/notfound -4 -H "Accept:
text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0
.8"
```
=> html error (imitates Chrome’s Accept header).

Starting point was @dotch’s PL: https://github.com/meanjs/mean/pull/503

And `req.accepts()` idea came from http://stackoverflow.com/a/9802006
 2015-05-18 17:38:30 +03:00
Mikael Korpela
8190ee44a7 Merge branch 'bugfix/404/#501' of https://github.com/dotch/mean-1 into error-404-pages 2015-05-18 10:45:11 +03:00
Ilan Biala
f24ce6550e Ignore ALL .log files at gitignore 
Closes #523
 2015-05-17 23:19:05 -04:00
Ilan Biala
556497913d Merge pull request #565 from simison/patch-7 
Add fonts and svgs to gzip compression pattern
 2015-05-17 11:05:45 -04:00
Ilan Biala
6fddcf4d04 Merge pull request #549 from vepasto/patch-5 
Hide email address when reseting password
 2015-05-17 11:03:56 -04:00
Mikael Korpela
fea436f815 Add fonts and svgs to gzip compression pattern 
I think it's good to have these here "just in case", even the seed project wouldn't have any fonts/svgs. These are just so common filetypes at any project.

Thoughts?
 2015-05-16 14:10:14 +03:00
Liran Tal
88a89f2e7d Merge pull request #557 from lirantal/feature-553-local-config 
Local environment variables to address issue #553
 2015-05-14 07:50:54 +03:00
Liran Tal
dce17e9fae creating a local.example.js as a sample file to extend configuration to local repository without committing these changes and also replacing .extend() with .merge() for local repository changes 2015-05-14 00:16:08 +03:00
Liran Tal
aca6a793e9 adding a grunt-contrib-copy dev dependency to create a local copy of local.js file and then updating config.js to include it and gruntfile.js to run it in all common tasks 2015-05-13 11:29:51 +03:00
Liran Tal
0fc412d428 restoring previous state of removing local.js, we'll generate it with grunt when the project starts-up 2015-05-13 10:47:00 +03:00