Commit graph

464 commits

Author SHA1 Message Date
Eric Schultz
e0c2358d74 Show campaigns list doesn't include child campaigns for non-logged-in users 2019-02-06 13:12:58 -06:00
Eric Schultz
3d1fac1655 Nonprofit page now only shows non-child campaigns 2019-02-06 13:12:56 -06:00
Eric Schultz
6e77a98bff
Merge pull request #150 from houdiniproject/fix_issues_with_deleted_p2p_campaigns
Fix issues with deleted p2p campaigns
2019-02-06 11:13:53 -06:00
Eric Schultz
b234816b99
Merge branch 'master' into fix_issues_with_deleted_p2p_campaigns 2019-02-06 10:52:03 -06:00
Eric Schultz
765e8cb3ff
Merge pull request #149 from houdiniproject/add_grape_devise
Add Grape Devise into gems
2019-02-06 10:50:59 -06:00
Eric Schultz
1adf4d4185 If p2p user wants to recreate a child campaign after delted, we just undelete the old child campaign 2019-02-05 16:58:01 -06:00
Eric Schultz
84a48860e2 Consider deleted campaigns in slug naming 2019-02-05 16:57:45 -06:00
Eric Schultz
0e38e4133a Add Grape Devise into our gems because it's unsupported 2019-02-01 13:15:35 -06:00
Eric Schultz
a5156c2728 Fix incorrectly placed COPYING file 2019-02-01 13:00:57 -06:00
Eric Schultz
7eb12b7506
Merge pull request #148 from houdiniproject/remove_unused_mixins
Remove unused mixins
2019-01-31 16:13:04 -06:00
Eric Schultz
d8c4d12e46 Remove unused mixins 2019-01-31 13:02:31 -06:00
Eric Schultz
6a6508ee84
Merge pull request #144 from houdiniproject/onboard_modal_css_removal
Remove unused onboard_modal css file
2019-01-31 11:36:29 -06:00
Eric Schultz
10510ccb27
Merge branch 'master' into onboard_modal_css_removal 2019-01-30 16:55:07 -06:00
Eric Schultz
fe7f5ff723
Merge pull request #146 from houdiniproject/update_marked
Update Marked
2019-01-30 16:37:07 -06:00
Eric Schultz
27a00f678e Update Marked 2019-01-30 16:10:52 -06:00
Eric Schultz
240f39d95f Remove unused onboard_modal css file 2019-01-30 15:41:13 -06:00
Eric Schultz
2f7ea19622
Merge pull request #143 from houdiniproject/fix_for_name_export
Exporting names now works correctly if there's a space in the end of …
2019-01-30 14:36:23 -06:00
Eric Schultz
638de59cd6 Exporting names now works correctly if there's a space in the end of a name 2019-01-30 14:14:11 -06:00
Eric Schultz
25aea032f0
Merge pull request #142 from houdiniproject/vcr_removal
VCR removal
2019-01-25 20:04:05 -06:00
Eric Schultz
645d89e006 Remove VCR 2019-01-25 17:33:30 -06:00
Eric Schultz
1eebaacdd1
Merge pull request #141 from houdiniproject/unneeded_gems
Remove a few unneeded gems
2019-01-25 17:27:55 -06:00
Eric Schultz
4b9a74de98 Remove VCR 2019-01-25 17:27:29 -06:00
Eric Schultz
a2801892cd Remove a few unneeded gems 2019-01-25 17:08:27 -06:00
Eric Schultz
17ffa8434e
Merge pull request #140 from houdiniproject/fix_bug_in_end_of_year_export
Fix bug in end of year export
2019-01-24 16:31:16 -06:00
Eric Schultz
52aa829ee9
Merge branch 'master' into fix_bug_in_end_of_year_export 2019-01-24 15:37:24 -06:00
Eric Schultz
cd180676c2
Merge pull request #139 from houdiniproject/qx_fix
Fix lateral join in Qx
2019-01-24 14:43:52 -06:00
Eric Schultz
8738849711 Rename a spec properly 2019-01-24 14:34:18 -06:00
Eric Schultz
de5ccb9ce6 End of year report now displays date properly 2019-01-24 14:33:55 -06:00
Eric Schultz
0ae7c9c503 Fix lateral join in Qx 2019-01-24 14:24:00 -06:00
Eric Schultz
f8992794e7
Merge pull request #137 from houdiniproject/p2p_improvements
P2P improvements
2019-01-23 13:59:20 -06:00
Eric Schultz
3b45778225
Merge branch 'master' into p2p_improvements 2019-01-23 13:20:24 -06:00
Eric Schultz
e1cef5be21
Merge pull request #138 from houdiniproject/merged_into
Add merged_into association for Supporter
2019-01-23 11:11:02 -06:00
Eric Schultz
ef216546a2 Correct formatting issue in the campaign profile part of page 2019-01-23 11:09:00 -06:00
Eric Schultz
43ff7fb192 Fix merge bug 2019-01-22 16:44:06 -06:00
Eric Schultz
1392186728 Add merged_into association for Supporter 2019-01-22 16:28:07 -06:00
Eric Schultz
95d5bf734b Correct bug in merging 2019-01-22 16:27:29 -06:00
Eric Schultz
ebea75d279 Remove unneeded where clause 2019-01-22 16:24:10 -06:00
Eric Schultz
73be70b872 Add Campaign Creator email to campaign export report 2019-01-22 16:24:01 -06:00
Eric Schultz
449380f612 P2P campaign creator email is shown in admin emails 2019-01-22 16:23:52 -06:00
Eric Schultz
3d4e65059b P2P campaign creator email is shown in campaign 2019-01-22 16:23:42 -06:00
Eric Schultz
ed28ca9a82 Admin emails now include Campaign Id which makes it easier to understand which P2P campaign the donation came from 2019-01-22 16:23:34 -06:00
Eric Schultz
22ea10c65e Add campaign_id to export 2019-01-22 16:23:20 -06:00
Eric Schultz
bcb84d2aab You can now change your testimonial in your P2P campaign 2019-01-22 16:21:45 -06:00
Eric Schultz
78659cfcb7
Merge pull request #136 from houdiniproject/solargraph
Add solargraph so it works in any tools that use it
2019-01-18 18:28:47 -06:00
Eric Schultz
424cdeb586 Clear up some issues with npm ci 2019-01-18 17:51:17 -06:00
Eric Schultz
c2c1870c21 Correct bug where ci doesn't work as root. Why did it work before? *shrug* 2019-01-18 17:05:20 -06:00
Eric Schultz
e1fd4762a7 Update node-sass to try to fix problem 2019-01-18 14:29:46 -06:00
Eric Schultz
a9967c566c Add solargraph so it works in any tools that use it 2019-01-18 12:55:16 -06:00
Eric Schultz
12374204f0
Merge pull request #135 from houdiniproject/dc_cleanup
Improve docker-compose setup
2019-01-17 12:15:10 -06:00
Eric Schultz
6cea5924bd Improve docker-compose setup 2019-01-17 11:50:55 -06:00