summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-12-30Merge branch 'develop' into feature/messages_apijessib
2013-12-30Not actually how we want to do this, but at least finish outlined part, that ...jessib
2013-12-30Merge pull request #132 from elijh/feature/min-client-versionjessib
2013-12-29Return 'provider.json' via a controller, to better be able to control the res...elijah
2013-12-26Very very rough start to having messages for payment automatically created.jessib
2013-12-24Catching some corner cases & new tests.jessib
2013-12-24Add API tests and some refactoring of messages so we can get a user's message...jessib
2013-12-24API method to mark a user's message as read (will refactor)jessib
2013-12-24Initial start to messages API.jessib
2013-12-24ensure permissions are preserved when copying customization files. closes #4623elijah
2013-12-23hotfix to make webapp work with rack again.elijah
2013-12-23Merge remote-tracking branch 'jessib/feature/3389_download_links' into developAzul
2013-12-22Merge pull request #131 from elijh/feature/locale-routesazul
2013-12-22locale prefix support:elijah
2013-12-22re-generated Gemfile.lock with the new versions of engine gems. as a side eff...elijah
2013-12-20Version 0.5.0.rc0.5.0.rcAzul
2013-12-20Merge pull request #130 from azul/bugfix/4805-fix-overview-activeazul
2013-12-20make sure overview link is active on Users#showAzul
2013-12-20Merge pull request #128 from elijh/feature/configure_billingazul
2013-12-20fixed billing tests (added dummy billing hash to config, include required tes...elijah
2013-12-20enable billing engine by default, consolidate APP_CONFIG[:payments] and APP_C...elijah
2013-12-19Update translation to reflect what you can actually change in your account.jessib
2013-12-19Put download link on user page.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 m...jessib
2013-12-17Merge branch 'develop' into feature/billing-no-authenticated-paymentsjessib
2013-12-17Merge pull request #125 from azul/feature/catch-all-couch-exceptionsjessib
2013-12-17catch all rest client exceptions during initializationAzul
2013-12-17Merge pull request #124 from jessib/feature/bugfix4756_login_crashazul
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
2013-12-16Merge pull request #122 from azul/bugfix/4703-disable-unsupported-settingsjessib
2013-12-16Merge pull request #121 from azul/feature/robust-against-couch-connection-issuesjessib
2013-12-13refactor: remove Overview controller - we can use Users#showAzul
2013-12-13make the possible actions for users and admins configurableAzul
2013-12-13refactor: move edit sections into partialsAzul
2013-12-13proceed even if the couch is unreachableAzul
2013-12-13minor: rename testAzul
2013-12-12reraise with a better explaination on couch failureAzul
2013-12-12use the latest couchrest_session_storeAzul
2013-12-09Merge pull request #120 from azul/feature/robust-session-storejessib
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
2013-12-09Merge pull request #119 from jessib/feature/service_levelazul
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
2013-12-06simple validation for pgp key formatAzul