aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make showing the Terms of Service a user option, and move it to the footer.Christopher Allan Webber2013-10-114-6/+16
* Renaming replace_table to replace_table_hack and documenting why it's a hackChristopher Allan Webber2013-10-102-6/+12
* Actually rename the table back, or else we just lose the old table! ;)Christopher Allan Webber2013-10-101-1/+1
* Merge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into merge-til...Christopher Allan Webber2013-10-102-21/+31
|\
| * I made some changes in this commit to help out with other people trying to worktilly-Q2013-10-092-21/+31
* | Fix the create_moderation_tables migration to work with postgresqlChristopher Allan Webber2013-10-101-3/+3
* | "Intellectual property" being a problematic term, replacing it in this document.Christopher Allan Webber2013-10-091-36/+42
|/
* Fixing migration to account for new fields added to User modelChristopher Allan Webber2013-10-091-1/+5
* Improving the whitespace around the {% trans %} adjustments from tilly-qChristopher Allan Webber2013-10-092-14/+14
* Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tilly...Christopher Allan Webber2013-10-096-25/+52
|\
| * This was a quick update to clean up some of my templates and fix the formattingtilly-Q2013-10-086-25/+52
* | Fixing the test_change_password test. Needed a privilege!Christopher Allan Webber2013-10-081-1/+3
* | Fixing up the email verified stuff to reflect the email_verified stuff!Christopher Allan Webber2013-10-081-8/+14
* | Fixing issues in the tests caused by the OPW-Moderation-Update mergeChristopher Allan Webber2013-10-081-45/+17
* | Adding a comment explaining what vR1 means.Christopher Allan Webber2013-10-081-0/+4
* | Just fixing the order of migrations and a bit of whitespace.Christopher Allan Webber2013-10-081-38/+48
* | Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'Christopher Allan Webber2013-10-0759-206/+3409
|\|
| * This was a very important update where I fixed a few small but fatal bugs in mytilly-Q2013-10-032-4/+4
| * In this commit, I mostly did work on the migrations. Firstly, I droppped thetilly-Q2013-10-032-48/+129
| * This commit was solely to remove unused imports in the code that I have writtentilly-Q2013-09-2310-25/+11
| * At this point, I am very close to done with this code! I made one big change attilly-Q2013-09-2319-122/+188
| * Merge branch 'master' into OPW-Moderation-Updatetilly-Q2013-09-12131-6913/+22924
| |\
| * | In this next small update, I made a few changes to protect against XXS attackstilly-Q2013-09-122-34/+29
| * | In this commit, I'm deleting the ArchivedReports object, at paroneyea's recom-tilly-Q2013-09-116-100/+63
| * | This should be my final code update before I am ready for review! Basically, intilly-Q2013-09-1021-246/+185
| * | This was a quick update, I mostly worked on the transition from using the oldtilly-Q2013-09-0815-58/+115
| * | I did some more code-keeping in this commit. I added a lot of documentation, sotilly-Q2013-09-0315-97/+277
| * | I've moved on to one of the last phases of my work! Now I'm just checking offtilly-Q2013-09-0312-204/+351
| * | This is a quick commit. I gave admins the ability to ban or unban userstilly-Q2013-08-2911-23/+395
| * | This was a big commit! I included lots of documentation below, but generally Itilly-Q2013-08-2928-157/+793
| * | pushing so paroneayea can help me resolve a conflict within the tests.tilly-Q2013-08-232-18/+16
| * | This commit was just to fix a few of the errors with the merging and totilly-Q2013-08-208-87/+97
| * | Merge branch 'master' into OPW-Moderation-Updatetilly-Q2013-08-2091-202/+4359
| |\ \
| * | | This was a very small update, I'm hoping to rebase after this to solve sometilly-Q2013-08-2010-49/+122
| * | | This has been an update to clean out the code a little bit. The primary changetilly-Q2013-08-1325-63/+219
| * | | This commit was the work I did fixing errors that cropped up from the merge.tilly-Q2013-07-318-20/+35
| * | | Merge branch 'ticket-679' into OPW-Moderation-Updatetilly-Q2013-07-29140-6033/+6689
| |\ \ \
| * | | | This is a very small commit. All that I have done here is to clean up my codetilly-Q2013-07-296-81/+98
| * | | | This commit had some important milestones in it. The major update is that now Itilly-Q2013-07-2713-205/+490
| * | | | Whew. This is a big update. I did some significant keeping work. I moved all oftilly-Q2013-07-1723-189/+509
| * | | | I just added the attribution for the clipboard image to the code.tilly-Q2013-07-081-1/+2
| * | | | This update I mostly did work on the templates for the admin pages. I did a co-tilly-Q2013-07-0817-144/+470
| * | | | This was a simple commit. I changed all references to Groups into Privileges sotilly-Q2013-07-038-44/+59
| * | | | In this commit, I have made a few changes and tightened up some of my modelstilly-Q2013-06-278-87/+175
| * | | | This is the first stage of my project of implenting admin/moderator functiona-tilly-Q2013-06-2413-10/+548
* | | | | Make the develop makefile target the default.Christopher Allan Webber2013-10-071-1/+1
* | | | | Fix by lennax: Fix the AC_MSG_ERROR undefined macro error.Christopher Allan Webber2013-10-071-0/+1
* | | | | Okay, making the theme of video.js consistent with the theme we had previousChristopher Allan Webber2013-09-291-5/+1
* | | | | Fixing ALL THE BROKEN TESTS. I probably broke most of them.Christopher Allan Webber2013-09-295-6/+7
* | | | | Merge remote-tracking branch 'spaetz/master'Christopher Allan Webber2013-09-283-113/+148
|\ \ \ \ \