Commit Graph

634 Commits

Author SHA1 Message Date
ReimuHakurei 3e2437bba1 Fix merge mistake. 2017-06-01 11:37:50 +00:00
Alex Ingram 91a9264442 Merge pull request #221 from CounterPillow/focus-report-field
Focus report reason text field when reporting
2017-06-01 06:30:57 -05:00
Alex Ingram b5e70ba0b0 Merge branch 'master' into focus-report-field 2017-06-01 06:30:34 -05:00
Nicolas F e564b3ee19 Change label of button on edit page
Small nitpick change.

"Edit" being the button that saves the edits might be a little
confusing, whereas "Save Changes" is less ambiguous and more
easily recognised.
2017-06-01 06:29:14 -05:00
Nicolas F ae30e9c95c Get started with a bare-bones help page
It includes little anchors over headings that you can click to link
your one reading-challenged friend to the right section.

In the future, adding an explanation of the different categories
and labels under a new h2 would be a good thing.
2017-06-01 06:28:49 -05:00
TheAMM 80587e02fe Default description to "" in field renderer
Otherwise we get None on upload page
2017-06-01 06:28:38 -05:00
TheAMM f4fb9fc065 Render markdown text field manually in the template
We need to escape newlines in the editor as well!
2017-06-01 06:28:38 -05:00
TheAMM 505b4e18bd Move to markdown-it, render markdown in DOMContentLoaded
No more separate <script>s for comments
Adds a link to a GFM cheatsheet on markdown form
Spaces to tabs on "markdownEditors" DOMContentLoaded
2017-06-01 06:28:38 -05:00
Nicolas F 07d45b6223 Focus report reason text field when reporting
A small convenience change which by sets the focus to the newly
opened modal dialog's text field if the report button is hit.

