aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' into OPW-Moderation-Updatetilly-Q2013-09-12123-6899/+22830
| |\
| * | 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-2072-174/+2385
| |\ \
| * | | 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-29129-5987/+6448
| |\ \ \
| * | | | 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
* | | | | 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
|\ \ \ \ \
| * | | | | Simplify non-active user pageSebastian Spaeth2013-09-033-113/+148
* | | | | | Fixing one test post-merge. We got rid of the mongo stuff, so... consistency!Christopher Allan Webber2013-09-201-2/+2
* | | | | | Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'Christopher Allan Webber2013-09-208-0/+508
|\ \ \ \ \ \
| * | | | | | skip test if python-ldap is not installedRodney Ewing2013-08-151-0/+2
| * | | | | | added tests for ldap pluginRodney Ewing2013-08-152-0/+164
| * | | | | | catch a keyerrorRodney Ewing2013-08-151-5/+5
| * | | | | | typo in docsRodney Ewing2013-08-151-3/+3
| * | | | | | added docs for ldap pluginRodney Ewing2013-08-151-0/+49
| * | | | | | use pluginapi.get_configRodney Ewing2013-08-151-2/+2
| * | | | | | removed unused importRodney Ewing2013-08-151-1/+0
| * | | | | | added a create_account hookRodney Ewing2013-08-152-0/+33
| * | | | | | only create a user if the register_form is from the ldap pluginRodney Ewing2013-08-151-1/+2
| * | | | | | - fixed typo with unbinding codeRodney Ewing2013-08-152-6/+21
| * | | | | | - changed host and port to just a server uriRodney Ewing2013-08-151-4/+11
| * | | | | | ldap uses it own viewsRodney Ewing2013-08-155-48/+120
| * | | | | | starting ldap pluginRodney Ewing2013-08-153-0/+166
* | | | | | | Adding the .xcf file of the MediaGoblin goblin.Christopher Allan Webber2013-09-191-0/+0
* | | | | | | We're no longer using this image, as awesome as it isChristopher Allan Webber2013-09-191-0/+0
* | | | | | | Fixing import error after merge of basic_auth branch.Christopher Allan Webber2013-09-191-2/+3
* | | | | | | Fixing error caused by merge (failure to build password editing url)Christopher Allan Webber2013-09-191-1/+1
* | | | | | | Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'Christopher Allan Webber2013-09-1929-168/+463
|\ \ \ \ \ \ \
| * | | | | | | skip openid test if python-openid isn't installedRodney Ewing2013-08-161-0/+1
| * | | | | | | use new in-memory db for testingRodney Ewing2013-08-162-4/+4