1
0
Commit Graph

1831 Commits

Author SHA1 Message Date
David Baldwynn
b7bdd067b6 updated npm dependencies 2015-11-06 11:22:46 -08:00
David Baldwynn
c499652158 added bower resolutions 2015-11-06 11:12:00 -08:00
David Baldwynn
06f4fbbdf1 removed broken tests (for now) 2015-11-06 11:03:26 -08:00
David Baldwynn
16a80fbcfc added field focus controls 2015-11-06 11:00:45 -08:00
David Baldwynn
f7ba6a2df6 fixed onFinishRender bug 2015-11-06 09:41:55 -08:00
David Baldwynn
28a8eabba9 merged draggable_fields with dev 2015-11-06 09:27:01 -08:00
David Baldwynn
58e4329def make admin form tabs url encoded 2015-11-06 09:25:30 -08:00
David Baldwynn
31daffa7ff fixed package.json 2015-11-05 18:06:03 -08:00
David Baldwynn
73948afd85 fixed field formatting 2015-11-05 18:02:25 -08:00
David Baldwynn
065f2a47f6 added stuff 2015-11-05 17:22:16 -08:00
David Baldwynn
23828b0b25 fixed email signup 2015-11-05 14:38:38 -08:00
David Baldwynn
1309832742 fixed email verification 2015-11-05 14:07:56 -08:00
David Baldwynn
6c2f23c0c9 merged dev with master 2015-11-03 13:22:35 -08:00
David Baldwynn
98d63bbb23 fixed session domain issue 2015-11-03 13:01:07 -08:00
David Baldwynn
e6584ff61b merged working with dev branch 2015-11-03 12:58:17 -08:00
David Baldwynn
bbab12a159 merged working with dev branch 2015-11-03 12:58:00 -08:00
David Baldwynn
6aa1a56f0f merged working with dev branch 2015-11-03 12:57:05 -08:00
David Baldwynn
9d63765f15 merged working with dev branch 2015-11-03 12:53:42 -08:00
David Baldwynn
fb37c29c03 merged working with dev branch 2015-11-03 12:51:22 -08:00
David Baldwynn
f306ac931d merged working with dev branch 2015-11-03 12:46:54 -08:00
David Baldwynn
40c1b25703 fixed intercepted error 2015-11-03 12:44:55 -08:00
David Baldwynn
4546f3418d fixed intercepted error 2015-11-03 12:36:27 -08:00
David Baldwynn
62ea5c4948 reverted changes back 2015-11-03 12:28:13 -08:00
David Baldwynn
05131f36a8 added stuff 2015-11-03 12:22:50 -08:00
David Baldwynn
65ce444d00 fixed bower.json 2015-11-03 12:19:39 -08:00
David Baldwynn
83e590f07f fixed bower.json 2015-11-03 12:14:35 -08:00
David Baldwynn
6d8c6a470e add mongoose-utilities to package.json 2015-11-03 12:10:54 -08:00
David Baldwynn
15d6fd95b4 add mongoose-utilities to package.json 2015-11-03 12:05:45 -08:00
David Baldwynn
e951077354 rolled back dependencies 2015-11-03 11:55:11 -08:00
David Baldwynn
4522c1d78c fixed bower dependencies 2015-11-03 11:04:59 -08:00
David Baldwynn
395b2826b1 added bower back 2015-11-02 07:31:34 -08:00
David Baldwynn
f96ece5fe3 added grunt to dependecies 2015-10-31 19:43:51 -07:00
David Baldwynn
754f2fa789 added grunt to dependecies 2015-10-31 19:42:14 -07:00
David Baldwynn
0ea5b7a7a5 fixed statement field formatting 2015-10-31 19:37:24 -07:00
David Baldwynn
3ffd4095cb got updated deps to work 2015-10-31 17:32:37 -07:00
David Baldwynn
60aef4204b got everything to work 2015-10-30 14:40:22 -07:00
David Baldwynn
2e5ccc9869 got SOAP to work 2015-10-30 13:14:48 -07:00
David Baldwynn
92c84dc500 fixed user permissions problem 2015-10-30 11:40:02 -07:00
David Baldwynn
f858fe66a4 got oscarhost api tests to pass 2015-10-06 18:28:11 -07:00
David Baldwynn
e64729851f got oscarhost API to work 2015-10-06 18:16:47 -07:00
David Baldwynn
6a9b8ee8a8 fixed merge conflicts in app/models and app/tests 2015-10-06 13:24:02 -07:00
David Baldwynn
5a52425c10 fixed submissions fields 2015-10-06 13:14:38 -07:00
David Baldwynn
2638af607f fixed submissions fields 2015-10-06 13:14:12 -07:00
David Baldwynn
651dcc0485 Create Add_Demographic_WSDL.xml 2015-10-01 11:46:35 -07:00
unknown
c5e710fa95 Merge branch 'master' into dev 2015-10-01 09:48:13 -07:00
David Baldwynn
6c4bfc2714 Merge branch 'master' into dev 2015-09-22 21:03:26 -07:00
David Baldwynn
4bc3cd214a fixed field directive 2015-09-22 21:01:15 -07:00
David Baldwynn
90e00a98ba added stuff 2015-09-18 09:32:17 -07:00
David Baldwynn
caf0003dfb merged master with dev 2015-09-15 15:26:11 -07:00
David Baldwynn
4d20c36540 merged master with dev 2015-09-15 15:26:11 -07:00