This way, people can type away their gripes with the torrent without
having to click into the text field first.
2017-05-30 19:31:28 +02:00
TheAMM 051f3f38d2 Clean up Torrent flag properties 2017-05-30 12:46:27 +03:00
Anna-Maria Meriniemi c6640485ea Merge pull request #214 from nyaazi/patch-1
Replace the header titles
2017-05-30 12:14:57 +03:00
nyaazi 5525337931 Replace the header titles 2017-05-30 10:29:59 +03:00
TheAMM 2b331c307e Optimize MySQL COUNT queries and pagination
Also leaves 'Torrent.trackers' as 'select' for the joining, since we don't need it on listings
2017-05-29 18:27:34 +03:00
TheAMM 7b2bfc57ee [DB Changes!] Merge branch 'nyaazi-reports' (#146)
Adds reporting functionality.
Alembic migration included.
2017-05-29 17:09:12 +03:00
TheAMM 2e4b0b1f9f Add Alembic migration for report tables 2017-05-29 17:05:17 +03:00
TheAMM c2b02e252d Fix permissions 2017-05-29 17:01:32 +03:00
nyaazi 5dc8bdaf74 For the green 2017-05-29 16:24:45 +03:00
nyaazi bea63315cd Merge branch 'master' into reports 2017-05-29 16:20:48 +03:00
Yukikaze 3059507e09 Merge pull request #208 from nyaadevs/die-sync-es
sync_es: die when killed
2017-05-29 03:48:10 -07:00
queue eceb8824dc sync_es: fix flush_interval behavior during slow times
instead of flushing every N seconds, it flushed N seconds after
the last change, which could drag out to N seconds * M batch size
if there are few updates. Practically this doesn't change anything
since stuff is always happening.

Also fix not writing a save point if nothing is happening. Also
practically does nothing, but for correctness.
2017-05-28 20:14:14 -06:00
queue 33852a55bf sync_es: die when killed 2017-05-28 20:02:20 -06:00
Anna-Maria Meriniemi 847b7d4b5e Merge pull request #204 from zaclimon/master
Fix progressbar33 version number in requirements.txt
2017-05-28 12:15:48 +03:00
zaclimon 7acfa97a47 requirements.txt: Adapt progressbar33 version
While installing progressbar33 2.40.0, an error occurs:

Could not find a version that satisfies the requirement
progressbar33==2.40.0 (from -r requirements.txt (line 31)) (from
versions: 2.4)
No matching distribution found for progressbar33==2.40.0 (from -r
requirements.txt (line 31))

Reflect the correct version as shown on pypi which is 2.4.
2017-05-27 21:11:55 -04:00
TheAMM 8fecc08d19 Keep it short, keep it simple
Keep it not retarded
2017-05-28 02:47:47 +03:00
TheAMM 32fa021f34 Turn comments icon on search result into link to comments
Also cleans up torrent.id/torrent.meta.id
2017-05-28 02:46:04 +03:00
Anna-Maria Meriniemi f02836f75e Merge pull request #194 from shm0o/url-stuff
More `url_for`
2017-05-28 02:42:42 +03:00
Anna-Maria Meriniemi 75aff3835d GFM, you lied to me about newlines! 2017-05-28 02:23:45 +03:00
TheAMM 926c85058e Overhaul README.md with more helpful and more up-to-date instructions 2017-05-28 02:16:25 +03:00
TheAMM 05713892f7 Update config.example.py: remove TABLE_PREFIX, enable stat display by default 2017-05-28 02:15:39 +03:00
TheAMM 0cbed3870e Update import_to_es.py to index both torrent flavors, rename sync_es config
import_to_es.py will now also SHOW MASTER STATUS now
Changed progressbar dependency
2017-05-28 02:12:48 +03:00
TheAMM 79dae38f37 Patch db_migrate.py to always use the 'db' command
This means you can (have to) use the Flask-Migrate commands directly:
"./db_migrate.py stamp head" etc instead of "./db_migrate.py db stamp head"
2017-05-27 23:19:38 +03:00
TheAMM 2d04cf3525 Update comment count migration, calculate initial counts during upgrade
How fancy!
2017-05-27 22:46:35 +03:00
TheAMM 16194a12a3 Fix typo in ES search sort keys 2017-05-27 21:37:26 +03:00
Anna-Maria Meriniemi ea17f2d4da Merge pull request #169 from sharkykh/num-comments
Add number of comments to torrent lists
2017-05-27 21:36:29 +03:00
TheAMM 260dc2cdc8 Forbid caching when debugging 2017-05-27 21:33:20 +03:00
Anna-Maria Meriniemi d65602ee9f [DB Changes! Read PR!] Merge pull request #196 from nyaadevs/elasticsearch-comment-count
Elasticsearch comment count. Read PR #201 as well.
2017-05-27 20:12:43 +03:00
Anna-Maria Meriniemi 279ec26f7c [DB Changes! Read PR!] Merge pull request #201 from nyaadevs/update-alembic-migrations
Rewrite database models for declarative and update Alembic migrations
2017-05-27 20:11:57 +03:00
TheAMM eac41d561a Fix db_migrate.py shebang for venvs
Allows one to call it using ./db_migrate.py without errors
2017-05-27 18:14:43 +03:00
TheAMM 6f9341d3f1 Add initial database state for Alembic, update existing migrations
Existing migrations will apply changes to both Nyaa and Sukebei
(adjusted manually - in the future Alembic should be able to create operations
for both, thanks to having both models loaded)

Added a down_revision for previously-earliest revision.
2017-05-27 18:14:43 +03:00
TheAMM 1b3e05339d Update db_create.py to add categories for both Nyaa and Sukebei
Also includes a reminder to stamp the database version for Alembic.
2017-05-27 18:14:43 +03:00
TheAMM 07cf0de6f9 Rewrite site-specific database models into declarative bases
This allows us to easily extend the bases into Nyaa and Sukebei models, with working FKs and relationships.

Note: the schema will (should!) otherwise match, however; the following index on Torrent was renamed:
uploader_flag_idx will be <prefix>_uploader_flag_idx, as we will be always creating both flavors.
The index rename should not affect SQA, but will potentially break migrations.
2017-05-27 18:14:39 +03:00
TheAMM f7ed2c06d3 Jeez fine PEP8 I get it 2017-05-27 18:10:21 +03:00
TheAMM 6f4aad56ab Update comment count migration script for #201 2017-05-27 18:05:31 +03:00
TheAMM d89f74893b Remove username validator from login form to allow logging in with email
Since our previous regex was broken, the validator passed practically everything.
2017-05-26 23:28:28 +03:00
Kfir Hadas fa946844d1 Style fixes
Comments box changed the height of the `<tr>`
Tweak icon/text sizes.
2017-05-26 19:23:34 +03:00
Kfir Hadas aad5a0c6ea Update style
Add support for sorting comments (in advance),
add th for sorting by comments_count, add title to the counter box and fix it being under the torrent's name,
2017-05-26 18:25:56 +03:00
Kfir Hadas 90695cad11 Add number of comments to torrent lists
Will only show when number of comments is above zero.
2017-05-26 16:50:31 +03:00
TheAMM 9cd6c506ae Update ElasticSeach index and scripts for comment_count 2017-05-26 16:12:47 +03:00
TheAMM b5ebebf98e Update Torrent.comment_count on comment submit/delete 2017-05-26 16:11:31 +03:00
TheAMM 6c80557e39 SCHEMA CHANGE: Add comment_count to Torrent
with a helper function on Torrent to update the count.
2017-05-26 16:08:46 +03:00