Commit graph

  • 5f2c3b4324
    Merge pull request #105 from houdiniproject/docker-improvement-latest Eric Schultz 2018-11-30 22:00:37 -0600
  • 58c42598e3 Merge branch 'master' into docker-improvement-latest2 Eric Schultz 2018-11-30 21:40:12 -0600
  • 4c8065e98f Fix bugs in spec Eric Schultz 2018-11-30 21:38:45 -0600
  • f8874f49f6
    Merge branch 'master' into docker-improvement-latest Eric Schultz 2018-11-30 20:47:50 -0600
  • 2913191c2a Correct missing license header Eric Schultz 2018-11-27 17:09:06 -0600
  • 8c4b816124 Fix bug where you could get a gift via a donation of an amount which was different from level of gift option level Eric Schultz 2018-11-27 17:02:15 -0600
  • a7867e894d Fix for hash in caption name causing Facebook share to fail Eric Schultz 2018-11-27 13:15:53 -0600
  • b77c8cec41 Now you can add muted to videos in Froala so they can autoplay properly on mobile Eric Schultz 2018-11-27 12:15:26 -0600
  • 8a8942654e Fix bug where events weren't displayable Eric Schultz 2018-11-26 11:55:31 -0600
  • c5557d9fa1 Correct regression where froala was not properly includedwhen requested Eric Schultz 2018-11-23 15:38:40 -0600
  • 2b45d4fd01 Fix regression where non-federated P2P campaigns couldn't be created Eric Schultz 2018-11-23 14:23:49 -0600
  • 0ad9181533 If a campaign is done, P2P campaign link is for the nonprofit, not the campaign Eric Schultz 2018-11-21 17:23:25 -0600
  • d7017db267 You can't use campaign gift options in a child campaign Eric Schultz 2018-11-21 16:18:25 -0600
  • e8d2018c65 Merge branch 'federated_p2p_campaigns' Eric Schultz 2018-11-21 14:47:42 -0600
  • 3c88cce5cd remove unneeded before_filter Eric Schultz 2018-11-21 14:47:20 -0600
  • e877181af7
    Merge pull request #108 from houdiniproject/federated_p2p_campaigns Eric Schultz 2018-11-21 14:34:39 -0600
  • 3a4a960fe8 Fix a few specs Eric Schultz 2018-11-21 14:34:08 -0600
  • 4f27593311
    Merge pull request #107 from houdiniproject/federated_p2p_campaigns Eric Schultz 2018-11-21 14:19:21 -0600
  • e93149d117 Remove redundant "start a new campaign for nonprofit" button on campaign page Eric Schultz 2018-11-21 13:48:53 -0600
  • 8a9f212e9a Remove redudant campaign_template related code Eric Schultz 2018-11-21 13:48:13 -0600
  • f75ffcf09d Fix bug where campaign activites weren't properly found Eric Schultz 2018-11-21 13:47:27 -0600
  • bad7d5ba79 Add language explaining how to reload the P2P creation page if you haven't confirmed as user yet Eric Schultz 2018-11-21 13:00:40 -0600
  • d61a80d92c A P2P page with an nonprofit already set doesn't allow you to change the np on the page Eric Schultz 2018-11-21 12:49:24 -0600
  • eec6744ac0 Readd the ability to find a nonprofit on the p2p campaign page Eric Schultz 2018-11-21 12:48:46 -0600
  • 1bb26cebbf Remove unused stylesheet Eric Schultz 2018-11-21 11:21:06 -0600
  • 92234728ab Payments queries now properly include child campaigns Eric Schultz 2018-11-21 10:44:15 -0600
  • 8a78fad0c7 Various queries now properly include child campaigns Eric Schultz 2018-11-20 16:17:57 -0600
  • 216cefaa98 Remove straggling reference to campaign_templates Eric Schultz 2018-11-20 16:16:37 -0600
  • c4f9176e2a Pull out query for campaign and children Eric Schultz 2018-11-20 13:04:17 -0600
  • 3494ec36f5 remove commentted out code Eric Schultz 2018-11-20 13:01:26 -0600
  • 5b1d6b775c Add index to parent_campaign_id Eric Schultz 2018-11-20 12:22:59 -0600
  • ab773ee48f Campaign metrics on campaign listing page now include child campaign metrics Eric Schultz 2018-11-19 16:15:56 -0600
  • 27877a716c Campaign metrics include child campaign metrics now Eric Schultz 2018-11-19 16:10:56 -0600
  • 478825a47a Improve formatting of p2p campaigns Eric Schultz 2018-11-19 13:53:15 -0600
  • 1c1e62d091 Fix bug where old p2p method of getting there by npo doesn't work Eric Schultz 2018-11-12 11:25:43 -0600
  • cc225ba6fd WIP Eric Schultz 2018-11-08 15:02:35 -0600
  • 87dc491ef4 remove last of campaign template features Eric Schultz 2018-11-08 14:07:39 -0600
  • a838f45cbe remove campaign_template_id from something Eric Schultz 2018-11-08 12:52:24 -0600
  • a79a508ff0 Remove CampaignTemplate model Eric Schultz 2018-11-08 12:51:14 -0600
  • aa4e2c37b7 remove campaign_template in DB Eric Schultz 2018-11-08 12:50:50 -0600
  • f255d6e3ec Simplify the child_campaign? code Eric Schultz 2018-11-08 12:38:02 -0600
  • 64db067e2c Fix lack of styling of campaign banners and properly clips images Eric Schultz 2018-11-07 16:48:34 -0600
  • a3795b6601 remove profile image Eric Schultz 2018-11-07 16:10:46 -0600
  • 293fa1d63a WIP Eric Schultz 2018-11-07 14:48:11 -0600
  • 4dddccdf46 Create from template campaigns handles name collisions Eric Schultz 2018-11-07 14:17:55 -0600
  • 743fd2a15e remove empty spec Eric Schultz 2018-11-07 13:54:46 -0600
  • 4a1f86c121 Fix routes Eric Schultz 2018-11-07 13:53:08 -0600
  • e378434b30 Add in create_from_template call Eric Schultz 2018-11-07 11:43:23 -0600
  • 758cbf1134 Add create_from_template route Eric Schultz 2018-11-07 11:42:53 -0600
  • 9db02dd409 Fix missing tag Eric Schultz 2018-11-07 10:59:04 -0600
  • e2805abb96 Fix some merge issues Eric Schultz 2018-11-07 10:58:41 -0600
  • d711403674 WIP Eric Schultz 2018-11-06 13:03:00 -0600
  • 55171efbc4 Add missing license headers Eric Schultz 2018-11-05 15:53:42 -0600
  • 7d1424e22c Fix typo in Campaign Template Controller Eric Schultz 2018-11-05 15:52:43 -0600
  • 652e808239 Update structure.sql Eric Schultz 2018-11-05 15:51:48 -0600
  • 341d7511d2 Limit editing of child campaigns Kasia Jarmołkowicz 2018-07-06 19:06:39 +0200
  • e5419408ce Fix removing banner image, refactor Kasia Jarmołkowicz 2018-07-05 17:58:00 +0200
  • c713ef343b Let's load uploadBannerImage modal in settings! Kasia Jarmołkowicz 2018-07-05 17:50:56 +0200
  • 77a59b0037 Fix peer-to-peer action Kasia Jarmołkowicz 2018-07-05 16:11:08 +0200
  • ec3ca228a8 Update P2P campaign creation to properly copy the campaign image urls Eric Schultz 2018-07-03 15:06:50 -0500
  • 571c6838d3 Fix structure.sql Kasia Jarmołkowicz 2018-07-03 19:54:00 +0200
  • 5167438f37 Fix migration names Kasia Jarmołkowicz 2018-07-03 18:59:57 +0200
  • 92abc44be0 Remove console.log() Kasia Jarmołkowicz 2018-06-29 18:08:55 +0200
  • b90aac15ad Remove empty spec files Kasia Jarmołkowicz 2018-06-26 18:11:11 +0200
  • d17c54b538 Refactor, specs for creating p2p campaign Kasia Jarmołkowicz 2018-06-26 18:10:54 +0200
  • dc1e8d769e Fixup: make AWS region optional in config Kasia Jarmołkowicz 2018-06-08 15:44:26 +0200
  • 8857cde6c8 Fixup Kasia Jarmołkowicz 2018-06-08 15:27:21 +0200
  • 1944d689cd wip-fix copying images Kasia Jarmołkowicz 2018-05-31 12:44:29 +0200
  • ff484bf106 Remove unused method Kasia Jarmołkowicz 2018-05-30 22:25:27 +0200
  • 6b94b10979 Don't allow to create more than one child campaign per user Kasia Jarmołkowicz 2018-05-30 22:25:16 +0200
  • aaddc721bf Show banner on p2p create page, too Kasia Jarmołkowicz 2018-05-30 21:58:41 +0200
  • 539d8f472a Peer-to-peer editors can only edit goal amount Kasia Jarmołkowicz 2018-05-30 19:45:51 +0200
  • 74ba1cf069 Remove custom_layout from nonprofit Kasia Jarmołkowicz 2018-05-30 19:22:02 +0200
  • 0a5d78b7f4 Remove custom ERB file, add campaigner profile and p2p button to campaign page Kasia Jarmołkowicz 2018-05-30 19:16:24 +0200
  • e948b0ce45 Fix showing default reason in p2p creation form Kasia Jarmołkowicz 2018-05-30 19:15:44 +0200
  • 3167a53da8 Style banner uploading, show banner for all campaings Kasia Jarmołkowicz 2018-05-30 17:35:37 +0200
  • e1287683f5 Better slugs for campaigns Kasia Jarmołkowicz 2018-05-30 17:00:06 +0200
  • 79427774e5 Allow setting banner on campaing Kasia Jarmołkowicz 2018-05-30 16:49:48 +0200
  • dcb4a37585 Add banner to campaigns Kasia Jarmołkowicz 2018-05-30 16:49:18 +0200
  • 9d20974abd wip Kasia Jarmołkowicz 2018-05-29 17:31:55 +0200
  • f621d89d51 Revert "Merge pull request #1 from idengager/staging" Kasia Jarmołkowicz 2018-05-22 23:04:53 +0300
  • e6aa64cb52 Fixup: remove image.host from Settings Kasia Jarmołkowicz 2018-05-22 11:26:48 +0200
  • 546b37f098 Clean up templates, fix main image upload Kasia Jarmołkowicz 2018-05-22 11:25:47 +0200
  • a5bc158628 Show only templates belonging to current nonprofit Kasia Jarmołkowicz 2018-05-21 21:25:03 +0200
  • aedb12ee03 Create campaign from template Kasia Jarmołkowicz 2018-05-21 21:24:13 +0200
  • 2db5e72bcb Add a confirm dialog when deleting templates Kasia Jarmołkowicz 2018-05-18 17:59:17 +0200
  • bb0bebe8f7 Fix loading avatar image Kasia Jarmołkowicz 2018-05-18 17:18:57 +0200
  • d888be0242 Campaign template create, delete Kasia Jarmołkowicz 2018-05-18 17:18:46 +0200
  • abd5fbe63e WIP use s3 without region Kasia Jarmołkowicz 2018-05-18 14:25:07 +0200
  • 02868b5e17 WIP no, seriously fix the bucket address bug Kasia Jarmołkowicz 2018-05-17 23:52:15 +0200
  • f1027ab564 WIP fix aws address issue Kasia Jarmołkowicz 2018-05-17 23:06:24 +0200
  • be98ec94b7 Puts AWS config Kasia Jarmołkowicz 2018-05-17 20:49:27 +0200
  • dd90261d74 Fix migrations name Kasia Jarmołkowicz 2018-05-16 22:01:53 +0200
  • a7f0c809b4 Fixes after merge Kasia Jarmołkowicz 2018-05-16 21:39:27 +0200
  • 399f6ff0c6 Merge branch 'p2p-campaigns' into h-custom-layout Kasia Jarmołkowicz 2018-05-16 21:25:16 +0200
  • b99f7959ce Add CampaignTemplate Kasia Jarmołkowicz 2018-04-11 22:36:23 +0200
  • 9f4a808c20 Add npm support to capistrano configuration Kamil Grabowski 2018-04-26 11:18:26 +0200
  • 2b4ee06832 Add capistrano Kamil Grabowski 2018-04-25 11:31:24 +0200
  • 2526cac4e4 Change ruby version from 2.3.6 to 2.3.x Kamil Grabowski 2018-04-25 11:28:55 +0200
  • 0b065f226d Remove unused javascript Eric Schultz 2018-11-21 11:00:08 -0600