- 13 Jun, 2014 40 commits
-
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Fire Crow authored
Signed-off-by:Fire Crow <firecrow@axial.net>
-
Doug Friedman authored
-
Doug Friedman authored
12a481ab - DATA-7: add nps statlog table -
Doug Friedman authored
-
Fire Crow authored
419e4f97 - RESP-822: load proofing ie's leaving the rest alone! 0d5ae574 - RESP-822: refactoring to expose onload method 7aafff8c - RESP-822: working to send loaded postMessage for ie9 1e2898f8 - RESP-822: finished connect pinned post tests 1898fbb7 - RESP-822: first crack at connect karma tests ebc16643 - RESP-822: moving pinned posts into a spoke 39e9c52e - RESP-822: restricting pinned posts to all activity 971e854b - RESP-822: fixing issue where first_data was called more than once db0b21d0 - RESP-822: fixing some config stuff, changing alembic migration, and adding host_class to test environments 3d0f4c74 - RESP-822: adding vars to test machines for connect ff163fa7 - RESP-822: flushing out front end tests be24af74 - RESP-822: removing debugging code b95de64a - RESP-822: ironing out some positioning rinkles e85654e6 - RESP-822: resolving issues from merge conflicts fbc53bda - RESP-822: making connect-client a spoke for real this time 7caa9c11 - RESP-822: getting auth working fc3451cc - RESP-822: making host name dynamic for connect 85d748d9 - RESP-822: adding docs for javascript services bf5a0b11 - RESP-822: detailing how services work for platypus 1273ff4a - RESP-822: some more work around pinned posts 45535cc0 - RESP-822: got connect working for services JSONP 741bac96 - RESP-822: working on a JSONP able api dbdad96b - RESP-822: adding an error handling decorator and limiting permission to axial users for now fa94799b - RESP-822: more touches to put the example in line bf6386c3 - RESP-822: commenting out services stuff for now 566a4679 - RESP-822: adding in more client libs to start getting to services 61a305bd - RESP-822: more doc stuff 72b17cc7 - RESP-822: first round of doc peremters 9380e98f - RESP-822: error detection of badly loading pages c07fc40c - RESP-822: setting the stage for error tolerant page loads in connect 439d9701 - RESP-822: adding error code handling for backend of connect 0b98741f - RESP-822: blank page 31dcc8f3 - RESP-822: working to have links fire in parent frame d38f1a34 - RESP-822: simplifying insert callback ba4ba5d0 - RESP-822: mid refatoring into spokes e3d27781 - RESP-822: starting to factor out into a spoke 58da0f67 - RESP-822: renaming platypus connect b45f6370 - RESP-822: working to post into the iframe a38bd060 - RESP-822: making the example it's own service b0adfe5f - RESP-822: starting to factor out a library for platypus-client 8d277e82 - RESP-822: getting external links to work 26ee95f6 - RESP-822: adding in postMessage support and delete support fb70cbd8 - RESP-822: mostly debugging setup for platypus test client 3336ca80 - RESP-822: splicing items into the queue for pinned posts c9e0c0c3 - RESP-822: starting to work as a pinned post inside the news feed 493be765 - RESP-822: working to call for naf-pinned-posts from the front end e1d3d028 - RESP-822: platypus callable from naf 301675eb - RESP-822: basic web app for editing platypus configs 8d3d80e7 - RESP-822: beginings of a platypus configuration webapp f003e5aa - RESP-822: adding migration for platypus table e070a28f - RESP-822: revising model for platypus 4c1b74a0 - RESP-822: creating new model 77b783c5 - RESP-822 making standalone service for platypus dcb33be9 - RESP-822: moving platypus front end example into example folder 93fd0281 - PLATYPUS: working with height resizing 90ccbd0d - PLATYPUS: working postMessage into frame 4f2633d5 - PLATYPUS: initial commit w test client Signed-off-by:Fire Crow <firecrow@axial.net> Conflicts: service/connect_example_client/service-src/run.tpl service/connect_example_client/templates/client.html share/migrations/versions/35bd6c76adce_create_platypus_tabl.py share/spokes/js/connect-client.js share/spokes/js/connect.js
-
Fire Crow authored
Signed-off-by:Fire Crow <firecrow@axial.net>
-
Jeff Rand authored
5029414b - RESP-811: karma test boiiiiii a13b3110 - RESP-811: move url spoke into browser e997d8fe - RESP-811: clean up getting user data for loggin 385ce908 - RESP-811: cleanup text c76d4b5c - RESP-811: only axial staff can use the internal api methods i made 120fc179 - RESP-811: fix alembic branching 3cc2a612 - RESP-811: remove grouper-ish things 8256991a - STATIC_URL_PATH to COMPANY_STATIC_URL_PATH 0deeb9fe - RESP-811: remove ikenote TODO fda27cc6 - RESP-811: tests for new company api methods 0d950033 - RESP-811: only one day bff81fe4 - RESP-811: loggin deb26991 - RESP-811: filter out draft companies e2147ff3 - RESP-811: stupid is_draft companies c45cf11f - RESP-811: time range is one day d1003563 - RESP-811: show company and member default png images in emails 143dbf66 - RESP-811: clean up debug code 22cbcdba - RESP-811: styling fix 471f340e - RESP-811: add is_masq to account emails 368cdb07 - RESP-811: damn your outlook 9e6fb50b - RESP-811: fix nginx domain for tw1 80e89268 - RESP-811: add utm variable, company profile actions based on query strings 7be0028e - RESP-811: email template, css, and context code 6df9d745 - RESP-811: company api for call data, new preference, migration -
Scuba Steve authored
c20483bf - LQ-1188: Don't quopri.decodestring everything, use decode_part() -
Jeff Rand authored
5029414b - RESP-811: karma test boiiiiii a13b3110 - RESP-811: move url spoke into browser e997d8fe - RESP-811: clean up getting user data for loggin 385ce908 - RESP-811: cleanup text c76d4b5c - RESP-811: only axial staff can use the internal api methods i made 120fc179 - RESP-811: fix alembic branching 3cc2a612 - RESP-811: remove grouper-ish things 8256991a - STATIC_URL_PATH to COMPANY_STATIC_URL_PATH 0deeb9fe - RESP-811: remove ikenote TODO fda27cc6 - RESP-811: tests for new company api methods 0d950033 - RESP-811: only one day bff81fe4 - RESP-811: loggin deb26991 - RESP-811: filter out draft companies e2147ff3 - RESP-811: stupid is_draft companies c45cf11f - RESP-811: time range is one day d1003563 - RESP-811: show company and member default png images in emails 143dbf66 - RESP-811: clean up debug code 22cbcdba - RESP-811: styling fix 471f340e - RESP-811: add is_masq to account emails 368cdb07 - RESP-811: damn your outlook 9e6fb50b - RESP-811: fix nginx domain for tw1 80e89268 - RESP-811: add utm variable, company profile actions based on query strings 7be0028e - RESP-811: email template, css, and context code 6df9d745 - RESP-811: company api for call data, new preference, migration Conflicts: etc/release/testworker1.axialmarket.com/axial.local etc/tpl/exturl.json.tpl service/company/api/v1.py service/company/static/js/profile.js service/platform/account/emails.py service/platform/preferences/__init__.py share/migrations/versions/4bbef64f3d7d_add_email_profile_vi.py -
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Nader Hendawi authored
9fc2deef - Merge branch 'master' into LQ-1139 1bedbaec - LQ-1139: Add karma to make test -
Scuba Steve authored
Signed-off-by:Scuba Steve <steve.fusaro@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Jeff Rand authored
Signed-off-by:Jeff Rand <jeff.rand@axialmarket.com>
-
Nader Hendawi authored
9232bed7 - BUGZ-1529: merge master d42f233c - BUGZ-1529: merge conflict fb1ee9fe - BUGZ-1529: deurlify announcemnt text when clicking 'Also post to LinkedIn' cf31f152 - BUGZ-1529: swap out and replace text for linkedin share 5b5075de - BUGZ-1529: URLize and DE-URLize js functions for NAF LinkedIn share