summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into developmentHEADorigin/developmentorigin/HEADdevelopmentsv2442015-08-150-0/+0
|\
| * Merge branch 'hotfix/0.3.8-3' into 'master'sv2442015-08-1522-196/+336
| |\
* | \ Merge branch 'hotfix/0.3.8-3' into 'development'sv2442015-08-1522-196/+336
|\ \ \ | | |/ | |/|
| * | BUmp to 0.3.8-3WallyDZ2015-08-151-2/+2
| * | redo: color subs dropdown in player #1526watdafox2015-08-151-2/+2
| * | Revert "color subs dropdown in player #1526"watdafox2015-08-151-5/+3
| * | Add Cancel in case Chromecast timeoutwallydz2015-08-141-1/+1
| * | Merge branch 'hotfix/0.3.8-3' into 'hotfix/0.3.8-3'watdafox2015-08-141-3/+3
| |\ \
| | * | Fix free space check for all localesPerfectSlayer2015-08-131-3/+3
| |/ /
| * | update copyright year and correct type (GLV, lol)watdafox2015-08-111-1/+1
| * | change tvshowAPI to tvAPI #1566watdafox2015-08-115-19/+19
| * | add quality parser to Common.matchTorrent()watdafox2015-08-102-3/+34
| * | that wasn't planned - Revert "change default sorter to Trending"watdafox2015-08-091-2/+2
| * | oops, this is better to handle errorswatdafox2015-08-091-1/+1
| * | include the error stack in reporterwatdafox2015-08-091-1/+1
| * | change default sorter to Trendingwatdafox2015-08-081-2/+2
| * | jshint && jsbeautifierwatdafox2015-08-088-93/+86
| * | color subs dropdown in player #1526watdafox2015-08-081-4/+6
| * | Check free space on Windwos even in non-latin (#1356)watdafox2015-08-081-11/+7
| * | trakt httpswatdafox2015-08-081-1/+1
| * | fix 'q' keyboard shortcut for episode quality (#723)watdafox2015-08-081-14/+24
| * | Merge branch 'idea/https' into 'hotfix/0.3.8-3' watdafox2015-08-057-130/+215
| |\ \
| | * \ Merge branch 'hotfix/0.3.8-3' into idea/httpswatdafox2015-08-0410-13/+44
| | |\ \
| | * | | remove commentswatdafox2015-08-041-23/+0
| | * | | done with tvapiwatdafox2015-08-044-59/+106
| | * | | tv show start workwatdafox2015-08-044-35/+68
| | * | | proof of conceptwatdafox2015-08-042-19/+47
| | | |/ | | |/|
| * | | fix 3rd party themeswatdafox2015-08-041-12/+6
| | |/ | |/|
| * | Merge branch 'feature/sanitize-api-input' into 'hotfix/0.3.8-3' watdafox2015-08-0410-13/+44
| |\ \ | | |/ | |/|
| | * remove sanitize when unnecessarywatdafox2015-08-042-2/+2
| | * Sanitize API responseswatdafox2015-08-0410-15/+17
| | * Merge branch 'development' into feature/sanitize-api-inputwatdafox2015-08-0423-101/+161
| | |\ | |_|/ |/| |
* | | Merge branch 'master' into developmentphnz2015-08-031-1/+1
|\ \ \ | |/ /
| * | Bump to 0.3.8-2v0.3.8-2phnz2015-08-031-1/+1
| * | Merge branch 'development'phnz2015-08-0325-168/+417
| |\ \ | |/ / |/| |
* | | Merge branch 'hotfix/0.3.8-2' into 'development' phnz2015-08-0323-100/+160
|\ \ \
| * | | Remains of sam's branchwatdafox2015-08-031-1/+0
| * | | Add windows 10 themes to "third party"watdafox2015-08-031-0/+0
| * | | switch tvapi to httpswatdafox2015-08-031-3/+3
| * | | update opensubtitles-api #1428watdafox2015-08-031-1/+1
| * | | add missing subtitle sizeswatdafox2015-08-021-1/+1
| * | | remove unnecessary i18nwatdafox2015-08-011-2/+2
| * | | correctly check free space on windows (#1356)watdafox2015-08-011-4/+11
| * | | correctly display chosen theme if 3rd party (#1463)watdafox2015-08-011-1/+1
| * | | grunt task mods for 3rd party themeswatdafox2015-08-011-2/+2
| * | | prevent #1451 TypeErrorwatdafox2015-08-012-9/+9
| * | | fix 3rd party themeswatdafox2015-08-011-0/+9
| * | | ugly fix for anime being misreported to trakt (#1417)watdafox2015-08-011-0/+18
| * | | update themes submodulewatdafox2015-08-011-0/+0
| * | | update to torrent-tracker-healthwatdafox2015-08-012-3/+3
| * | | jsbeautifierwatdafox2015-07-303-30/+30
| * | | jshintwatdafox2015-07-302-2/+3
| * | | update package.json (kat-api, admzip)watdafox2015-07-301-2/+2
| * | | fix #1444 #1445watdafox2015-07-303-5/+9
| * | | Update opensubtitles-apiWallyDZ2015-07-291-1/+1
| * | | Using Npm for upnp-mediarenderer-clientWallyDZ2015-07-291-2/+2
| * | | Merge branch 'development' into hotfix/0.3.8-2watdafox2015-07-283-119/+278
| |\ \ \
| * | | | opensubtitles-api updatewatdafox2015-07-252-2/+2
| * | | | extended parsing for external torrents with a faulty filenamewatdafox2015-07-241-0/+20
| * | | | fix rare cases where regex (external torrent) matches wrongwatdafox2015-07-221-0/+3
| * | | | prevent repeating letters or space in bug reports.watdafox2015-07-211-2/+2
| * | | | prevent duplicate bug reports (#1310 #1311)watdafox2015-07-211-0/+6
| * | | | fix icon disappearing on macwatdafox2015-07-203-3/+0
| * | | | regex on external torrent improvwatdafox2015-07-191-0/+7
| * | | | Less trackersWallyDZ2015-07-191-7/+1
| * | | | add ukrainian localization #980watdafox2015-07-181-1/+1
| * | | | Merge branch 'hotfix/0.3.8-2' of https://git.popcorntime.io/popcorntime/deskt...watdafox2015-07-181-2/+14
| |\ \ \ \
| | * | | | Add More Trackers to streamerWallyDZ2015-07-181-2/+14
| * | | | | fix #909watdafox2015-07-181-0/+3
| |/ / / /
| * | | | kill anonymous reporter due to the spamming of dupes in gitlabwatdafox2015-07-173-7/+9
| * | | | fix linux install script #735watdafox2015-07-171-1/+1
| * | | | fix TV Series that can't be openedwatdafox2015-07-171-31/+37
| * | | | fix error 'id of undefined' (players)watdafox2015-07-171-1/+1
| * | | | fix for PlayNext making the UI always visiblewatdafox2015-07-171-3/+5
| | | | * Revert "Add sanitizer"watdafox2015-08-044-36/+26
| | | | * Common.sanitize handles undefinedwatdafox2015-08-041-4/+4
| | | | * update Common.sanitize for efficiencywatdafox2015-08-041-17/+21
| | | | * recursive function for sanitizerwatdafox2015-08-041-1/+26
| | | | * Add sanitizersv2442015-08-034-26/+36
| |_|_|/ |/| | |
* | | | Update BadgeWallyDZ2015-08-021-2/+2
* | | | Merge branch 'master' into developmentsv2442015-07-300-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | opensubtitles-api updatewatdafox2015-07-252-2/+2
| |/
* | Merge branch 'feature/Common.matchTorrent' into 'development'sammuel862015-07-282-85/+273
|\ \
| * | implement Common.matchTorrent in streamerwatdafox2015-07-282-86/+43
| * | finishing Common.matchTorrentwatdafox2015-07-281-24/+5
| * | Common.matchTorrentwatdafox2015-07-281-0/+250
|/ /
* | opensubtitles-api updatewatdafox2015-07-252-2/+2
* | Merge branch 'master' into developmentsv2442015-07-203-8/+7
|\ \ | |/
| * Merge branch 'hotfix/updater'v0.3.8-1phnz2015-07-173-8/+7
| |\
| | * Bump hotfix to 0.3.8-1phnz2015-07-171-1/+1
| | * Change default update endpointphnz2015-07-171-3/+3
| | * Fix updater endpoint for fallbackphnz2015-07-171-4/+3
| |/
* | Merge branch 'hotfix/blackyellowtheme-vars' into 'development'sammuel862015-07-121-5/+6
|\ \ | |/ |/|
| * Change colors to variablesv2442015-07-101-5/+6
|/
* update CHANGELOG.mdwatdafox2015-07-091-1/+1
* Update to update3v0.3.8-0WallyDZ2015-07-091-2/+2
* fallback + jshint + jsbeautifierwatdafox2015-07-095-37/+41
* Lang Updatewallydz2015-07-091-0/+0
* fix conflictwatdafox2015-07-091-4/+0
* Merge branch 'nw12'watdafox2015-07-09156-21041/+24360
|\