summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-07Merge branch 'master' into help_developjessib
Conflicts: app/views/layouts/application.html.haml help/app/controllers/tickets_controller.rb help/test/functional/tickets_controller_test.rb users/test/support/stub_record_helper.rb
2012-12-07Merge branch 'feature/email-forwards-for-users'Azul
2012-12-07fixed test to work with edit view that includes email and email forward.Azul
2012-12-07fixed signup and removed flash that was not getting displayedAzul
I also tried flash.keep(:notice) but that did not help - not sure how to keep the flash until the root url has rendered.
2012-12-07adding a bunch of translationAzul
2012-12-07first stub at displaying success messagesAzul
2012-12-07refactor: use seperate form for signupAzul
creating and editing users differ so much now it's not worth reusing the complex user_form_with for the signup.
2012-12-07using normal requests for user updates except passwordAzul
password requires ajax for secure remote password to work
2012-12-07refactored views to ease adding of email formAzul
2012-12-07bumping version to 0.1.10.1.1Azul
This version has basic user and help tickets management
2012-12-07Merge branch 'develop'Azul
2012-12-07Merge branch 'feature/improve-editing-user-settings' into developAzul
2012-12-06forgot to add new partialAzul
2012-12-06seperated login and password changes in settingsAzul
2012-12-06Merge branch 'feature/user-cancel-account' into developAzul
2012-12-05trying to work around a gem issue with the ruby racer 0.11.nAzul
2012-12-04A test of ordering of tickets.jessib
2012-12-04Testing of functionality to retrieve tickets.jessib
2012-12-04Requiring libv8 gem so therubyracer gem will work.jessib
2012-12-03Ticket sorting functionality. Needs to be refactored, but works.jessib
2012-12-03refactored tests with new find_record helperAzul
find_record User will return a stubbed user record and make sure User.find_by_id(user.id) returns the same so it can be used in controllers.
2012-12-03enable users to cancel their accountAzul
2012-12-03enable admin to edit usersAzul
2012-12-03make tests pass on an empty dbAzul
2012-12-01using login :is_admin => true instead of real recordsAzul
Travis CI does not seem to have the admin user records. Let's not depend on them and just stub the admin user.
2012-12-01Merge branch 'develop' into help_developAzul
2012-11-29Not yet done, but more sophisticated and refactored ticket filtering. Still ↵jessib
have to do more, including allowing user to pick sort order.
2012-11-28admins can destroy usersAzul
I changed the permissions a little to be more consistent. Now: * admins can edit users * users can destroy themselves. There's no ui for either of them but theoretically they could. Not sure this is what we want though.
2012-11-27test changes that will fail, but should fail until we fix model.jessib
2012-11-27fixed some small issues and the tests except oneAzul
The one remaining is failing because we still build an Array for the admin tickets. Needs to be implemented so I am leaving that test as is.
2012-11-27testing Ticket#by_commented_byAzul
2012-11-27first attempts to map commentsAzul
2012-11-27moved ticket fetching logic from controller to modelAzul
2012-11-27fixed typoAzul
2012-11-27check for logged_in? in before filter - one less case to coverAzul
2012-11-27bunch of refactoring for the ticket indexAzul
* using different partials for different parts of the view * using render @tickets.all to iterate over the tickets. #all is necessary because of CouchRest Model * using helpers for easier querying for the open_status and admin_status params * using helper for avoiding duplication when linking to status
2012-11-26Put tickets in table. This display is still very rough.jessib
2012-11-26adding space to comment line.jessib
2012-11-26removing merge leftoversAzul
2012-11-26don't collabse the navAzul
2012-11-26Merge branch 'develop' into help_developAzul
2012-11-26forgot the user partialAzul
2012-11-26Merge branch 'develop' into help_developjessib
2012-11-26Merge branch 'feature/admin-users-list' into developAzul
2012-11-26Merge branch 'develop' into help_developjessib
Conflicts: users/app/views/sessions/_nav.html.haml
2012-11-26basic typeahead and user querying workingAzul
2012-11-26hide buttons in table-hover unless hovered over trAzul
2012-11-26basic users index with typeahead searchAzul
2012-11-26added admin menu and user index actionAzul
2012-11-26Merge branch 'feature/users-change-passwords' into developAzul