summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-11-26fixed login error message on wrong usernameAzul
2012-11-26simplified controller and adjusted testsAzul
Also added #assert_json_error to tests.
2012-11-26minor: client side validations fixed + .json requestAzul
2012-11-26basic changing of password and login workingAzul
2012-11-23identify user by id so rerendering the form does not use new invalid loginAzul
2012-11-23Merge branch 'feature/users-change-passwords' into developAzul
2012-11-23refactored creation of record stubsAzul
2012-11-23test editing user settingsAzul
2012-11-22basic user edit form and actionsAzul
2012-11-22ship config file so CI can testAzul
2012-11-22Merge branch 'feature/error-messages-on-login' into developAzul
2012-11-22fixed testsAzul
2012-11-22beautify login workflowAzul
* translating error messages * not caching login and password in js anymore * catching non responses
2012-11-22using client side validations for loginAzul
2012-11-22using the new srp.js apiAzul
2012-11-22don't collabse the navAzul
2012-11-21Playing around with pagination, and ways to filter/order ticket results.jessib
2012-11-20Merge branch 'develop' into help_developjessib
2012-11-20ui tweaks to the menuAzul
2012-11-20minor: stacking the pills and making their titles have similar lengthAzul
2012-11-20ui tweaks to the menuAzul
2012-11-20fixed mocha version stringAzul
2012-11-19Merge branch 'develop' into help_developjessib
Conflicts: app/assets/javascripts/application.js ui_dependencies.rb
2012-11-19Merge branch 'feature-require_login_for_cert_download' into developAzul
2012-11-19use latest mocha version without monkey patching :)Azul
2012-11-19require authentication for cert download w/ testAzul
2012-11-19made it clear ruby 1.8.7 and 1.9.3 both work - fixes #952Azul
2012-11-19adding travis.yml so we have couchDB to test withAzul
2012-11-18Merge branch 'feature-client-side-validations' into developAzul
2012-11-16Rough start to modeling tickets view after the issues view in github (so ↵jessib
something like https://github.com/spree/spree/issues ), using bootstrap for display. Still want to use pjax, and have more functionality to add: searching, sorting, pagination, etc..
2012-11-16playing around with pjax-rails but not using it yetjessib
2012-11-15Some more ticket tests.jessib
2012-11-14Improvements to functional ticket tests.jessib
2012-11-13using client side validations during signupAzul
2012-11-13testing against current staging serverAzul
2012-11-12Some test improvements.jessib
2012-11-12Merge branch 'develop' into help_developjessib
2012-11-12fixed .gitignoreAzul
2012-11-12fixed .gitignoreAzul
2012-11-12Merge branch 'develop' into help_developjessib
Conflicts: help/test/functional/tickets_controller_test.rb users/test/functional/application_controller_test.rb users/test/support/auth_test_helper.rb