 Seth Call
|
d3595afba1
|
* stopping swp files from being committed
|
2013-01-28 20:56:59 -06:00 |
Brian Smith
|
08848439d4
|
Merge branch 'feature/find_session'
|
2013-01-28 21:33:12 -05:00 |
|
Brian Smith
|
ef11c78b5b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-28 21:33:00 -05:00 |
|
Brian Smith
|
a3199a30af
|
fix test
|
2013-01-28 21:32:25 -05:00 |
Jonathon Wilson
|
53542cc38e
|
Fix cucumber tests for layout changes
|
2013-01-28 19:32:08 -07:00 |
|
Jonathon Wilson
|
875f8efd0f
|
Fix tests from layout changes
|
2013-01-28 19:24:25 -07:00 |
|
Jonathon Wilson
|
3914ec4cee
|
Remove unused files.
|
2013-01-28 08:51:39 -07:00 |
|
Jonathon Wilson
|
b5ed66ce54
|
Jeff's signin and register pages.
|
2013-01-28 08:50:16 -07:00 |
|
Brian Smith
|
a84fb46edd
|
fix rspec tests
|
2013-01-27 22:41:53 -05:00 |
|
Brian Smith
|
5073ee9d94
|
VRFS-212 find session
|
2013-01-27 22:05:00 -05:00 |
|
Brian Smith
|
8d7902b3bd
|
VRFS-212 more find session work
|
2013-01-27 15:17:46 -05:00 |
|
Jonathon Wilson
|
d576366a05
|
bringing in Jeff's ftue mockups. Partial commit to bring in Gemfile changes
|
2013-01-27 11:34:14 -07:00 |
|
Seth Call
|
12822972ab
|
* fix broken tests
|
2013-01-26 20:29:17 -06:00 |
|
Seth Call
|
5557edadff
|
* making sure version is greater than 0.4.0
|
2013-01-26 20:15:58 -06:00 |
|
Seth Call
|
f832bc9415
|
* allowing em-websocket to go above 0.4.0
|
2013-01-26 20:15:30 -06:00 |
|
Seth Call
|
f38cf2a1f6
|
* fixe for em-websocket 0.4.0
|
2013-01-26 20:15:03 -06:00 |
|
Seth Call
|
69e69f0e6a
|
* pinning em-websocket in jam-web, as well
|
2013-01-26 20:00:41 -06:00 |
|
Seth Call
|
43a64319bf
|
* freeing versions of test libraries because not everything is pinned, so some things are getting into dependency trouble
|
2013-01-26 19:56:12 -06:00 |
|
Seth Call
|
0a41cc6ee9
|
* pinning to 0.3.8 because client.request is no longer a property in 0.4.0 of em-websokce
|
2013-01-26 19:55:09 -06:00 |
|
Seth Call
|
2c9dfed0ff
|
* fixing up gitignore
|
2013-01-26 19:24:20 -06:00 |
|
Seth Call
|
68d346496b
|
* oops. meant to make fpm optional but messed up the check for $PACKAGE
|
2013-01-26 19:23:26 -06:00 |
|
Seth Call
|
6606094e40
|
* bumping activerecord up to latest
|
2013-01-26 19:13:01 -06:00 |
|
Brian Smith
|
f97c9d4bc8
|
VRFS-212 find session
|
2013-01-26 14:18:31 -05:00 |
|
Brian Smith
|
e9a32c12e6
|
VRFS-212 Find Session work
|
2013-01-25 03:00:53 -05:00 |
Mike Slemmer
|
1befcade8d
|
more work
|
2013-01-23 17:48:36 -08:00 |
|
Mike Slemmer
|
60d5964ecb
|
more work
|
2013-01-23 17:48:13 -08:00 |
|
Mike Slemmer
|
3ac9ef0c2a
|
more work
|
2013-01-22 14:04:12 -08:00 |
|
Mike Slemmer
|
2d697d029b
|
more work
|
2013-01-22 14:03:23 -08:00 |
|
Mike Slemmer
|
8a54a0a116
|
more work
|
2013-01-22 11:15:52 -08:00 |
|
Mike Slemmer
|
402fda6e8c
|
more wokr
|
2013-01-22 11:14:34 -08:00 |
|
Brian Smith
|
2e302c4179
|
fix friend search
|
2013-01-21 21:57:48 -05:00 |
|
Brian Smith
|
81d37f13b9
|
fix friend search issue
|
2013-01-21 21:54:23 -05:00 |
|
Seth Call
|
2e4b9d1e46
|
*VRFS-277 jam-db package for debian
|
2013-01-22 02:36:24 +00:00 |
|
Brian Smith
|
bf7e16abee
|
VRFS-212 Find Session work
|
2013-01-21 00:52:28 -05:00 |
|
Brian Smith
|
5e31dd5a06
|
VRFS-201 enhanced search feature to include friends
|
2013-01-21 00:51:31 -05:00 |
|
Seth Call
|
9ee0ef3f44
|
* removing comment from upstart file
|
2013-01-20 18:10:19 -06:00 |
|
Seth Call
|
d146f4e98a
|
* trying some more to fix this assets precompile issue
|
2013-01-19 09:11:53 -06:00 |
|
Seth Call
|
5f87da13d4
|
* addig production to list of assets envirometns
|
2013-01-19 08:56:49 -06:00 |
|
Seth Call
|
c56e0b792b
|
* making certain active_admin assets precompile
|
2013-01-19 08:41:03 -06:00 |
|
Seth Call
|
8ee826696a
|
* bumping rvmrc to match all other projects, and adding rails-logging gem to mirror jam-web (and because it lets me configure logging the same way using chef and so on)
|
2013-01-18 00:09:16 -06:00 |
|
Seth Call
|
4494b1e071
|
* creating log dir in var
|
2013-01-17 23:03:59 -06:00 |
|
Seth Call
|
2efc3f181b
|
* creating log dir in var
|
2013-01-17 23:03:19 -06:00 |
|
Seth Call
|
8b42c6ddc2
|
* making /etc/jam-web dir
|
2013-01-17 22:22:36 -06:00 |
|
Seth Call
|
dab083acd9
|
* making /etc/jam-admin dir
|
2013-01-17 22:21:12 -06:00 |
|
Seth Call
|
16e4edca57
|
* adding vim exclusion; also testing bitbucket hook to jenkins
|
2013-01-16 23:03:22 -06:00 |
|
Seth Call
|
7094b3c345
|
* adding jenkins build script to jam-admin
|
2013-01-16 22:59:59 -06:00 |
|
Seth Call
|
1abc90a5fb
|
* -f so no error if not present
|
2013-01-16 22:52:43 -06:00 |
|
Seth Call
|
c8f0695a54
|
* -f so no error if not present
|
2013-01-16 22:51:26 -06:00 |
|
Seth Call
|
b759b2ae01
|
* -f so no error if not present
|
2013-01-16 22:51:04 -06:00 |
|
Seth Call
|
93bea675e5
|
* remove Gemfile.lock right before running
|
2013-01-16 22:40:42 -06:00 |