 Seth Call
|
fef9d3ad19
|
* VRFS-315; profile page is working except for avatar, and does not do error visualization yet
|
2013-05-18 13:04:04 -05:00 |
Jonathon Wilson
|
37a8f06081
|
Merge branch 'master' into ftue
|
2013-05-18 10:49:47 -06:00 |
|
Seth Call
|
512731f017
|
* adding postgres-copy
|
2013-05-18 07:01:10 -05:00 |
|
Seth Call
|
11458f0d39
|
* updating pg_migrate to 0.1.7 to match the rest of the site
|
2013-05-18 06:50:39 -05:00 |
Brian Smith
|
018b5e9257
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-18 01:59:36 -04:00 |
|
Brian Smith
|
ab4237addf
|
VRFS-292 configure track work
|
2013-05-18 01:59:25 -04:00 |
|
Jonathon Wilson
|
8e387b4084
|
Style adjustments. Starting on FTUE 2nd step
|
2013-05-17 08:57:27 -06:00 |
|
Jonathon Wilson
|
ff65402a3e
|
Merge branch 'master' into ftue
|
2013-05-17 07:37:39 -06:00 |
|
Seth Call
|
4633f0fa08
|
* still working on profile page (VRFS-313), and also fixing some max_mind tests and manager to account for model addition
|
2013-05-16 22:54:33 -05:00 |
|
Seth Call
|
4b3185c0c9
|
* adding max_mind model and csv import added (using postgres-copy gem)
|
2013-05-16 22:44:26 -05:00 |
|
Seth Call
|
eeb814fee4
|
* adding country code to max_mind_isp
|
2013-05-16 22:42:50 -05:00 |
|
Jonathon Wilson
|
f772dc2e80
|
Merge branch 'master' into ftue
|
2013-05-16 19:00:47 -06:00 |
|
Seth Call
|
b3f5e34ef9
|
* VRFS-316 ; adding 'other' to instrument lis
|
2013-05-16 13:23:38 -05:00 |
|
Seth Call
|
c12c8515d4
|
* VRFS-315 isp database is available as phony data or imported 'for real'; also, one can ask for all isps for a given country in a REST
|
2013-05-16 12:45:10 -05:00 |
|
Seth Call
|
8f73ec285e
|
VRFS-315; renaming max_mind to max_mind_geo
|
2013-05-16 12:00:16 -05:00 |
|
Seth Call
|
219368c874
|
* VRFS-315; max_mind_isp table added
|
2013-05-16 11:44:29 -05:00 |
|
Seth Call
|
6da23ed94b
|
t piMerge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-16 10:53:15 -05:00 |
|
Seth Call
|
0213623b23
|
* VRFS-314; reworking navigation to make any sort of sense for account sub pages
|
2013-05-16 10:53:03 -05:00 |
|
Jonathon Wilson
|
dce12ce465
|
Enable close buttons. Disable FTUE JS for now.
|
2013-05-16 09:44:50 -06:00 |
|
Jonathon Wilson
|
48cf369de5
|
Start of wizard steps. File renaming
|
2013-05-16 09:33:04 -06:00 |
|
Jonathon Wilson
|
6b9c0402a2
|
Merge branch 'master' into ftue
|
2013-05-16 09:01:19 -06:00 |
|
Brian Smith
|
9a948d4633
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-16 01:15:26 -04:00 |
|
Brian Smith
|
a3ef27f329
|
VRFS-292 configure track work
|
2013-05-16 01:15:16 -04:00 |
|
Seth Call
|
9c64376700
|
* changing rails session cookie to something without the word 'sampleapp' in it
|
2013-05-15 19:55:25 -05:00 |
|
Seth Call
|
f9daf77a39
|
* adding debug info for path
|
2013-05-15 18:37:21 -05:00 |
|
Seth Call
|
d98ad9ffd2
|
* return bad code if no phantomjs
|
2013-05-15 18:12:33 -05:00 |
|
Seth Call
|
b717ee9691
|
* adding phantom js check
|
2013-05-15 17:53:26 -05:00 |
|
Seth Call
|
c28995325e
|
* removing spurfulous configs in spec_helper
|
2013-05-15 15:57:10 -05:00 |
|
Seth Call
|
dc1dd3fbe4
|
t pushMerge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-15 15:53:26 -05:00 |
|
Seth Call
|
9a8e2cf22e
|
* VRFS-311 and VRFS-312; javascript-based tests
|
2013-05-15 15:53:19 -05:00 |
|
Jonathon Wilson
|
0e1bb0d8af
|
Change ftue to dialog. Style first screen
|
2013-05-15 08:39:39 -06:00 |
|
Brian Smith
|
7f43046f15
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-15 02:00:17 -04:00 |
|
Brian Smith
|
52e799689c
|
VRFS-292 more configure track work
|
2013-05-15 01:59:09 -04:00 |
|
Seth Call
|
64b3d8f15c
|
* VRFS-312 fixed change of password_validation parameter to current_parameter in tests
|
2013-05-14 20:26:27 -05:00 |
|
Brian Smith
|
895ba8a6e8
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-14 21:17:15 -04:00 |
|
Brian Smith
|
7a983d4072
|
VRFS-292 more Configure Track work
|
2013-05-14 21:17:12 -04:00 |
|
Seth Call
|
85da9ef643
|
* VRFS-312 some minor styling and bugs after some more manual testing
|
2013-05-14 17:33:19 -05:00 |
|
Seth Call
|
0637c4c088
|
* typo in set_password fixed VRFS-312
|
2013-05-14 17:33:02 -05:00 |
|
Seth Call
|
0a7d5610e3
|
t pMerge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-14 14:03:59 -05:00 |
|
Seth Call
|
92ef5a2cc5
|
* VRFS-312 update password-in app working (only manually tested, though)
|
2013-05-14 14:03:50 -05:00 |
|
Seth Call
|
e4d5266245
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-05-14 14:02:34 -05:00 |
|
Seth Call
|
a98a04738d
|
* VRFS-312 in-app password updates
|
2013-05-14 14:02:22 -05:00 |
Mike Slemmer
|
c6d7a96054
|
eliminate favorites for now
|
2013-05-13 22:22:25 -07:00 |
|
Mike Slemmer
|
c1e91d87c9
|
eliminate favorites for now
|
2013-05-13 22:22:09 -07:00 |
|
Mike Slemmer
|
20f809001a
|
more work
|
2013-05-13 22:09:29 -07:00 |
|
Mike Slemmer
|
faa3fe82a7
|
more work
|
2013-05-13 22:09:17 -07:00 |
|
Mike Slemmer
|
a4674ce7e9
|
added another
|
2013-05-13 22:09:07 -07:00 |
|
Mike Slemmer
|
127912b1fb
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web into slemmerwork
|
2013-05-13 22:05:04 -07:00 |
|
Brian Smith
|
28a3693993
|
VRFS-292 Music Audio tab validation bug fixes
|
2013-05-13 23:57:02 -04:00 |
|
Brian Smith
|
8e5bf1f8ab
|
VRFS-292 added Music Audio tab validations
|
2013-05-13 23:46:49 -04:00 |