Commits on Jul 24, 2016
  1. @zz9pzza

    Merge pull request #2499 from otwcode/revert-2498-revert-2442-AO3-435…

    …9-Mass-import-bookmarks
    
    Revert "AO3-4359 Revert mass import bookmarks"
    zz9pzza committed on GitHub Jul 24, 2016
  2. @zz9pzza

    Revert "AO3-4359 Revert mass import bookmarks"

    zz9pzza committed on GitHub Jul 24, 2016
  3. Merge pull request #2498 from otwcode/revert-2442-AO3-4359-Mass-impor…

    …t-bookmarks
    
    AO3-4359 Revert mass import bookmarks
    committed on GitHub Jul 24, 2016
  4. Revert "AO3-4359 Mass import bookmarks"

    committed on GitHub Jul 23, 2016
Commits on Jul 20, 2016
  1. @zz9pzza

    Merge pull request #2496 from sarken/AO3-4578

    AO3-4578 Fix broken "new Psued" link on change user name page
    zz9pzza committed on GitHub Jul 20, 2016
Commits on Jul 18, 2016
  1. AO3-4578 Merge with master

    committed Jul 17, 2016
Commits on Jul 17, 2016
  1. Ao3-4578 put ) in right place

    committed on GitHub Jul 17, 2016
  2. Ao3-4578 add missing = to link

    committed on GitHub Jul 17, 2016
  3. Merge pull request #2495 from zz9pzza/AO3-4601

    AO3-4601 Add server back in to the mix
    committed on GitHub Jul 17, 2016
Commits on Jul 16, 2016
  1. @zz9pzza

    Add server back in to the mix

    zz9pzza committed Jul 16, 2016
Commits on Jul 11, 2016
  1. Merge pull request #2492 from zz9pzza/AO3-4598

    AO3-4598 Put ao3-app09 back in service
    committed on GitHub Jul 11, 2016
  2. Merge pull request #2478 from zz9pzza/AO3-4588

    AO3 4588 Make "Make tag non-canonical and unhook all associations" function admin only
    committed on GitHub Jul 10, 2016
Commits on Jul 10, 2016
  1. @zz9pzza

    Put ao3-app09 back in service

    zz9pzza committed Jul 10, 2016
  2. @scottsds

    Merge pull request #2469 from sarken/AO3-4578

    AO3-4578 Change "fallback pseud" phrase on edit pseud page
    scottsds committed on GitHub Jul 9, 2016
  3. @scottsds

    Merge pull request #2488 from sarken/AO3-4593

    AO3-4593 Indicate if HTML or Rich Text editor is in use
    scottsds committed on GitHub Jul 9, 2016
  4. Merge pull request #2479 from zz9pzza/AO3-4554

    AO3-4554 Change links in tos and tos_faq
    committed on GitHub Jul 9, 2016
  5. Merge pull request #2487 from elzj/AO3-4514-chapter-count

    AO3-4514: Fix chapter count cache when draft is first posted
    committed on GitHub Jul 9, 2016
  6. Merge pull request #2461 from cjrecordvt/ao3-4573

    AO3-4573 Text and link change for Request Invite for Friends page
    committed on GitHub Jul 9, 2016
  7. Merge pull request #2442 from ariana-paris/AO3-4359-Mass-import-bookm…

    …arks
    
    AO3-4359 Mass import bookmarks
    committed on GitHub Jul 9, 2016
Commits on Jul 8, 2016
  1. Merge pull request #2490 from zz9pzza/AO3-4596

    AO3-4596 Take ao3-app09 and ao3-app10 out of service
    committed on GitHub Jul 8, 2016
Commits on Jul 7, 2016
  1. @zz9pzza
Commits on Jun 30, 2016
  1. Merge pull request #2465 from zz9pzza/AO3-4575

    AO3-4575 Add activerecord-mysql-reconnect gem
    committed on GitHub Jun 30, 2016
Commits on Jun 28, 2016
  1. @zz9pzza

    Merge pull request #2489 from shalott/AO3-4128-more-progress-fix

    AO3-4128-more thorough progress fix
    zz9pzza committed on GitHub Jun 28, 2016
Commits on Jun 21, 2016
  1. @shalott

    hound fixes

    Signed-off-by: astolat shalott <shalott@gmail.com>
    shalott committed Jun 21, 2016
  2. @shalott

    fixing the progress again, now with testing

    Signed-off-by: astolat shalott <shalott@gmail.com>
    shalott committed Jun 21, 2016
Commits on Jun 19, 2016
  1. @zz9pzza

    Make config explicit

    zz9pzza committed Jun 19, 2016
  2. @zz9pzza
Commits on Jun 16, 2016
Commits on Jun 15, 2016
  1. @elzj
Commits on Jun 14, 2016
  1. @zz9pzza

    Merge pull request #2486 from sarken/AO3-3597

    AO3-3597 Only include language field on tag preview page for admins
    zz9pzza committed on GitHub Jun 14, 2016
Commits on Jun 13, 2016
  1. AO3-3597 Spacing fixes, sigh

    committed Jun 13, 2016
  2. @zz9pzza

    Merge pull request #2485 from sarken/AO3-3597

    AO3-3597 Fix editing work language on preview, rename admin option
    zz9pzza committed on GitHub Jun 13, 2016