Jonathan Kolyer
|
4eea9e4313
|
added auto-population of users location data from the confirmation signup link using the remote-ip
|
2013-01-06 06:36:55 -06:00 |
|
Jonathan Kolyer
|
ffd6d8425d
|
added jonathan@jamkazam as dev_user
|
2013-01-06 06:35:57 -06:00 |
|
Jonathan Kolyer
|
d2ebfbde4f
|
added method location= and revised location to handle missing fields better
|
2013-01-06 06:34:16 -06:00 |
|
Jonathan Kolyer
|
0425a9d389
|
make text consistent between html/text versions
|
2013-01-06 05:53:41 -06:00 |
 Seth Call
|
d157a58db7
|
* deb server
|
2013-01-05 23:18:26 -06:00 |
|
Seth Call
|
516a3dd6c0
|
* trying to publish websocket deb to local jenkins server
|
2013-01-05 23:12:23 -06:00 |
|
Jonathan Kolyer
|
ff77da1cdd
|
fixed root path; added instructions to dashboard
|
2013-01-05 21:14:17 -06:00 |
|
Jonathan Kolyer
|
48f51f431c
|
user list, editing, and creation; syncing JamRuby::User and AdminUser
|
2013-01-05 20:51:46 -06:00 |
|
Jonathan Kolyer
|
55f4f67c0e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-01-05 20:41:44 -06:00 |
Brian Smith
|
7a7b352b1a
|
fixed friend bug
|
2013-01-10 22:42:32 -05:00 |
|
Jonathan Kolyer
|
1d0c8b3cce
|
VRFS-193: beta user welcome email
|
2013-01-05 20:40:22 -06:00 |
|
Seth Call
|
914bc7302f
|
VRFS-188: switch from blacklist to whitelisting
|
2013-01-05 08:12:23 -06:00 |
|
Seth Call
|
22e83eb1d2
|
* VRFS-190 done; sudo start websocket-gateway /sudo stop websocket-gateway possible after install of ubuntu package
|
2013-01-05 07:56:16 -06:00 |
|
Seth Call
|
e4837c38b2
|
Merge branch 'master' of bitbucket.org:jamkazam/websocket-gateway
|
2013-01-05 07:04:37 -06:00 |
|
Seth Call
|
d505ae77eb
|
* when updating staleness of connection, skip validations
|
2013-01-05 23:43:23 -06:00 |
|
Seth Call
|
52cf087321
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-05 05:06:15 -06:00 |
Jonathon Wilson
|
1228e0547e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-05 14:36:20 -07:00 |
|
Jonathon Wilson
|
b195aa8991
|
re-add home link for cucumber test to FTUE3
|
2013-01-05 14:34:12 -07:00 |
|
Jonathon Wilson
|
9d79aeede2
|
FTUE device selection dropdowns and enable. Flesh out fakeJamClient
|
2013-01-05 14:30:24 -07:00 |
|
Seth Call
|
e7a9c1cfbc
|
* VRFS-188; left a bit of extra text in the adduser command
|
2013-01-05 05:04:58 -06:00 |
|
Jonathan Kolyer
|
cd64b925b7
|
added form attributes
|
2013-01-05 03:56:56 -06:00 |
|
Jonathan Kolyer
|
9cc4e602b9
|
integrated activeadmin
|
2013-01-05 03:43:40 -06:00 |
|
Seth Call
|
5d2be5eb94
|
* VRFS-190; gitignore/remove accidentally added log files
|
2013-01-05 02:40:05 -06:00 |
|
Seth Call
|
fbfff6ac7f
|
* VRFS-190 - rolling file in production: keep 20, max file size of 1 meg or day
|
2013-01-05 02:39:10 -06:00 |
|
Seth Call
|
26f9c222c4
|
* VRFS-190 - rolling file in production: keep 20, max file size of 1 meg or day
|
2013-01-05 02:38:42 -06:00 |
|
Seth Call
|
0ac7539653
|
* VRFS-190; get production mode working with a rolling file appender
|
2013-01-05 02:34:58 -06:00 |
|
Seth Call
|
1e9d26432a
|
* VRFS-188 done for now. type sudo start jam-web or sudo stop jam-web to start/stop on ubuntu
|
2013-01-04 22:00:47 -06:00 |
|
Jonathan Kolyer
|
9e44d56e66
|
VRFS-193: moved admin_user db to jam-db; generate AdminUser accounts for users#admin records
|
2013-01-04 12:05:05 -06:00 |
|
Jonathan Kolyer
|
8148e70e2b
|
VRFS-193: adding admin_users via activeadmin gem
|
2013-01-04 12:04:09 -06:00 |
|
Jonathan Kolyer
|
afc222816b
|
VRFS-193: admin user interface using activeadmin
|
2013-01-04 10:18:07 -06:00 |
|
Seth Call
|
aabf2d6dd1
|
* make websocket_gateway_uri in javascript be host-bound in development, config bound in other modes
|
2013-01-04 09:05:26 -06:00 |
|
Seth Call
|
8c7a7764fb
|
* forcing javascript to use websocket_gateway_uri from configuration. I think this may revert something else we did, but fixe.s the test
|
2013-01-04 08:25:12 -06:00 |
|
Seth Call
|
04c0d0e523
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-db
|
2013-01-04 08:13:06 -06:00 |
|
Seth Call
|
3b9d9f1e11
|
* some meaningless whitespace change
|
2013-01-04 08:13:00 -06:00 |
|
Jonathan Kolyer
|
651dd72665
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-01-04 04:13:44 -06:00 |
|
Brian Smith
|
3bfae973b9
|
fixed unit test to insert into session_history table on session creation
|
2013-01-06 16:38:03 -05:00 |
|
Seth Call
|
436a688976
|
* nm. someone commented out our gem server
|
2013-01-06 15:14:38 -06:00 |
|
Seth Call
|
35627dc1f8
|
* adding installe, then update. I really need to understand why and how this happens with bundler...
|
2013-01-06 15:13:01 -06:00 |
|
Brian Smith
|
225a81adb9
|
VRFS-80 session history
|
2013-01-06 15:46:48 -05:00 |
|
Jonathan Kolyer
|
7d1e7417ed
|
VRFS-194: added can_invite attribute, defaults to true, but false for invited users
|
2013-01-04 04:13:39 -06:00 |
|
Jonathan Kolyer
|
aeec4a5ab3
|
merge conflict fix
|
2013-01-04 04:03:41 -06:00 |
|
Jonathan Kolyer
|
515e1c2b7a
|
VRFS-194: added can_invite column to users
|
2013-01-04 03:57:54 -06:00 |
|
Seth Call
|
ad989300d7
|
* adding packaging scripts to websocket-gateway
|
2013-01-03 22:45:47 -06:00 |
|
Seth Call
|
5de82166b8
|
VRFS-190; initial attempt for websocket-gateway
|
2013-01-03 01:01:48 -06:00 |
|
Seth Call
|
01277a0cfd
|
* moving cucumber's websocket-gateway port off of 6767 to avoid conflicts with a running 'normal' websocket-gateway
|
2013-01-03 00:05:40 -06:00 |
|
Seth Call
|
eea7ba0488
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-02 23:15:53 -06:00 |
|
Seth Call
|
b603366821
|
* VRFS-188 settling on unicorn.
|
2013-01-02 23:15:42 -06:00 |
|
Jonathon Wilson
|
2361223148
|
Sidebar: start to Jeff's notifications
|
2013-01-02 09:06:23 -07:00 |
|
Jonathon Wilson
|
68cd2ab63a
|
Start of chart from Jeff
|
2013-01-02 08:52:28 -07:00 |
|
Jonathon Wilson
|
d254c26010
|
Sidebar: Add friends count and style
|
2013-01-02 07:59:16 -07:00 |