and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here

  1. 16 Sep, 2014 23 commits
  2. 15 Sep, 2014 13 commits
  3. 12 Sep, 2014 4 commits
    • jonzjia's avatar
      ADMIN-63: (merge) Merge ADMIN-63 into master · f23afd1f
      jonzjia authored
          ec248042 - ADMIN-63 change for compatibility with lq-1230
      f23afd1f
    • Elise Burke's avatar
      LQ-1230: (merge) Merge LQ-1230 into master · 17171547
      Elise Burke authored
          7a50284e - LQ-1230: Fix ams user join for member_email
          478b7a1b - LQ-1230: received_opps.sql: need user_ptr_id for opp assigned to
          bcd8195c - LQ-1230: Fix received_opps: owned_by is a company
          349c07c1 - LQ-1230: Fix received_opps.sql (again)
          9084980a - LQ-1230: Fix received_opps.sql
          af8e586f - LQ-1230: Fix contacts_and_users_by_opp
          d8c30e68 - LQ-1230: Fix save_license_type (maybe)
          3c7ea8aa - LQ-1230: Fix recipient's tab
          186cdc21 - LQ-1230: Fix company edit / create issue (issue 1 on ticket)
          4a40aad7 - LQ-1230: Fix check when adding a new user
          286ece59 - LQ-1230: Fix origin/master merge issues, add public_id synonym to AxialUser
          f4d3bd5e - Merge 'LQ-1230' from 'origin/master'
          d2ad79e6 - LQ-1230: Add groups back to Django admin
          6e58684e - LQ-1230: Revert ADMIN-12. Can't reproduce this.
          757af4fd - LQ-1230: Fix django_forkedauth m2m models for admin. Adding auto_created=True lets them be used in the admin.
          25ee14b6 - LQ-1230: Only try saving AxialUser 20 times, and raise if that's exceeded. Also, indicate that the PK is an AutoField
          a7179a8e - LQ-1230: Change auth_axialuser sequence name to conform to django's dumb rules
          b80e1543 - LQ-1230: Fix last_login.sql tplsql
          2f309c30 - LQ-1230: Remove create_axurl specific code for initializing django
          790043b9 - LQ-1230: Extend settings hack for manual settings setup, add settings import to axlclitools
          507a1160 - LQ-1230: Add Makefile for etc/exturl.json
          277c6384 - LQ-1230: Update ams's AxialUser
          7e487944 - LQ-1230: Correct backwards migration
          fe40bb6d - LQ-1230: Correct index name for migrations
          d0fec524 - LQ-1230: Don't modify the Bulgarian translation, not even for the lulz
          643c6f58 - LQ-1230: Add comments
          b29c595b - LQ-1230: Remove auth_message model
          aded55d8 - LQ-1230: Remove commented line for UserAdmin
          96b66f22 - LQ-1230: Remove erronous join in ams
          f750cc5f - LQ-1230: Revert "LQ-1230: POSTGRES_USER should be platform to match prod"
          ce91d33d - LQ-1230: Fix upgrade / downgreade WRT sequences
          d41140c7 - LQ-1230: Fix contact importer
          32133223 - LQ-1230: Fix authlib's user model
          a427d526 - LQ-1230: Preinit Django on create_axurl
          649868d5 - LQ-1230: POSTGRES_USER should be platform to match prod
          461338a9 - LQ-1230: Fix ams
          0a91bb76 - LQ-1230: Register analytics introspection functions
          e53a0f2e - LQ-1230: Make opportunity happy
          7e5159f3 - LQ-1230: Make platform okay with a single auth.user
          a040e735 - move to django_forkedauth
          38686b8b - LQ-1230: Don't use a configurable CUSTOM_USER_MODEL
          e251cc98 - LQ-1230: First untested pass at tplsql fixes
          e3f796ff - LQ-1230: Merge SQLA model for AxialUser in SP
          59f26907 - LQ-1230: Change ams to use it's private AxialUser, not auth_user
          7099098d - LQ-1230: Add migrations to kill auth_user
      
      Conflicts:
      	service/platform/templates/queries/opportunities/received_opps.sql
      17171547
    • Doug Friedman's avatar
      ec248042
    • Drake Talley's avatar
      RESP-1022 shorten logged url · 89a6ced3
      Drake Talley authored
      Signed-off-by: default avatarDrake Talley <drake@axialmarket.com>
      89a6ced3