summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed debug messHEADorigin/devorigin/HEADdevakuma062017-05-221-2/+0
* Fix #679akuma062017-05-223-32/+35
* Fix 2akuma062017-05-222-4/+5
* Fixakuma062017-05-221-3/+3
* Fixing routes URLakuma062017-05-222-3/+3
* Update Japanese translations (#677)MMP02017-05-221-3/+79
* Update th-th.all.json (#675)sisimouto2017-05-221-1/+61
* Fixakuma062017-05-221-2/+2
* Merge pull request #674 from ElegantMonkey/user-rss-buttonakuma062017-05-221-0/+1
|\
| * Add RSS button to user profileElegantMonkey2017-05-211-0/+1
* | Merge pull request #673 from NyaaPantsu/user-setttings-notificationakuma062017-05-2217-167/+520
|\ \ | |/ |/|
| * Finishedakuma062017-05-2213-29/+313
| * wiiiipakuma062017-05-218-25/+27
| * Wiiiiiipakuma062017-05-218-130/+132
| * User Settings Notification (WIP)akuma062017-05-216-40/+105
* | Merge pull request #672 from Myrmece/patch-4akuma062017-05-211-0/+4
|\ \
| * | Updated translation.Myrmece2017-05-211-0/+4
| |/
* | Merge pull request #671 from steindornatorinn/devakuma062017-05-212-18/+45
|\ \ | |/ |/|
| * Fixed itbragason2017-05-212-2/+2
| * fixed indentationbragason2017-05-211-20/+20
| * Merge branch 'dev' of https://github.com/NyaaPantsu/nyaa into devbragason2017-05-216-31/+119
| |\ | |/ |/|
* | Update index.htmlakuma062017-05-211-6/+6
* | Merge pull request #670 from sfan5/filesizeakuma062017-05-215-25/+113
|\ \
| * | Update German translationsfan52017-05-211-6/+102
| * | Format unknown filesizes in a better waysfan52017-05-214-19/+11
| | * Update style.cssakuma062017-05-211-3/+0
| | * Merge branch 'dev' of https://github.com/steindornatorinn/nyaa into devbragason2017-05-210-0/+0
| | |\
| | | * Update is-is.all.jsonSteindór2017-05-201-1/+1
| | | * Fixed typosSteindór2017-05-201-3/+3
| | | * Missed oneSteindór2017-05-201-1/+1
| | | * Merge branch 'dev' of https://github.com/NyaaPantsu/nyaa into devbragason2017-05-2036-177/+529
| | | |\
| | | * | added icelandic translationsbragason2017-05-201-0/+762
| | | * | fixed issues when logged inbragason2017-05-201-2/+2
| | | * | Navbar styling no longer dependent on bugsbragason2017-05-201-5/+6
| | | * | fixed the nightmode switcher, broke everything elsebragason2017-05-201-2/+4
| | | * | used tabs like the rest of the filebragason2017-05-201-0/+2
| | | * | fixed the spacing between the logo and the nightmode buttonbragason2017-05-201-3/+1
| | * | | fixed merge conflictsbragason2017-05-2111-82/+262
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #668 from MMP0/patch-26akuma062017-05-214-28/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update style.cssMMP02017-05-211-7/+11
| * | | | Update style.cssMMP02017-05-211-2/+0
| * | | | Update home.htmlMMP02017-05-211-1/+1
| * | | | Update index.htmlMMP02017-05-211-1/+1
| * | | | Update style.cssMMP02017-05-211-8/+0
| * | | | Fix navbar bugsMMP02017-05-211-3/+1
| * | | | Fix navbar bugsMMP02017-05-211-6/+7
* | | | | Merge pull request #669 from NyaaPantsu/filesize-functionakuma062017-05-214-19/+5
|\ \ \ \ \
| * | | | | output template.HTMLakuma062017-05-211-2/+2
| * | | | | New filesize functionakuma062017-05-214-18/+4
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/dev' into devakuma062017-05-2128-349/+426
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #654 from goonyaa/patch5akuma062017-05-217-73/+234
| |\ \ \ \
| | * | | | Update _user_list_torrents.htmlakuma062017-05-211-1/+1
| | * | | | Update home.htmlakuma062017-05-211-1/+1
| | * | | | Merge branch 'dev' into patch5akuma062017-05-2169-714/+2252
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #667 from Myrmece/patch-3akuma062017-05-211-0/+20
| |\ \ \ \ \
| | * | | | | Updated translation.Myrmece2017-05-211-0/+20
| |/ / / / /
| | * | | | Show unknown file size based on current language (fixes #650)GooNyaa2017-05-203-3/+21
| | * | | | Remove empty style attributeGooNyaa2017-05-201-1/+1
| | * | | | Update translationsGooNyaa2017-05-202-18/+86
| | * | | | small CSS files formatting updateGooNyaa2017-05-202-50/+125
* | | | | | Add filesize functionakuma062017-05-211-0/+8
| | | * | | fully refactored navbar cssTern Software2017-05-211-20/+38
| | |/ / / | |/| | |
| * | | | Update th-th.all.json (#666)sisimouto2017-05-211-1/+21
| * | | | Group common template variables together. (#665)Ramon Dantas2017-05-2111-242/+105
| * | | | People forget about mods tools (#664)yiiT2017-05-215-24/+31
| * | | | zh-tw TL fix/consistency (#663)wfu2017-05-211-3/+3
| * | | | Bundle CaptchaID and Tfunc for _captcha.html (#662)Ramon Dantas2017-05-215-6/+12
|/ / / /
* | | | Fixed route to delete accountakuma062017-05-211-1/+1
* | | | Merge pull request #660 from mitki/patch-7akuma062017-05-211-5/+89
|\ \ \ \
| * | | | Update pt-br.all.jsonMitki2017-05-201-1/+1
| * | | | Update pt-br.all.jsonMitki2017-05-201-5/+89
* | | | | Better to check user.ID, to be sure not anonakuma062017-05-212-5/+6
* | | | | Added website_link string (en-us)akuma062017-05-211-0/+4
* | | | | Merge pull request #661 from ElegantMonkey/fix-captchaakuma062017-05-212-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix captcha on upload pageElegantMonkey2017-05-202-1/+3
|/ / / /
* | | | Merge pull request #657 from NyaaPantsu/notificationsakuma062017-05-2120-13/+255
|\ \ \ \
| * | | | fixakuma062017-05-211-3/+4
| * | | | Merge remote-tracking branch 'refs/remotes/origin/dev' into notificationsakuma062017-05-2146-422/+1399
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Added icelandic translations (#656)Steindór2017-05-211-0/+762
* | | | | Update Catalan translation (#655)Eduard Ereza Martínez2017-05-211-15/+219
* | | | | Move translation func to template variables (#652)Ramon Dantas2017-05-2140-398/+404
| |_|_|/ |/| | |
* | | | added ircs supportakuma062017-05-201-1/+1
| * | | Finishedakuma062017-05-215-7/+28
| * | | Fixed unassigned valueakuma062017-05-211-1/+1
| * | | Mostly doneakuma062017-05-2114-14/+144
| * | | Notification for Users (WIP)akuma062017-05-209-7/+92
|/ / /
* | | Fixed infos shown as errorsakuma062017-05-201-2/+2
* | | Website link are mandatoryakuma062017-05-201-5/+6
* | | Merge pull request #653 from NyaaPantsu/torrent-weblinkakuma062017-05-208-69/+105
|\ \ \
| * | | Modified info stringakuma062017-05-202-1/+2
| * | | add irc supportakuma062017-05-201-1/+1
| * | | Merge branch 'dev' into torrent-weblinkakuma062017-05-209-36/+69
| |\ \ \ | |/ / / |/| | |
* | | | More sukebei fixes (#649)sfan52017-05-218-29/+42
* | | | Merge pull request #638 from fuzzyballz/patch-1akuma062017-05-201-7/+27
|\ \ \ \
| * | | | Fixed +'sakuma062017-05-201-18/+18
| * | | | Updated translation, added missing diacritics.fuzzyballz2017-05-201-7/+27
| | * | | Forgot to add in model insertakuma062017-05-201-0/+1
| | * | | Add Torrent WebLink + fixesakuma062017-05-208-69/+103
| |/ / / |/| | |
* | | | Merge pull request #646 from NyaaPantsu/multi-action-torrents-modakuma062017-05-2012-39/+286
|\ \ \ \
| * | | | Fix router mergeakuma062017-05-201-2/+2