summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-20enable billing engine by default, consolidate APP_CONFIG[:payments] and ↵elijah
APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree]
2013-12-19Update translation to reflect what you can actually change in your account.jessib
2013-12-19Merge branch 'bugfix/4786_ticket_comment_format' into developjessib
2013-12-17This won't necessarily preserve exact formatting (for example, if there are ↵jessib
multiple blank lines in a row), but seems standard way to do it and maybe sufficient?
2013-12-17Merge branch 'develop' into feature/billing-no-authenticated-paymentsjessib
Conflicts: billing/config/locales/en.yml
2013-12-17Merge pull request #125 from azul/feature/catch-all-couch-exceptionsjessib
catch all rest client exceptions during initialization
2013-12-17catch all rest client exceptions during initializationAzul
2013-12-17Merge pull request #124 from jessib/feature/bugfix4756_login_crashazul
Feature/bugfix4756 login crash
2013-12-16Add test.jessib
2013-12-16Fix issue 4756: /login should not crash if one goes there when logged in.jessib
2013-12-16Merge pull request #123 from azul/refactor/standartize-user-routesjessib
refactor: remove Overview controller - we can use Users#show
2013-12-16Merge pull request #122 from azul/bugfix/4703-disable-unsupported-settingsjessib
Bugfix/4703 disable unsupported settings
2013-12-16Merge pull request #121 from azul/feature/robust-against-couch-connection-issuesjessib
Feature/robust against couch connection issues
2013-12-13refactor: remove Overview controller - we can use Users#showAzul
we were only using Users#show to redirect to the edit action. So I replaced that with the overview and we have no more use for the extra controller. This also simplifies linking to the users in question a lot.
2013-12-13make the possible actions for users and admins configurableAzul
with tests
2013-12-13refactor: move edit sections into partialsAzul
2013-12-13proceed even if the couch is unreachableAzul
* in case the user has a session id, keep it but proceed without a session * in case we can't initialize the models proceed * if APP_CONFIG[:reraise_errors] is set we'll crash instead in the latter case default to reraise errors in dev and test environments.
2013-12-13minor: rename testAzul
2013-12-12reraise with a better explaination on couch failureAzul
Removing our own error class for this. It interferes with couch_rest_session_store tryign to catch the same errors.
2013-12-12use the latest couchrest_session_storeAzul
This one does not use our own error class for connection issues anymore. We'll remove that class in the next commit. So let's not rely on it.
2013-12-09Merge pull request #120 from azul/feature/robust-session-storejessib
update couchrest session store and Gemfile.lock
2013-12-09Update tests to reflect using plaintext key.jessib
2013-12-09update ruby_core_source so it works with latest ruby versionAzul
2013-12-09update couchrest session store and Gemfile.lockAzul
This will fix the crash when loading the landing page without a couch connection.
2013-12-09Merge pull request #119 from jessib/feature/service_levelazul
Feature/service level
2013-12-06Merge branch 'plaintextkey' into developelijah
2013-12-06make sure key responses are plain textelijah
2013-12-06minor: rename test to what it actually testsAzul
[skip ci]
2013-12-06simple validation for pgp key formatAzul
2013-12-06ignore attempts to empty public_key, refactorAzul
refactor: prepare validations of the uploaded pgp keys
2013-12-06Merge remote-tracking branch 'origin/master' into developAzul
2013-12-06Version 0.2.80.2.8Azul
* Return public key on /key/:login * rake tasks clean up expired tokens and sessions (#4568) * rake task to dump design docs to files * add dump_design_docs to CouchRest::Model::Utils:Migrate * rename ticket title to subject
2013-12-05We won't want service levels in production mode, and have it so this initial ↵jessib
service level code won't break anything if it isn't set in the config.
2013-12-03Some simplification of code.jessib
2013-12-03Add ServiceLevel class to wrap config and give accessors. Has some hacky ↵jessib
parts, but seems like okay generic start for now.
2013-12-02Merge branch 'develop' into feature/service_leveljessib
2013-12-02Merge pull request #118 from azul/feature/validate-pgp-keysjessib
Feature/validate pgp keys
2013-12-02Version 0.2.8 - release candidate0.2.8.rcAzul
* Return public key on /key/:login * rake tasks clean up expired tokens and sessions (#4568) * rake task to dump design docs to files * add dump_design_docs to CouchRest::Model::Utils:Migrate * rename ticket title to subject
2013-11-29Merge remote-tracking branch 'origin/master' into developAzul
2013-11-27minor: rename test to what it actually testsAzul
[skip ci]
2013-11-26simple validation for pgp key formatAzul
2013-11-26ignore attempts to empty public_key, refactorAzul
refactor: prepare validations of the uploaded pgp keys
2013-11-25Merge pull request #117 from jessib/feature/return_public_keyazul
Feature/return public key
2013-11-25Give 404 error if one goes to /key/user for non-existing user.jessib
2013-11-21Refactoring of code, and tests.jessib
2013-11-21Merge branch 'develop' into feature/return_public_keyjessib
2013-11-21Merge pull request #116 from azul/feature/rake-tasks-for-cleanupjessib
rake tasks for cleanup
2013-11-21Merge pull request #115 from azul/feature/dump-design-docsjessib
Enable dumping design docs to files
2013-11-21rake tasks clean up expired tokens and sessions (#4568)Azul
2013-11-19couchrest:dump task will dump all design docsAzul