 Seth Call
|
c2a5936720
|
* wip
|
2014-07-14 15:53:04 -05:00 |
|
Seth Call
|
eecc402744
|
* pin faker to 1.3.0
|
2014-07-03 20:52:36 -05:00 |
Brian Smith
|
ae79912dab
|
merge develop
|
2014-05-31 07:41:59 -04:00 |
|
Seth Call
|
05666f7927
|
wip
|
2014-05-29 14:34:18 -05:00 |
|
Brian Smith
|
7a4ad83cef
|
merge develop
|
2014-05-29 00:20:09 -04:00 |
|
Brian Smith
|
f31248815d
|
VRFS-1670 session info page work
|
2014-05-26 23:52:59 -04:00 |
Anthony Davis
|
1ce510bb18
|
VRFS-1705 - 'monitor' subproj initial commit
|
2014-05-21 16:52:11 -05:00 |
|
Anthony Davis
|
4d4d04b343
|
VRFS-1651 - test-www should not use build_number
|
2014-05-07 08:30:41 -05:00 |
|
Anthony Davis
|
1fa9ffcc3f
|
VRFS-1651 - really no jam_* gems in test-www
|
2014-05-07 07:40:22 -05:00 |
|
Seth Call
|
1d6741714d
|
* resque_spec path removed
|
2014-04-15 15:17:44 +00:00 |
Jonathan Kolyer
|
bf1e315b48
|
Merge branch 'develop' into vrfs925
|
2014-04-14 10:59:58 +00:00 |
|
Seth Call
|
76e63193ca
|
* fixing some broken tests
|
2014-04-09 21:11:13 +00:00 |
|
Jonathan Kolyer
|
5a4bff14d2
|
VRFS-925 running tests for server side GA events
|
2014-04-08 17:15:49 +00:00 |
|
Jonathan Kolyer
|
e59d9cbe7a
|
VRFS-1483 email error handling
|
2014-04-05 18:52:12 +00:00 |
|
Seth Call
|
f1ef1de83c
|
* wip new ftue
|
2014-04-03 15:11:23 +01:00 |
|
Jonathan Kolyer
|
0987cf2cf8
|
VRFS-1483 editing batch emails
|
2014-03-19 16:37:03 +00:00 |
|
Jonathan Kolyer
|
4ba18a88ee
|
VRFS-1483 integrating sendgrid_smtpapi
|
2014-03-19 06:20:58 +00:00 |
|
Jonathan Kolyer
|
cdb271bf98
|
VRFS-1483 added async support
|
2014-03-18 22:50:06 +00:00 |
|
Seth Call
|
51f955fc74
|
* VRFS-1047 - broadcast widget almost fully done
|
2014-02-28 00:24:55 +00:00 |
|
Seth Call
|
aaef11add4
|
* VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only
|
2014-02-27 18:38:02 +00:00 |
|
Seth Call
|
b534a1e757
|
* trying rcov formatter for jenkins integration (VRFS-1103)
|
2014-02-13 21:17:47 +00:00 |
|
Seth Call
|
5ba4e97dca
|
* VRFS-1089 - jamadmin creation of recordings done
|
2014-02-13 16:41:50 +00:00 |
|
Seth Call
|
b256182cc6
|
* VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1
|
2014-02-02 13:34:53 -06:00 |
|
Seth Call
|
6ccfc4cc08
|
* VRFS-1010 possibly done
|
2014-01-30 15:51:05 -06:00 |
|
Seth Call
|
8f5a2a6369
|
* tell NOKOGIRI to use system libraries in build environment
|
2014-01-26 14:46:11 -06:00 |
|
Seth Call
|
fcec0a776b
|
* icecast working locally on my mac (VRFS-1002)
|
2014-01-21 14:51:03 +00:00 |
|
Seth Call
|
5d6e34f374
|
* VRFS-1000 - mapped all the castles, got the xml working, and added more tests
|
2014-01-17 04:51:19 +00:00 |
|
Seth Call
|
d89ce4c140
|
* VRFS-801 - almost working on my dev machine
|
2014-01-11 04:57:07 +00:00 |
|
Jonathan Kolyer
|
e5d23cc3bd
|
merge conflicts
|
2014-01-08 18:45:34 -06:00 |
|
Jonathan Kolyer
|
4b85863a33
|
vrfs-927: buzz admin fixes
|
2014-01-08 18:00:22 -06:00 |
|
Seth Call
|
83409e9da8
|
* adding resque gem to Gemfile
|
2014-01-08 22:55:44 +00:00 |
|
Jonathan Kolyer
|
4c9d2f0c29
|
vrfs-927: carrierwave integration fixes
|
2014-01-04 03:10:58 -06:00 |
Brian Smith
|
7e78163bb9
|
VRFS-933 notification work
|
2013-12-28 23:51:35 -05:00 |
|
Seth Call
|
d97a960a0e
|
* VRFS-821 many changes for upload apis, mostly
|
2013-12-17 19:44:21 +00:00 |
|
Jonathan Kolyer
|
c0c6879833
|
updated rspec version to 2.11
|
2013-11-23 00:03:22 -06:00 |
|
Jonathan Kolyer
|
fe5dc2c6ab
|
vrfs-774: incremental commit
|
2013-10-28 09:22:06 -05:00 |
|
Jonathan Kolyer
|
72e7193e1c
|
vrfs-774: added geokit gems
|
2013-10-24 12:25:55 -05:00 |
|
Seth Call
|
3d415ec447
|
* removing more reference to workspace
|
2013-09-16 02:42:02 +00:00 |
|
Seth Call
|
4d723bacaf
|
* fixing relative paths in gems for develop branch as well
|
2013-09-16 02:28:44 +00:00 |
|
Seth Call
|
6ea4bae05c
|
merging jam-ruby into ruby
|
2013-09-15 18:04:03 +00:00 |