Eric Schultz
|
c5557d9fa1
|
Correct regression where froala was not properly includedwhen requested
|
2018-11-23 15:38:40 -06:00 |
|
Eric Schultz
|
2b45d4fd01
|
Fix regression where non-federated P2P campaigns couldn't be created
|
2018-11-23 14:23:49 -06:00 |
|
Eric Schultz
|
0ad9181533
|
If a campaign is done, P2P campaign link is for the nonprofit, not the campaign
|
2018-11-21 17:23:25 -06:00 |
|
Eric Schultz
|
d7017db267
|
You can't use campaign gift options in a child campaign
|
2018-11-21 16:18:25 -06:00 |
|
Eric Schultz
|
e8d2018c65
|
Merge branch 'federated_p2p_campaigns'
|
2018-11-21 14:47:42 -06:00 |
|
Eric Schultz
|
3c88cce5cd
|
remove unneeded before_filter
|
2018-11-21 14:47:20 -06:00 |
|
Eric Schultz
|
e877181af7
|
Merge pull request #108 from houdiniproject/federated_p2p_campaigns
Fix a few specs
|
2018-11-21 14:34:39 -06:00 |
|
Eric Schultz
|
3a4a960fe8
|
Fix a few specs
|
2018-11-21 14:34:08 -06:00 |
|
Eric Schultz
|
4f27593311
|
Merge pull request #107 from houdiniproject/federated_p2p_campaigns
Federated P2P campaigns
|
2018-11-21 14:19:21 -06:00 |
|
Eric Schultz
|
e93149d117
|
Remove redundant "start a new campaign for nonprofit" button on campaign page
|
2018-11-21 13:49:15 -06:00 |
|
Eric Schultz
|
8a9f212e9a
|
Remove redudant campaign_template related code
|
2018-11-21 13:48:13 -06:00 |
|
Eric Schultz
|
f75ffcf09d
|
Fix bug where campaign activites weren't properly found
|
2018-11-21 13:47:27 -06:00 |
|
Eric Schultz
|
bad7d5ba79
|
Add language explaining how to reload the P2P creation page if you haven't confirmed as user yet
|
2018-11-21 13:00:40 -06:00 |
|
Eric Schultz
|
d61a80d92c
|
A P2P page with an nonprofit already set doesn't allow you to change the np on the page
|
2018-11-21 12:49:24 -06:00 |
|
Eric Schultz
|
eec6744ac0
|
Readd the ability to find a nonprofit on the p2p campaign page
|
2018-11-21 12:48:46 -06:00 |
|
Eric Schultz
|
1bb26cebbf
|
Remove unused stylesheet
|
2018-11-21 11:21:06 -06:00 |
|
Eric Schultz
|
92234728ab
|
Payments queries now properly include child campaigns
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
8a78fad0c7
|
Various queries now properly include child campaigns
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
216cefaa98
|
Remove straggling reference to campaign_templates
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
c4f9176e2a
|
Pull out query for campaign and children
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
3494ec36f5
|
remove commentted out code
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
5b1d6b775c
|
Add index to parent_campaign_id
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
ab773ee48f
|
Campaign metrics on campaign listing page now include child campaign metrics
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
27877a716c
|
Campaign metrics include child campaign metrics now
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
478825a47a
|
Improve formatting of p2p campaigns
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
1c1e62d091
|
Fix bug where old p2p method of getting there by npo doesn't work
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
cc225ba6fd
|
WIP
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
87dc491ef4
|
remove last of campaign template features
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
a838f45cbe
|
remove campaign_template_id from something
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
a79a508ff0
|
Remove CampaignTemplate model
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
aa4e2c37b7
|
remove campaign_template in DB
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
f255d6e3ec
|
Simplify the child_campaign? code
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
64db067e2c
|
Fix lack of styling of campaign banners and properly clips images
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
a3795b6601
|
remove profile image
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
293fa1d63a
|
WIP
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
4dddccdf46
|
Create from template campaigns handles name collisions
|
2018-11-21 11:00:45 -06:00 |
|
Eric Schultz
|
743fd2a15e
|
remove empty spec
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
4a1f86c121
|
Fix routes
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
e378434b30
|
Add in create_from_template call
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
758cbf1134
|
Add create_from_template route
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
9db02dd409
|
Fix missing tag
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
e2805abb96
|
Fix some merge issues
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
d711403674
|
WIP
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
55171efbc4
|
Add missing license headers
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
7d1424e22c
|
Fix typo in Campaign Template Controller
|
2018-11-21 11:00:44 -06:00 |
|
Eric Schultz
|
652e808239
|
Update structure.sql
|
2018-11-21 11:00:44 -06:00 |
|
Kasia Jarmołkowicz
|
341d7511d2
|
Limit editing of child campaigns
|
2018-11-21 11:00:44 -06:00 |
|
Kasia Jarmołkowicz
|
e5419408ce
|
Fix removing banner image, refactor
|
2018-11-21 11:00:44 -06:00 |
|
Kasia Jarmołkowicz
|
c713ef343b
|
Let's load uploadBannerImage modal in settings!
|
2018-11-21 11:00:44 -06:00 |
|
Kasia Jarmołkowicz
|
77a59b0037
|
Fix peer-to-peer action
|
2018-11-21 11:00:44 -06:00 |
|