summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-21Still much to do, but improvements to CSS.jessib
2012-12-20Slight tweaks to tickets controller.jessib
Only non-comment change is that we will keep an unauthenticated user looking at the same ticket if they have closed it (rather than redirecting to index which they will not be able to access.)
2012-12-20Define ascending method in CouchRest::Model::Designs::View so we can call ↵jessib
the order either way.
2012-12-20render proper tab on updateAzul
2012-12-20Merge remote-tracking branch 'origin/feature/tickets-refactor'Azul
2012-12-20Merge pull request #5 from leapcode/feature/removing-email-aliasesazul
Removing email aliases - proper error display
2012-12-19Some cleanup of codejessib
2012-12-18Merge branch 'master' into feature/tickets-refactorjessib
2012-12-18Minor CSS improvement using bootstrap.jessib
2012-12-18Refactoring of code to filter/order tickets.jessib
2012-12-18refactor: using tab partials for user editingAzul
2012-12-18adopted functional tests to new controller designAzul
2012-12-18only destroy user that has been persisted in teardownAzul
2012-12-18make sure we have email_aliases at all before testing for an error on the lastAzul
2012-12-18refactored email_alias creation and validationAzul
using CouchRests user.email_aliases.build so the casted_by method is set in the alias Used this to move the validations into the alias itself. This is where they belong and allows us to render the errors inline along the email field they belong to.
2012-12-18adjusted tests - we now reload the user so invalid records are clearedAzul
Actually that might not be the best idea. Issue at hand was that invalid email aliases were getting displayed when rendering the edit form again. We probably want to solve this different.
2012-12-18display errors on email tab properlyAzul
still needs a bit of refactoring in the view
2012-12-18Merge branch 'master' into feature/removing-email-aliasesAzul
2012-12-18Merge branch 'develop'Azul
2012-12-18Merge branch 'feature/clean-up-pjax-for-now' of ↵Azul
https://github.com/leapcode/leap_web
2012-12-17Merge pull request #3 from leapcode/feature/certs-from-ca-deamonazul
Adopt certs to changes in the leap ca
2012-12-17Some refactoring of ticket creation/editing.jessib
2012-12-17Removing references to pjax.jessib
2012-12-17Change comments to reflect changes to functional tests for tickets.jessib
2012-12-17activate email tab after changing email settingsAzul
2012-12-17enabled destroying email aliases - no ajax yet.Azul
2012-12-17gitignoring files generated in productionAzul
fixes #1168 [ci skip]
2012-12-17no more emails from travis pleaseAzul
[ci skip]
2012-12-17Merge branch 'feature/certs-from-ca-deamon' into developAzul
Conflicts: certs/app/models/leap_ca/cert.rb
2012-12-17adopted test to before_validation callbackAzul
The before validation hook will overwrite whatever is in random on create. This is what we want - just need to test it properly
2012-12-17Merge branch 'master' into developAzul
2012-12-17Merge branch 'feature/fixing-signup-and-login-issues'Azul
2012-12-17Merge remote-tracking branch 'origin/master' into feature/clean-up-pjax-for-nowAzul
2012-12-17Merge remote-tracking branch 'origin/master' into feature/certs-from-ca-deamonAzul
2012-12-17Merge branch 'feature/fix-tests-in-master'Azul
2012-12-17split up and fixed ticket functional testsAzul
2012-12-17fixed inclusion of stub record helperAzul
2012-12-17small fix to the tickets functional testAzul
2012-12-17fixed all user functional testsAzul
2012-12-14fixed the functional test that was failing due to cert changesAzul
2012-12-14fixed most of the unit testsAzul
no idea why the numericality validatoin with greater_than_or_equal 0 does not catch negative numbers
2012-12-14adopt certs to changes in the leap caAzul
2012-12-14adopt certs to changes in the leap caAzul
2012-12-14Do not include the pjax js and remove the pjax lineAzul
This was breaking inclusion of other js.
2012-12-13removing couchdb.yml so it does not conflict with deploy. will create ↵Azul
defaults.yml later
2012-12-13Merge branch 'master' into developAzul
Conflicts: users/test/unit/user_test.rb
2012-12-13Merge branch 'feature/email-aliases-model'Azul
2012-12-13use the same partial for Email and LocalEmailAzul
2012-12-13refactor: changed add_email to add_email_aliasAzul
that's what it does. Changed all tests to use it instead of the attributes method
2012-12-13refactor: Email constructor now takes string or hashAzul
This allows us to reuse add_email from email_aliases_attributes=