summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-08-12move temporary_user into lib - fix load issueAzul
We already did the same for other concerns. The way we load models for couchrest migrations does not work well with concerns in the model directory as they will be loaded twice.
2016-07-14[feature] restrict is_admin in the user api, to only allow queryingNavaL
for him/herself So that it we do not expose the is_admin property to anyone else including other admins.
2016-07-14Merge branch 'develop' of https://github.com/leapcode/leap_web into ↵NavaL
feature/expose_admin_in_api
2016-07-12bugfix: require local email in user modelAzul
2016-07-05Fix db:migrate and similar tasksAzul
We saw errors from duplicate loading of LocalEmail and LoginFormatValidation. The latter resulted in a crash. In an attempt to ensure all subclasses of Couchrest::Model::Base are loaded Couchrest::Model::Utils::Migrate requires all files in app/models. We have an extension that does the same for the engines. During this process LoginFormatValidation and LocalEmail were autoloaded when 'identity' was required. Afterwards they were required again. It looks like rails' autoload mechanism does not play nicely with require. So to make sure they are not autoloaded first move the concerns and helper classes into the lib directory and require them explicitly.
2016-06-22[feature] expose is_admin in the user apiNavaL
So that whoever consumes the API can use this attribute to determine if admin functionalities should be made available to the current user.
2016-05-23rename destroy_identity to release_handlesAzul
This expresses the intent rather than the implementation. Also replace temp with query refactoring.
2016-05-23move signup from users to account_controllerAzul
There was a lot of special case handling going on in the users_controller for this. Lot simpler this way.
2016-05-23cleanup: remove service level code from users_controllerAzul
There's no route to this right now and it also seems to be tested nowhere. Since i am about to split up the users_controller let's get rid of this and put it in the place we want it once we actually finish the implementation
2016-05-23restrict user_params in user_controllerAzul
Actually this should live in a service_level_controller. For now fix the security issue.
2016-05-18features for API version 2 - keep old onesAzul
Now we test both api versions. We want this for backwards compatibility.
2016-05-18api: allow version bumping - bump to 2Azul
2016-05-14ensure invalid user ids still render the ticket formAzul
We still have strange urls requested like /pt/users/AnonymousUser.../tickets/new Not sure where they are coming from - but this should make sure we respond with sth. meaningful instead of erroring out. Conflicts: app/views/layouts/_content.html.haml
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).