summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-05-03use APP_CONFIG[config_file_paths] for provider.jsonAzul
This avoids overwriting the PROVIDER_JSON constant in the StaticConfigController and thus fixes test warnings. Also moved away from using instance variables in the ControllerExtension::JsonFile - instead querying the corresponding functions now - less sideeffects and easier stubbing.
2016-05-03fix failing unit and functional testsAzul
2016-05-02use icon helper from navigation helperAzul
and use content_tag inside the icon helper... html_safe is evil.
2016-05-02upgrade: bootstrap control-group -> form-groupAzul
2016-05-02upgrade: fix buttons for bootstrap3Azul
bootstrap3 now requires btn-default if no other btn option is present. download button on home page was too small in german translation
2016-05-02upgrade bootstrap3 icons work nowAzul
import bootstrap-sprockets; before importing bootstrap in the scss. bootstrap now uses glyphicons which are based on fonts. So we always should use a span. Not sure what to do with big and huge icons yet.
2016-05-02upgrade: use bootstrap3 row and col-md-*Azul
2016-05-02upgrade: {File,Dir}.exists? -> exist?Azul
exists? is deprecated in ruby 2.1
2016-05-02upgrade: add formbuilder wrapper for bootstrapAzul
Not sure if this does what we need. But for now it fixes the tests
2016-05-02upgrade: typeahead is not in bootstrap3 anymoreAzul
using twitter/typeahead instead which seems to have similar properties
2016-05-02upgrade: use bootstrap3 variable names in leap.scssAzul
2016-05-02update: stop refering to bootstrap2 ie7 hackAzul
2016-05-02upgrade: bootstrap 3 does not have -responsiveAzul
We can also remove the backports now. :)
2016-05-02upgrade: remove references to RestClientAzul
CouchRest > 1.2 does not use RestClient anymore. So we should not try to catch its errors.
2016-04-11allow monitor auth to create users even if invites are normally required.elijah
2016-04-01api: added super simple motd, closes #7866elijah
2016-03-30api: return proper 404 for GET /1/identities/:id.jsonelijah
2016-03-30api: added json error pages, allow "." in the :id param of all api routeselijah
2016-03-28api: added get(:show) to identities and users, allow monitors to ↵elijah
create/delete test & tmp users.
2016-03-28api: added allow ability to limit what IPs can access api using a static ↵elijah
configured auth token.
2016-03-28api tokens - clarify terms: "monitors" are admins that authenticated via api ↵elijah
token, "tmp" users are users that exist only in tmp db, "test" users are either tmp users or users named "test_user_x"
2016-03-28api tokens: allow for special api tokens that work like session tokens but ↵elijah
are configured in the static config, to be used for infrastructure monitoring.
2016-03-19Handle conflict on token cleanup - fixes #7670Azul
the only race condition I can think of here is this... somebody tries to authenticate with a token that is almost expired. auth checks and notices it is not expired yet so starts to prolonge it. Before the polonged token is written to the db the cleanup script discovers that it has just expired. prolonged token is written to the db cleanup script fails to delete it from the db as it has been updated. So what we want in this case is to keep the token alive as it was renewed in the last minute.
2016-02-10allow user accounts to be re-enabled, and for associated identities to also ↵elijah
get re-enabled.
2016-01-31remove cert fingerprints for disabled users, so that they cannot send email ↵elijah
anymore. closes #7690
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-10highlight admin areas with caution tape (wip)elijah
2016-01-10fix user listelijah
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-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-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-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-06Integrated feedback on multi-invite codesankonym
Removing some superfluous code, mostly, and structuring tests better.
2015-10-05deleted commentclaucece
2015-10-05add a comment regarding homeclaucece
2015-10-05add subscriptionsclaucece
2015-10-05changed routes and linksclaucece
2015-10-05subscriptions, translationclaucece
2015-10-05subscriptions, haml and translationsclaucece
2015-10-05added customers, recurring payment and payment_infoclaucece
2015-10-05correctly set up commentsclaucece
2015-10-05added payment_info, _customer_form, sucess instancesclaucece