summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-10allow user accounts to be re-enabled, and for associated identities to also ↵elijah
get re-enabled.
2016-02-02use RUBY_VERSION instead of :platform for Gemfile (since jessie has a really ↵elijah
old bundler)
2016-02-01disable failing cucumber test (leap_web is doing the right thing, the test ↵elijah
is just weird).
2016-02-01internet says that bundler on travis might be what is causing test fail, so ↵elijah
force install the lastest one.
2016-01-31remove cert fingerprints for disabled users, so that they cannot send email ↵elijah
anymore. closes #7690
2016-01-31vendor certificate_authority, because travis does not like pulling it from ↵elijah
github.
2016-01-31travis ci does not support :platform => :ruby_22, so remove for now.elijah
2016-01-31enable byebug for testselijah
2016-01-16change the default of config.assets.debug for development env.elijah
2016-01-16fix ticket display bugelijah
2016-01-16retain locale in URL when logging in and signing up, and ajax actions in ↵elijah
general.
2016-01-14added UI for invite codeselijah
2016-01-10added caution tape img.elijah
2016-01-10highlight admin areas with caution tape (wip)elijah
2016-01-10fix user listelijah
2016-01-10minor update to docselijah
2016-01-10Merge branch 'remove_couponcode' into developelijah
2016-01-10Merge branch 'remove_couponcode' of ↵elijah
https://github.com/Alster-Hamburgers/leap_web into remove_couponcode # Conflicts: # lib/tasks/invite_code.rake
2015-11-05set rbenv pin to 2.1.5elijah
2015-10-19Merge pull request #204 from pixelated/fix_payment_checkazul
[bug] Only show donation if payment present
2015-10-19[bug] Only show donation if payment presentFolker Bernitt
2015-10-19Merge pull request #198 from claucece/developazul
Braintree_implementation
2015-10-19Merge pull request #196 from EvyW/developazul
Admin - Ability to enable/disable user
2015-10-14Reverting submodule updateclaucece
2015-10-13Merge pull request #201 from Alster-Hamburgers/multi-inviteazul
Allow multi-use invite codes
2015-10-13Cleaned up last traces of the Great Git Messankonym
Removed the parts related to multi-use invite codes (those are in a separate pull request) - I hope this is all correct now! Sorry for the confusion.
2015-10-13Remove Coupon Code gem and make invite code = idankonym
Id is set = invite code to make it easier to delete the invite codes that get created during the leap platform tests (because this avoids having to look up ttheir id each time).
2015-10-13Replace Coupon Code gem for invite code creationankonym
Replacing the Coupon Code gem with base64/securerandom as suggested by Elijah.
2015-10-13Remove Coupon Code gem and make invite code = idankonym
Id is set = invite code to make it easier to delete the invite codes that get created during the leap platform tests (because this avoids having to look up ttheir id each time).
2015-10-13Remove Coupon Code gem from Gemfileankonym
2015-10-13Replace Coupon Code gem for invite code creationankonym
Replacing the Coupon Code gem with base64/securerandom as suggested by Elijah.
2015-10-13Fix the InviteCode initialize method so leap_web tests stay greenankonym
2015-10-13Adjust the rake task to make id = invite codeankonym
This will simplify invite code deletion after running tests.
2015-10-12Adjusted the rake task with comments by @azulankonym
Basically made the code a bit prettier :)
2015-10-06Small code cleanup in the rake taskankonym
2015-10-06Cleaned up invite code output for platform testsankonym
This still had some test output that gets in the way of easy printing and a LEAP platform test
2015-10-06Adjust rake task with renamed max_usesankonym
2015-10-06Integrated feedback on multi-invite codesankonym
Removing some superfluous code, mostly, and structuring tests better.
2015-10-05updated version of fakebraintreeclaucece
2015-10-05changed capybara timeclaucece
2015-10-05fixed gem fileclaucece
2015-10-05add test to payments and subscriptionsclaucece
2015-10-05deleted commentclaucece
2015-10-05questions addedclaucece
2015-10-05readmeclaucece
2015-10-05updated readmeclaucece
2015-10-05add a comment regarding homeclaucece
2015-10-05update to haml, created translations, deleted filesclaucece
2015-10-05add subscriptionsclaucece
2015-10-05add subs_index and start showclaucece