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

  1. 26 Jan, 2015 15 commits
  2. 23 Jan, 2015 3 commits
  3. 22 Jan, 2015 3 commits
    • Ike Garrow's avatar
      INTEGRATION: (merge) Merge integration into master · f1a253f6
      Ike Garrow authored
          e03a752e - fix for company first touch wizard
      f1a253f6
    • Nader Hendawi's avatar
      fix for company first touch wizard · e03a752e
      Nader Hendawi authored
      Signed-off-by: default avatarNader Hendawi <nader.hendawi@axial.net>
      e03a752e
    • Ike Garrow's avatar
      INTEGRATION: (merge) Merge integration into master · 49faf6ff
      Ike Garrow authored
          e2300122 - RESP-1261: (merge) Merge remote-tracking branch 'origin/RESP-1261' into integration
          ca8f8b9a - JJIA: fix branching alembic heads
          7598a1f5 - BUGZ-2375: Merge remote-tracking branch 'origin/BUGZ-2375' into integration
          23692692 - BUGZ-2375: Prevent integrity errors when syncinc SFDC owners
          9eec4edd - BUGZ-2385: (merge) Merge BUGZ-2385 into integration
          7f2bcd71 - GROW-117: (merge) Merge GROW-117 into integration
          2d56d4ac - GROW-117: company tp test change
          2ff9028f - BUGZ-2385: Removed redundant logging
          407c9381 - GROW-117: (merge) Merge GROW-117 into integration
          65989cb3 - BUGZ-2385: Being more defensive and logging the invalid tp ids in the sear
          1044d43d - RESP-1261: address review comments on the log.exception message
          a0e1302a - Merge remote-tracking branch 'origin/integration' into integration2
          8be125d6 - integration: add index_active is true filter to get_active_tps
          2273996f - RESP-1261: add exception handle logic when query sear
          da2a911e - BUGZ-2385: Remove the unused module
          82d3f6f5 - BUGZ-2385: Wrote tests for the params that breaks the sear backend
          4f349c8b - integration: add index_active is true filter to get_active_tps
          69d20d6f - BUGZ-2385: Handle the exception that rec raises and put another check in the SimilarityPostingSource to be more defensive on the errors where the weight vector can be None
          15241ad6 - BUGZ-2385: Check both vectors before distance computation
          3e4f3305 - CORE-53: (merge) Merge CORE-53 into integration
          95da1122 - BUGZ-2281: (merge) Merge BUGZ-2281 into integration
          1401a961 - BUGZ-2383: (merge) Merge BUGZ-2383 into integration
          d94ab369 - LQ-1402: (merge) Merge LQ-1402 into integration
          a60ab6b6 - CORE-53: neglected to account for bash string interpolation
          35d4dd67 - CORE-53: set staff dimension if olark login details have @axial.net email address
          0ffd4c70 - GROW-117: update transaction profile spec mock
          756ad78e - GROW-117: most recent financials for opps logic
          b0ef0402 - GROW-117: message modal success message, addthis race
          716e47fd - GROW-117: header scss, message upgrade modal company name
          e571f1a3 - GROW-117: more localization strings
          10e420e1 - GROW-117: Code Review updates
          2bf5a012 - GROW-117: Localization Updates
          f88e91f1 - CORE-53: also fixed test1 sendgrid credentials
          41aa6ec3 - CORE-53: implement Universal Analytics, remove old google analytics
          3ae4243d - LQ-1402: code review comments
          020f30da - BUGZ-2383: include "success" key in send_message_modal response for structured messages
          6fa8cba9 - LQ-1402: update logic for opp financial info. display
          d0132a81 - RESP-1251: (merge) Merge RESP-1251 into integration
          95d07241 - RESP-1252: (merge) Merge RESP-1252 into integration
          5c097743 - integration: fix alembic branch issue
          9f1618af - RESP-1252: adjust the order of downgrade operations
          dd41beec - RESP-1252: turn Company Introductions On
          becbf4e0 - RESP-1174: (merge) Merge RESP-1174 into integration
          aca24eea - Merge branch 'RESP-1174' into RESP-1251
          8203e2b5 - RESP-1174: use UTC in cron job and adjust the send_on to send emails at 8:30 AM
          f90d60e8 - Merge branch 'RESP-1174' into RESP-1251
          19eb3a9d - BUGZ-2382: (merge) Merge BUGZ-2382 into integration
          8c3eea0d - RESP-1174: treat string as unicode
          2dffabf5 - RESP-1252: adjust the order of downgrade operations
          dd816077 - CORE-52: (merge) Merge CORE-52 into integration
          a0001fdf - RESP-1251: update based on cr and fix not_id
          f4e046cf - RESP-1252: turn Company Introductions On
          770d4025 - BUGZ-2281: reference template in RESOURCES
          b5c2c1e2 - BUGZ-2382: Log more details when an OAuth2Error occurs
          85fb61ca - BUGZ-2382: Correct SQLAlchemy model for oauth_tokens
          e31a2038 - RESP-1251: forgot closing braces
          7d9c2d90 - Merge branch 'RESP-1174' into RESP-1251
          da4c157f - RESP-1174: undefined from code review
          546be1d8 - CORE-37: (merge) Merge CORE-37 into integration
          fb904b8e - CORE-37: only run grand central tests from service
          fe882c03 - RESP-1174: non-intro msg restore and update status once email is sent
          a8761372 - CORE-37: (merge) Merge CORE-37 into integration
          3e68b55a - CORE-52: add company public id to newsfeed entity, set it based on created_by user
          d19ba4f8 - GROW-117: localization for empty text in tps opps and industries
          dd379d42 - GROW-117: message modal upgrade modal
          eff59f20 - GROW-117: call cta modal
          fb2c3b82 - RESP-1251: convert to company_db id for sear
          b34ac862 - CORE-37: move NAF endpoint to naf.py
          8446eb42 - RESP-1251: pass previously messaged companies to not_id
          4da1f759 - GROW-117: company opps and tps initial state when results == limit, beginning Localization Service
          6ea5c54c - CORE-37: changes from code review
          5e9e09f1 - LQ-1402: update latest_yearly_financial
          dbbb0d3f - CORE-37: created test for naf data, added some indexes, fixed some bugs
          f138df91 - CORE-37: get_naf_data API call
          d578eaf7 - CORE-34: create initial grand central service from scaffold
          9120a8d5 - RESP-1174: remove testing line in bin script
          d0273dda - RESP-1174: make names consistent in message-center.js
          140d40df - RESP-1174: update comp intro on message sent from email
          ecbfbd9c - GROW-117: tp is_active flag
          290f5803 - GROW-117: company locations, also viewed and endorsements modules
          4c7674bf - RESP-1174: fix imports, picture_url, and cron script call
          42703a2a - GROW-117: a little clean up
          acf9350b - GROW-117: csrf config for , cta utm params
          e940dd42 - GROW-117: Team Reordering status
          93498b22 - GROW-117: call button spec, header type switching
          0bebf27c - GROW-117: resolve conflict and issue with contact formatting
          0062704f - GROW-117: merge master
          da2a5210 - GROW-117: next param for public sign up links
          d673ec65 - GROW-117: call, message, contact button utm signup page
          9258b829 - GROW-117: investment signup utm
          dc7b10de - GROW-117: transaction and company naf signup utm link
          649d2b7f - GROW-117: opp and naf signup utm
          50f23309 - GROW-117: utm params for tp
          14b4b062 - GROW-117: ng debug bar
          c597d6e9 - RESP-1174: add send_on param when send emails
          15ec2a8a - RESP-1174: cr clean up and update email copy
          e0c2e82e - GROW-117: debug bar, livereload
          96b90a55 - RESP-1174: add cron monitor
          322b5edd - Merge branch 'RESP-1174' of github.com:axialmarket/axm into RESP-1174
          0c5c5813 - RESP-1174: fix picture_url imports in platform
          e5101bdb - RESP-1174: prune bin script args and cut out picture_url()
          f6d1419f - GROW-117: also viewed thumb png, transaction company name css
          9c146526 - GROW-117: updated spinner, showmore/less logic for transactions and opps
          1b27eda5 - Merge branch 'RESP-1174' of github.com:axialmarket/axm into RESP-1174
          99462cf5 - RESP-1174: add bin script as a cron job
          75c087b1 - RESP-1174: convert set up a time to contact button
          b175a6f8 - Merge remote-tracking branch 'origin/master' into RESP-1174
          bfebbd09 - RESP-1174: housekeeping imports
          51c097ad - GROW-117: updated tp and opp wizards
          d590eddf - RESP-1174: clean up email template formatting
          9a5b7b94 - Merge branch 'integration' into RESP-1174
          76ab93c9 - GROW-117: public auth redirects
          1c58964b - RESP-1174: remove empty platform call
          d49c08bc - RESP-1174: add comment flagging auth hack
          8c4249e5 - RESP-1174: remove all django residue from company intro
          d1de8a0f - RESP-1174: remove django residue from company_intro
          0a6b5d84 - RESP-1174: more clean up migrate picture formatting from platform
          fe2f544d - RESP-1174: clean up api calls and user slug
          e52fe586 - RESP-1174: TEMP COMMIT API CALL TO AMS
          0c1e4135 - RESP-1174: rename email data parse file
          8b30ed81 - GROW-117: unendorsing, admin stats css
          9939a573 - RESP-1174: updates from code review
          5151fb57 - GROW-117: range text for tps, public cta, recent announcements
          147bd547 - Merge remote-tracking branch 'origin/master' into RESP-1174
          30995ba2 - RESP-1174: remove front end checks for intro length matches
          ef13e25f - RESP-1174: remove other extra bin script
          bc54b92f - RESP-1174: remove extra company_intro script
          4f942b88 - Merge remote-tracking branch 'origin/RESP-1232' into RESP-1174
          ef4e17ca - RESP-1174: fix already know entity service update
          f6492ca4 - Merge branch 'RESP-1172' into RESP-1174
          3adaa1b9 - GROW-117: help text copy changes
          29155bf7 - GROW-117: transaction flip and link
          dc733f9c - GROW-117: default opps and transaction load-more behavior
          79ef0aaf - GROW-117: admin module scss
          433f8da5 - GROW-117: return contact_public_id for members, update add-contact-button
          f0d366eb - RESP-1174: fix company profile link
          e2792e0b - REPS-1174: work out bugs in orchestration and template.  already_know broken
          933451b5 - Merge branch 'RESP-1181' of github.com:axialmarket/axm into RESP-1174
          f9299f4f - RESP-1174: refactor bin script with remote_api and db_session
          1e5a434f - Merge branch 'master' into GROW-117
          05eefb97 - GROW-117: header directive links
          f6bfb542 - GROW-117: fixing permissions in common
          3767952a - GROW-117: Fix permissions in static and vendor
          0a691bb8 - GROW-117: fix permissions in front/src
          9690af27 - GROW-117: updated company api, profile scss
          200523e6 - GROW-117: Message Modal copy, profile asana scss
          4298bfe7 - GROW-117: new profile modules, asana tweaks
          1378cc27 - Merge branch 'RESP-1181' of github.com:axialmarket/axm into RESP-1174
          79277fad - RESP-1174: update bin script
          6bd72075 - RESP-1181: get_company_introduction return CompanyIntroduction modles
          dd003674 - Merge branch 'master' into GROW-117
          9f7f7429 - GROW-117: header spoke
          2add125d - GROW;117: load more directve + specs
          66c8bc96 - Merge branch 'RESP-1181' into RESP-1174
          4034beb6 - RESP-1174: refactor for new db_session api
          65df8ee3 - RESP-1174: update db_session and refactor
          0ba8af8a - RESP-1174: add single fetch intro method for development
          b3cd31b3 - RESP-1174: update orchestration layer
          61a4c32e - RESP-1174: update template with new variable names
          c4d8ac56 - RESP-1174: clean up template orchestration layer
          a60a4eef - GROW-117: auth element directive
          992d517a - GROW-117: addthis widget
          036a19eb - RESP-1174: begin bin script re-write and move map to separate file
          0af25495 - Merge branch 'RESP-1181' into RESP-1174
          1b914968 - GROW-117: read more directive + specs
          d6fcf2b4 - GROW-117: message modal refactor
          4975ea27 - GROW-117: company fallback src, transaction css
          86fb9d21 - GROW-117: updated modal css, contact button spec, pop-tip directive
          2b4842b8 - Merge remote-tracking branch 'origin/master' into RESP-1174
          2d4b2e87 - GROW-117: Endorsements in aggregate profile view, updated icons
          ba3ba3d7 - RESP-1174: script is sending email with batches
          0650939a - GROW-117: updating jasmine, transaction directive + tests
          e69dcfc4 - RESP-1172: update entity from already know
          a98a0c67 - Merge branch 'RESP-1181' into RESP-1172
          e1d30bfd - Merge branch 'RESP-1171' into RESP-1172
          c817218c - RESP-1171: fix message modal logging
          497bbd81 - GROW-117: empty state stuff
          9c8cc559 - GROW-117: profile css
          84b7c137 - GROW-117: company profile controller spec
          23e0df37 - GROW-117: mock company naf response
          88471d43 - GROW-117: testing config + mocks
          6dd56446 - RESP-1171: fix phone number formatting
          da4a408b - GROW-117: starting karma config
          f7684f64 - Merge branch 'RESP-1171' into RESP-1174
          e5c44e66 - Merge branch 'RESP-1181' into RESP-1174
          48b3b24b - RESP-1171: fix spacing and date display
          6370d072 - GROW-117: opp financials ui
          8052791f - RESP-1171: fix comment
          c03e0278 - RESP-1171: shave height on set up a time button
          80756572 - RESP-1171: improvements from qa
          1245aaef - RESP-1171: fix image spacing in outlook
          d84cd1a9 - RESP-1171: polish spacing
          248214c4 - RESP-1171: fix spacing and revisions from review
          317df818 - Merge branch 'master' into GROW-117
          5915d92e - RESP-1171: revisions from code review
          5326a02d - RESP-1171: revise styling for outlook
          04b2076c - GROW-117: profile css updates
          36351e86 - GROW-117: company naf styling
          a7ce8edf - GROW-117: drag and drop wip, tooltip on add to contacts
          29799e4a - GROW-117: use platform research book api
          9ff3b4d7 - Merge remote-tracking branch 'origin/GROW-118' into GROW-117
          ca408be1 - GROW-117: add contact button
          5fb9b06e - RESP-1171: begin outlook refactor
          87440fff - RESP-1171: fix border length
          225f4735 - GROW-118: Add 'add member as contact' JSON-RPC method
          da415184 - GROW-117: company naf posts
          017bb955 - GROW-117: defer get_company_opps and tps
          581cc6a0 - RESP-1171: already know link updates the comp intro obj
          2312cd31 - GROW-117: call modal directive
          d8aee3e4 - RESP-1171: already know link
          2f51e6c1 - Merge branch 'RESP-1170' into RESP-1169
          75371a72 - RESP-1169: notification sender
          4f21103f - GROW-117: tp financials object
          5545c895 - RESP-1170: message modal loads
          6c55fc54 - GROW-117: team module
          2bbe7fc4 - GROW-117: updating tp api
          a51e82aa - RESP-1170: send msg links to company profile no modal
          22360f86 - GROW-117: backend api
          6e88a58c - Merge remote-tracking branch 'origin/GROW-105' into GROW-117
          af6e3907 - GROW-117: updated jsonrpc decorator
          2d2276de - Merge branch 'RESP-1169' into RESP-1170
          d21a2c78 - RESP-1169: fix date and footer
          bf79a1da - GROW-105: Add aggregating api method in company service.
          13a105c8 - GROW-105: Add in_contacts key when fetching team in company info.
          83137d53 - GROW-117: Front end wip for company profile
          ea9c813c - RESP-1169: fix subject line
          2a8203c7 - RESP-1169: updates from cr
          ee3dc061 - RESP-1169: email design and helper script for testing
      49faf6ff
  4. 21 Jan, 2015 19 commits