summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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=
2012-12-13refactor: allow adding email aliases directlyAzul
2012-12-13ensure users do not have duplicate email aliasesAzul
nor aliases that are the same as the original email for that matter
2012-12-13LocalEmail added - will validate uniqueness amongst emails and aliasesAzul
2012-12-12Merge branch 'feature-new-comments-refactor' into developjessib
2012-12-12Refactoring of ticket displaying/editing.jessib
2012-12-12find users by email and aliasesAzul
2012-12-12quick fix for langing page to not have spacerAzul
2012-12-11Start to using x-editable to have title editable.jessib
2012-12-12Merge branch 'master' into developAzul
2012-12-11Playing around with using x-editable, which isn't yet working.jessib
2012-12-11make sure can login twiceAzul
2012-12-10email format validationsAzul
2012-12-10make sure client side validations also run after tabs were switchedAzul
2012-12-10use consistent naming scheme across CA, webapp and couchDB installAzul
2012-12-10created generic Email class and use it with EmailAliasesAzul
2012-12-10actually allow adding email aliasesAzul
2012-12-09basic form added to user settings, simple model createdAzul
2012-12-09first steps towards email aliasesAzul
* unit tests draft * controller draft
2012-12-08moved cert into the api pathAzul
2012-12-08serve api version 1 in /1/Azul
Just a very simple start for now. Do we want to use the api for the secure remote password auth from js?