summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-06Merge pull request #136 from azul/cleanup/no-untracked-filesjessib
make sure all untracked files in deploy are in gitignore - #4953
2014-02-06make sure ticket get's cleared at end of tickets_by_admin testAzul
Also relax the requirement from tickets.count > 1 to > 0. There is only one ticket if there have not been any others in the database ahead of time.
2014-02-06integration test with en-EN languageAzul
Tests fail on machines that default to other available languages. Also move setting capybara driver to be javascript driver into the BrowserIntegrationTest.
2014-02-05make sure all untracked files in deploy are in gitignore - #4953Azul
2014-02-04applied mcnair's changes to privacy policyelijah
2014-01-27fix js platform detection to match new way we have single link for linux ↵elijah
(not linux32 or linux64).
2014-01-27Merge branch 'develop' into feature/messages_apijessib
Conflicts: users/config/locales/en.yml
2014-01-23Merge pull request #135 from elijh/feature/pagesjessib
add some static pages
2014-01-23added a customizable 'bye' page for when a user leaveselijah
2014-01-23move #masthead out of main templates to make the masthead partials more ↵elijah
flexible.
2014-01-23upgraded bootstrap to latest in 2.x serieselijah
2014-01-23added a default footer with links to privacy policy, tos, pricing, about us, ↵elijah
contact.
2014-01-23added default pricing, privacy policy and tos pages.elijah
2014-01-23updated Gemfile.lockelijah
2014-01-22remove manual 'gem minitest'. this seems to confuse the tests, which seem to ↵elijah
work best with the minitest that comes with ruby 1.9.
2014-01-21Small optimization to saving message when sending one month warnings.jessib
2014-01-21Merge branch 'develop' into feature/messages_apijessib
2014-01-19Redefine constant in a way that does not print out "warning: already ↵elijah
initialized constant VERIFY_PEER"
2014-01-16switch to using dl.bitmask.netelijah
2014-01-14ensure auto_update_design_docs is falseAzul
2014-01-13Comment for how to call view that we aren't now using.jessib
2014-01-09Some more cleanup, but still want to make sure ↵jessib
by_user_ids_to_show_and_created_at view is right before issuing pull request.
2014-01-07Remove schedule file now that we aren't using whenever gem.jessib
2014-01-07Some refactoring, to simplify user model, optimize, and allow messages to be ↵jessib
sorted by date (although are not now.) Also, rather than use whenever gem, will have cron job created to call task.
2014-01-07Merge branch 'develop' into feature/messages_apijessib
2014-01-07Merge pull request #133 from azul/bugfix/fix-view-functionsjessib
Bugfix/Fix view functions
2014-01-07only emit pgp keys if they are actually setAzul
if doc.keys has not been set doc.keys[pgp] will raise an error. We always upload the key after signup - but this might fail and there is some time in between. Not checking for this condition lead to errors in the couch logs.
2014-01-07remove outdated views that cause errorsAzul
The datastructure changes to that email_aliases is not available on the user record anymore. Keeping these views leads to errors on couch servers.
2014-01-06Merge branch 'develop' into feature/messages_cronjessib
2014-01-03document new way we deploy couch design docsAzul
2013-12-31Add authentication to API, but not sure it is best way.jessib
2013-12-31Removing join-model we are no longer using.jessib
2013-12-31Cleanup of code for messages API and cron job for 1 month payment warning. ↵jessib
Authentication still remaining piece.
2013-12-30Fixes to initial go at job to send one month warnings.jessib
2013-12-30Merge branch 'feature/messages_api' into feature/messages_cronjessib
2013-12-30Change structure to be more no-sql-y, rather than relational.jessib
2013-12-30Merge branch 'develop' into feature/messages_cronjessib
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
will later be replaced.
2013-12-30Merge pull request #132 from elijh/feature/min-client-versionjessib
Return 'provider.json' via a controller
2013-12-29Return 'provider.json' via a controller, to better be able to control the ↵elijah
response headers (in particular, 'X-Minimum-Client-Version'). It must now be placed in config/provider/provider.json
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 ↵jessib
messages within the webapp.
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
Conflicts: core/app/views/common/_home_page_buttons.html.haml users/app/views/users/show.html.haml
2013-12-22Merge pull request #131 from elijh/feature/locale-routesazul
locale prefix support