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

  1. 09 Feb, 2015 24 commits
    • Dan Conner's avatar
      33a37182
    • Dan Conner's avatar
    • Ike Garrow's avatar
      INTEGRATION: (merge) Merge integration into master · 9fe1da8c
      Ike Garrow authored
          e69d16a0 - Fix-ams-inbound-test
          fde3bb05 - CORE-39: (merge) Merge CORE-39 into integration
          8f3768b1 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          e8a9ea88 - CORE-39: remove axial sector from two_sectors
          3b92bc3f - RESP-1114: (merge) Merge RESP-1114 into integration
          a4588b49 - LQ-1413: (merge) Merge LQ-1413 into integration
          6261e1d6 - LQ-1412: (merge) Merge LQ-1412 into integration
          8bac4d32 - LQ-1406: (merge) Merge LQ-1406 into integration
          7761c88a - BUGZ-2424: (merge) Merge BUGZ-2424 into integration
          7e4ccda0 - BUGZ-2111: (merge) Merge BUGZ-2111 into integration
          e6f9adaa - ADMIN-101: (merge) Merge ADMIN-101 into integration
          593a646e - ADMIN-102: (merge) Merge ADMIN-102 into integration
          b9064fc0 - CORE-39: (merge) Merge CORE-39 into integration
          14b6f9d3 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          8d4d67ae - CORE-39: include ALL group in test session
          2787ed36 - TEST-CONFIG: add NGINX_HYDRA_SUBDOMAIN for test1, test2
          36d32115 - CORE-39: (merge) Merge CORE-39 into integration
          8610f24f - RESP-1269: (merge) Merge RESP-1269 into integration
          27f5200d - LQ-1413: Show phone number(s) in admin list view
          e197d485 - ADMIN-102 fix spelling error
          b926c4bc - RESP-1114: updates from code review
          982d4fb6 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          4c43cc6e - CORE-39: oops, converted the wrong way
          1146dbec - CORE-39: Strings are not integer
          8f9a6966 - CORE-39: fix bug in geo bug fix
          fabba6ab - CORE-39: fix roll-up behavior
          cb79125a - CORE-39: fix geo links
          cf8ed11b - CORE-39: fix NAF creation for acquisitions and transactions
          676ff410 - CORE-39: fix bad merge
          4e8b2227 - Fixed-alembic-conflict-CORE-39
          dd66e962 - CORE-39: changes to support new NF in new company profile
          0b324faf - CORE-39: feedback from code review
          85f1042d - CORE-39: naf module in company profile needs reference spoke
          caa68aec - CORE-39: force load after announcement is not necessary
          48f2d0b8 - CORE-39: fix alembic branch
          ab2def4e - CORE-39: tighten up run_script to only run scripts in /var/axm/qa
          eadf5d62 - CORE-39: added "runScript" endpoint in hub for non-prod environments
          0e2ce4db - CORE-39: forgot a few grand_central references
          a1cc02ff - CORE-39: fix bug with opps that have only 2015 financials; need sockjs url in axial.hydra in frontend
          e5f5c21b - CORE-39: add test for reference spoke
          412c9ad0 - CORE-39: changes from code review feedback
          138f7cee - CORE-39: pull in sockjs library locally
          d77b1808 - CORE-39: migration to add indexes for newsfeeditem to make queries faster
          4a103afc - CORE-39: integrate NAF UI with new API and Hydra
          01105d6e - CORE-39: include user id in user info API call (unfortunately used by some NAF UI code)
          7e8ba2f2 - CORE-39: remove some duplicated spokes and connect spoke (about to kill connect)
          24937722 - CORE-39: bug fixes to hydra
          6c830222 - CORE-39: add bridging method to company service to get company names
          0c9c4db7 - CORE-39: fix javascript compatibility issue in geography reference data
          7adc4337 - CORE-39: enhancements to NAF api; allow empty arrays for criteria, limit limit to 1000, implement delete
          f7eeedcc - CORE-39: make sockjs url https
          7984148a - CORE-39: create spoke for reference service data
          c01db1a5 - CORE-39: make newsfeed m2m relationships load eagerly
          e99fb089 - CORE-39: create hydra javascript interface
          7fd12f60 - CORE-39: adjust extjs in spokec to not auto-add semicolons, interacts poorly with multiple extjs scripts
          12a8f126 - CORE-39: remove junk file
          da25fbfd - CORE-35: change all save_post calls to create_entity
          3b2f397f - CORE-37: get_naf_data API call
          68a0e86c - CORE-34: create initial hub service from scaffold
          9f665618 - RESP-1114: add decline functionality to new banner triggered from email
          639caad5 - RESP-1269: fix filters and review updates
          065a8836 - RESP-1269: finish industry aliases and keywords in typeahead
          a7788c26 - RESP-1269: alias industries name field
          70a7e7ef - RESP-1269: remove shallow copy dict
          78cb7e44 - RESP-1269: display industry aliases in search filters type ahead
          d764d8c5 - RESP-1269: add aliased industries to main searchbar typeahead
          1435253e - RESP-1114: return empty dict instead of None
          e30c63e0 - RESP-1114: updates from code review
          c31d88f8 - RESP-1114: smooth over messages handling
          031a0363 - RESP-1114: replace messages bar with banner dropdown
          0909a812 - ADMIN-101 update salesforce sync crontab to run twice per hour
          98aa430b - LQ-1406: fix request format for 'edit_profile'
          d7f9160f - LQ-1406: company-service and company/profile-first-touch clean up (first iteration)          move logging service to use JsonrpcFactory
          28382c06 - LQ-1406: cleanup jsonrpc callbacks, pass error message when aborted          move getUser_company_profile call to resolve from .run          cleaunup the unit tests
          3d6f702c - LQ-1406: Axial Json RPC service Factory for Angular
          fc7e0c80 - LQ-1412: Use new HelloSign standard NDA template
          7bc50399 - CORE-39: oops, converted the wrong way
          cedd734f - CORE-39: Strings are not integer
          973cbe86 - CORE-39: fix bug in geo bug fix
          0b094acc - CORE-39: fix roll-up behavior
          ba8adb7f - CORE-39: fix geo links
          d8a74cee - CORE-39: fix NAF creation for acquisitions and transactions
          d54410b7 - CORE-39: fix bad merge
          2630108f - Fixed-alembic-conflict-CORE-39
          75b486c1 - CORE-39: add nginx hydra subdomain for testworker3
          b44142c9 - CORE-39: changes to support new NF in new company profile
          e581e977 - CORE-39: feedback from code review
          1b17ddce - CORE-39: naf module in company profile needs reference spoke
          c41f2428 - CORE-39: force load after announcement is not necessary
          5f6de928 - CORE-39: fix alembic branch
          095e4cd3 - CORE-39: tighten up run_script to only run scripts in /var/axm/qa
          93bbba1c - CORE-39: added "runScript" endpoint in hub for non-prod environments
          74a50711 - CORE-39: forgot a few grand_central references
          8be93cd1 - CORE-39: fix bug with opps that have only 2015 financials; need sockjs url in axial.hydra in frontend
          0c365729 - CORE-39: add test for reference spoke
          4ecdc0dd - CORE-39: changes from code review feedback
          bec31849 - CORE-39: pull in sockjs library locally
          c280e9dc - CORE-39: migration to add indexes for newsfeeditem to make queries faster
          9ec1a55b - CORE-39: integrate NAF UI with new API and Hydra
          53f06c78 - CORE-39: include user id in user info API call (unfortunately used by some NAF UI code)
          65771e74 - CORE-39: remove some duplicated spokes and connect spoke (about to kill connect)
          61b8be6c - CORE-39: bug fixes to hydra
          435e0ff5 - CORE-39: add bridging method to company service to get company names
          671558ce - CORE-39: fix javascript compatibility issue in geography reference data
          8a0c521c - CORE-39: enhancements to NAF api; allow empty arrays for criteria, limit limit to 1000, implement delete
          2d305684 - CORE-39: make sockjs url https
          7fd9e35f - CORE-39: create spoke for reference service data
          b9a771d3 - CORE-39: make newsfeed m2m relationships load eagerly
          a7071d30 - CORE-39: create hydra javascript interface
          1a19f574 - CORE-39: adjust extjs in spokec to not auto-add semicolons, interacts poorly with multiple extjs scripts
          0c5e44bf - CORE-39: remove junk file
          7851c873 - CORE-35: change all save_post calls to create_entity
          74bbd49d - CORE-37: get_naf_data API call
          8463d9d7 - CORE-34: create initial hub service from scaffold
          3397f1c8 - BUGZ-2111: Fixed Chrome only event handler dysfunction when adding more than one document to an opp
          f1b8b8be - BUGZ-2424: fixing Merrill Datasite image display
      9fe1da8c
    • Ike Garrow's avatar
      Fix-ams-inbound-test · e69d16a0
      Ike Garrow authored
      e69d16a0
    • Mohammed Mehdi's avatar
      CORE-39: (merge) Merge CORE-39 into integration · fde3bb05
      Mohammed Mehdi authored
          8f3768b1 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          e8a9ea88 - CORE-39: remove axial sector from two_sectors
      fde3bb05
    • Mohammed Mehdi's avatar
    • Ben Holzman's avatar
      CORE-39: remove axial sector from two_sectors · e8a9ea88
      Ben Holzman authored
      Signed-off-by: default avatarBen Holzman <bah@axial.net>
      e8a9ea88
    • Mohammed Mehdi's avatar
      RESP-1114: (merge) Merge RESP-1114 into integration · 3b92bc3f
      Mohammed Mehdi authored
          b926c4bc - RESP-1114: updates from code review
          9f665618 - RESP-1114: add decline functionality to new banner triggered from email
          1435253e - RESP-1114: return empty dict instead of None
          e30c63e0 - RESP-1114: updates from code review
          c31d88f8 - RESP-1114: smooth over messages handling
          031a0363 - RESP-1114: replace messages bar with banner dropdown
      3b92bc3f
    • Mohammed Mehdi's avatar
      LQ-1413: (merge) Merge LQ-1413 into integration · a4588b49
      Mohammed Mehdi authored
          27f5200d - LQ-1413: Show phone number(s) in admin list view
          130bacf4 - INTEGRATION: (merge) Merge integration into master
      a4588b49
    • Mohammed Mehdi's avatar
      LQ-1412: (merge) Merge LQ-1412 into integration · 6261e1d6
      Mohammed Mehdi authored
          fc7e0c80 - LQ-1412: Use new HelloSign standard NDA template
      6261e1d6
    • Mohammed Mehdi's avatar
      LQ-1406: (merge) Merge LQ-1406 into integration · 8bac4d32
      Mohammed Mehdi authored
          98aa430b - LQ-1406: fix request format for 'edit_profile'
          d7f9160f - LQ-1406: company-service and company/profile-first-touch clean up (first iteration)          move logging service to use JsonrpcFactory
          28382c06 - LQ-1406: cleanup jsonrpc callbacks, pass error message when aborted          move getUser_company_profile call to resolve from .run          cleaunup the unit tests
          3d6f702c - LQ-1406: Axial Json RPC service Factory for Angular
      8bac4d32
    • Mohammed Mehdi's avatar
      BUGZ-2424: (merge) Merge BUGZ-2424 into integration · 7761c88a
      Mohammed Mehdi authored
          f1b8b8be - BUGZ-2424: fixing Merrill Datasite image display
      7761c88a
    • Mohammed Mehdi's avatar
      BUGZ-2111: (merge) Merge BUGZ-2111 into integration · 7e4ccda0
      Mohammed Mehdi authored
          3397f1c8 - BUGZ-2111: Fixed Chrome only event handler dysfunction when adding more than one document to an opp
      7e4ccda0
    • Mohammed Mehdi's avatar
      ADMIN-101: (merge) Merge ADMIN-101 into integration · e6f9adaa
      Mohammed Mehdi authored
          0909a812 - ADMIN-101 update salesforce sync crontab to run twice per hour
      e6f9adaa
    • Mohammed Mehdi's avatar
      ADMIN-102: (merge) Merge ADMIN-102 into integration · 593a646e
      Mohammed Mehdi authored
          e197d485 - ADMIN-102 fix spelling error
      593a646e
    • Mohammed Mehdi's avatar
      CORE-39: (merge) Merge CORE-39 into integration · b9064fc0
      Mohammed Mehdi authored
          14b6f9d3 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          8d4d67ae - CORE-39: include ALL group in test session
      b9064fc0
    • Mohammed Mehdi's avatar
    • Ben Holzman's avatar
      CORE-39: include ALL group in test session · 8d4d67ae
      Ben Holzman authored
      Signed-off-by: default avatarBen Holzman <bah@axial.net>
      8d4d67ae
    • Herby G's avatar
      2787ed36
    • Mohammed Mehdi's avatar
      CORE-39: (merge) Merge CORE-39 into integration · 36d32115
      Mohammed Mehdi authored
          982d4fb6 - Merge branch 'CORE-39' of github.com:axialmarket/axm into CORE-39
          4c43cc6e - CORE-39: oops, converted the wrong way
          1146dbec - CORE-39: Strings are not integer
          8f9a6966 - CORE-39: fix bug in geo bug fix
          fabba6ab - CORE-39: fix roll-up behavior
          cb79125a - CORE-39: fix geo links
          cf8ed11b - CORE-39: fix NAF creation for acquisitions and transactions
          676ff410 - CORE-39: fix bad merge
          4e8b2227 - Fixed-alembic-conflict-CORE-39
          dd66e962 - CORE-39: changes to support new NF in new company profile
          0b324faf - CORE-39: feedback from code review
          85f1042d - CORE-39: naf module in company profile needs reference spoke
          caa68aec - CORE-39: force load after announcement is not necessary
          48f2d0b8 - CORE-39: fix alembic branch
          ab2def4e - CORE-39: tighten up run_script to only run scripts in /var/axm/qa
          eadf5d62 - CORE-39: added "runScript" endpoint in hub for non-prod environments
          0e2ce4db - CORE-39: forgot a few grand_central references
          a1cc02ff - CORE-39: fix bug with opps that have only 2015 financials; need sockjs url in axial.hydra in frontend
          e5f5c21b - CORE-39: add test for reference spoke
          412c9ad0 - CORE-39: changes from code review feedback
          138f7cee - CORE-39: pull in sockjs library locally
          d77b1808 - CORE-39: migration to add indexes for newsfeeditem to make queries faster
          4a103afc - CORE-39: integrate NAF UI with new API and Hydra
          01105d6e - CORE-39: include user id in user info API call (unfortunately used by some NAF UI code)
          7e8ba2f2 - CORE-39: remove some duplicated spokes and connect spoke (about to kill connect)
          24937722 - CORE-39: bug fixes to hydra
          6c830222 - CORE-39: add bridging method to company service to get company names
          0c9c4db7 - CORE-39: fix javascript compatibility issue in geography reference data
          7adc4337 - CORE-39: enhancements to NAF api; allow empty arrays for criteria, limit limit to 1000, implement delete
          f7eeedcc - CORE-39: make sockjs url https
          7984148a - CORE-39: create spoke for reference service data
          c01db1a5 - CORE-39: make newsfeed m2m relationships load eagerly
          e99fb089 - CORE-39: create hydra javascript interface
          7fd12f60 - CORE-39: adjust extjs in spokec to not auto-add semicolons, interacts poorly with multiple extjs scripts
          12a8f126 - CORE-39: remove junk file
          da25fbfd - CORE-35: change all save_post calls to create_entity
          3b2f397f - CORE-37: get_naf_data API call
          68a0e86c - CORE-34: create initial hub service from scaffold
          7bc50399 - CORE-39: oops, converted the wrong way
          cedd734f - CORE-39: Strings are not integer
          973cbe86 - CORE-39: fix bug in geo bug fix
          0b094acc - CORE-39: fix roll-up behavior
          ba8adb7f - CORE-39: fix geo links
          d8a74cee - CORE-39: fix NAF creation for acquisitions and transactions
          d54410b7 - CORE-39: fix bad merge
          2630108f - Fixed-alembic-conflict-CORE-39
          75b486c1 - CORE-39: add nginx hydra subdomain for testworker3
          b44142c9 - CORE-39: changes to support new NF in new company profile
          e581e977 - CORE-39: feedback from code review
          1b17ddce - CORE-39: naf module in company profile needs reference spoke
          c41f2428 - CORE-39: force load after announcement is not necessary
          5f6de928 - CORE-39: fix alembic branch
          095e4cd3 - CORE-39: tighten up run_script to only run scripts in /var/axm/qa
          93bbba1c - CORE-39: added "runScript" endpoint in hub for non-prod environments
          74a50711 - CORE-39: forgot a few grand_central references
          8be93cd1 - CORE-39: fix bug with opps that have only 2015 financials; need sockjs url in axial.hydra in frontend
          0c365729 - CORE-39: add test for reference spoke
          4ecdc0dd - CORE-39: changes from code review feedback
          bec31849 - CORE-39: pull in sockjs library locally
          c280e9dc - CORE-39: migration to add indexes for newsfeeditem to make queries faster
          9ec1a55b - CORE-39: integrate NAF UI with new API and Hydra
          53f06c78 - CORE-39: include user id in user info API call (unfortunately used by some NAF UI code)
          65771e74 - CORE-39: remove some duplicated spokes and connect spoke (about to kill connect)
          61b8be6c - CORE-39: bug fixes to hydra
          435e0ff5 - CORE-39: add bridging method to company service to get company names
          671558ce - CORE-39: fix javascript compatibility issue in geography reference data
          8a0c521c - CORE-39: enhancements to NAF api; allow empty arrays for criteria, limit limit to 1000, implement delete
          2d305684 - CORE-39: make sockjs url https
          7fd9e35f - CORE-39: create spoke for reference service data
          b9a771d3 - CORE-39: make newsfeed m2m relationships load eagerly
          a7071d30 - CORE-39: create hydra javascript interface
          1a19f574 - CORE-39: adjust extjs in spokec to not auto-add semicolons, interacts poorly with multiple extjs scripts
          0c5e44bf - CORE-39: remove junk file
          7851c873 - CORE-35: change all save_post calls to create_entity
          74bbd49d - CORE-37: get_naf_data API call
          8463d9d7 - CORE-34: create initial hub service from scaffold
      36d32115
    • Mohammed Mehdi's avatar
      RESP-1269: (merge) Merge RESP-1269 into integration · 8610f24f
      Mohammed Mehdi authored
          639caad5 - RESP-1269: fix filters and review updates
          065a8836 - RESP-1269: finish industry aliases and keywords in typeahead
          a7788c26 - RESP-1269: alias industries name field
          70a7e7ef - RESP-1269: remove shallow copy dict
          78cb7e44 - RESP-1269: display industry aliases in search filters type ahead
          d764d8c5 - RESP-1269: add aliased industries to main searchbar typeahead
      8610f24f
    • Scuba Steve's avatar
    • Ike Garrow's avatar
      INTEGRATION: (merge) Merge integration into master · 130bacf4
      Ike Garrow authored
          d28b9760 - BUGZ-2435: (merge) Merge BUGZ-2435 into integration
          274c582c - BUGZ-2435: hardcode scheme for Prerender to prevent infinite redirect loop
      130bacf4
    • Ike Garrow's avatar
      BUGZ-2435: (merge) Merge BUGZ-2435 into integration · d28b9760
      Ike Garrow authored
          274c582c - BUGZ-2435: hardcode scheme for Prerender to prevent infinite redirect loop
      d28b9760
  2. 06 Feb, 2015 16 commits