maxwell
|
68bd5bf5f5
|
MS merging in master again
|
2010-08-24 16:21:20 -07:00 |
|
ilya
|
45f3eb2a9a
|
trying yet again
|
2010-08-24 15:37:55 -07:00 |
|
maxwell
|
46f062a5f3
|
fixing merge confilts
|
2010-08-24 14:50:01 -07:00 |
|
maxwell
|
00be2a6c40
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:46:02 -07:00 |
|
Raphael
|
143db96d7e
|
No more socket debug
|
2010-08-24 14:45:50 -07:00 |
|
maxwell
|
f5316fb3c1
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:45:04 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
ed99532a83
|
memory leak gone for real
|
2010-08-23 16:52:19 -07:00 |
|
Raphael
|
74be86395b
|
Changing env back to development mode, the memory leak is likely fixed
|
2010-08-23 16:33:44 -07:00 |
|
Raphael
|
efb4100e01
|
Split up socket debug and app debug
|
2010-08-23 13:58:09 -07:00 |
|
Raphael
|
97aa8a4dc9
|
No photos index route
|
2010-08-23 13:57:33 -07:00 |
|
Raphael
|
51b07784fe
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-19 16:47:01 -07:00 |
|
Raphael
|
170ef67181
|
set browser in selenium.yml for linux
|
2010-08-19 16:43:56 -07:00 |
|
Raphael
|
f66b5f4006
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
|
2010-08-19 16:09:08 -07:00 |
|
maxwell
|
20678060e7
|
selenium, ymls, a sample test
|
2010-08-19 15:44:23 -07:00 |
|
ilya
|
e277244614
|
Fixing users routes
|
2010-08-19 10:38:42 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
maxwell
|
ff41277088
|
one thing beta couldnt handle
|
2010-08-18 21:34:02 -07:00 |
|
Raphael
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
maxwell
|
d054162bbe
|
more RC updating stuff
|
2010-08-18 20:51:55 -07:00 |
|
Raphael
|
701bec670f
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 20:50:28 -07:00 |
|
maxwell
|
6e2c42f8de
|
MS app now works with rc1
|
2010-08-18 17:42:04 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
55b4d4758f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
|
2010-08-17 22:58:46 -07:00 |
|
Raphael
|
55d84b3288
|
Broke up user spec, put user update back in routes
|
2010-08-17 22:03:45 -07:00 |
|
Raphael
|
d2f50008f7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
config/routes.rb
|
2010-08-17 19:42:30 -07:00 |
|
Raphael
|
0f9190cd02
|
put an only on the users routes
|
2010-08-17 19:41:44 -07:00 |
|
Raphael
|
e8e141b24e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 19:04:03 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
8619584834
|
things mostly working
|
2010-08-17 18:27:50 -07:00 |
|
Raphael
|
6901b4f83e
|
Devise routes
|
2010-08-17 17:54:20 -07:00 |
|
Raphael
|
7186f3537a
|
Move back paragraph tag in confirmations view
|
2010-08-17 17:48:00 -07:00 |
|
Raphael
|
188f555c72
|
Actionmailer actually working
|
2010-08-17 15:47:41 -07:00 |
|
Raphael
|
a74ea7e80f
|
Back to config actionmailer, the settings are getting set, try mail.joindiaspora.com
|
2010-08-17 15:31:14 -07:00 |
|
Raphael
|
46e7dbedac
|
Trying to get actionmailer working
|
2010-08-17 15:19:41 -07:00 |
|
Raphael
|
f84d7962fc
|
actionmailer config
|
2010-08-17 14:06:00 -07:00 |
|
Raphael
|
cbb1b550ff
|
Default url
|
2010-08-17 14:03:30 -07:00 |
|
Raphael
|
2ede5f499f
|
Commas
|
2010-08-17 13:53:15 -07:00 |
|
Raphael
|
424f576d95
|
Actionmailer config
|
2010-08-17 13:48:09 -07:00 |
|
Raphael
|
1d6e132a9f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 13:07:26 -07:00 |
|
Raphael
|
842b321dfa
|
User email checking, routes working again
|
2010-08-17 13:02:42 -07:00 |
|
Raphael
|
b55a99ec09
|
conf changes, kill nginx with go_cold
|
2010-08-17 11:42:59 -07:00 |
|
Raphael
|
2261a0d8a4
|
nginx...
|
2010-08-17 11:28:22 -07:00 |
|
Raphael
|
16f53922c5
|
nginx conf done, comments deleted
|
2010-08-17 11:22:06 -07:00 |
|
Raphael
|
29e3fa4d04
|
sprinkle role
|
2010-08-17 11:04:34 -07:00 |
|
Raphael
|
453cb06691
|
changing settings and deploy scripts, validating email
|
2010-08-17 11:01:30 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
ilya
|
7e377fc292
|
RS, IZ; adding set backer number to routes, not authenticating it
|
2010-08-13 12:37:49 -07:00 |
|
Raphael
|
599d1da620
|
Moved socket code out to lib, unsocketing from view should now work again
|
2010-08-11 12:03:26 -07:00 |
|
Raphael
|
bd7ce5250f
|
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
|
2010-08-10 17:14:58 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
Raphael
|
0a40efdaf7
|
Removing unused messages
|
2010-08-09 10:47:45 -07:00 |
|
ilya
|
27b4c19337
|
Getting the deployment changes from master
|
2010-08-08 21:24:34 -07:00 |
|
Raphael
|
8356126f8d
|
Added deploy key
|
2010-08-05 15:44:18 -07:00 |
|
ilya
|
5dfc097c88
|
replaced the functionality with openssl, didn't do the encryption spec
|
2010-08-04 20:32:15 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
Raphael
|
e3c28c4fee
|
Fixed Photos, and Carrierwave initializer
|
2010-08-02 21:31:14 -07:00 |
|
Raphael
|
6b1f020839
|
Moved utilities out to special controller, took pound sign out of database name
|
2010-08-02 18:03:16 -07:00 |
|
ilya
|
1b32afc78f
|
Switching to Grid_FS, correctly
|
2010-07-23 14:53:12 -07:00 |
|
Raphael
|
84b4d12e18
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 11:06:19 -07:00 |
|
Raphael
|
61ffda6bf4
|
re-enabling sprinkle script
|
2010-07-23 11:05:29 -07:00 |
|
ilya
|
8f70fb89c0
|
RS IZ Switching to production
|
2010-07-23 10:41:57 -07:00 |
|
maxwell
|
0fdce91756
|
DG MS added views for ostatus following
|
2010-07-22 21:27:43 -07:00 |
|
ilya
|
e75cb8e8d2
|
Changing back to gridfs
|
2010-07-22 11:47:44 -07:00 |
|
ilya
|
9686aad842
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:26:39 -07:00 |
|
ilya
|
d7e546c3b3
|
RS IZ Vim in sprinkle, not too nice
|
2010-07-21 15:26:08 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
ilya
|
cb67a7fa1b
|
RS IZ sprinkle editing
|
2010-07-21 10:04:55 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -07:00 |
|
maxwell
|
ec3f6e6765
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-17 19:22:26 -07:00 |
|
Raphael
|
1b2024f5bb
|
Adding imagemagick to sprinkle
|
2010-07-17 18:50:46 -07:00 |
|
maxwell
|
917d58acbb
|
MS found one more duplicate in the Gemfile
|
2010-07-17 14:10:31 -07:00 |
|
ilya
|
5a6fd7c6a0
|
hopefully imagemagic take 2
|
2010-07-16 23:19:33 -07:00 |
|
ilya
|
a34a458ba5
|
hopefully imagemagic will work
|
2010-07-16 23:15:42 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
Raphael
|
bb4d5cad59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 17:26:22 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
maxwell
|
99f7e938fd
|
made a pubsubhub constant
|
2010-07-16 12:42:36 -07:00 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
Raphael
|
89cf2db10e
|
fixing db seed
|
2010-07-15 15:47:27 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
ilya
|
8d525f2d4f
|
fixed warzombie
|
2010-07-13 11:27:05 -07:00 |
|
ilya
|
3dfb55ee85
|
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
|
2010-07-11 00:04:08 -04:00 |
|
maxwell
|
603fc15120
|
MS IZ added the env setting line to factories
|
2010-07-10 23:54:25 -07:00 |
|
maxwell
|
a02a833625
|
updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too
|
2010-07-10 00:32:58 -07:00 |
|
ilya
|
eb9c6814d6
|
screen in tools, keyring clearing disabled
|
2010-07-09 13:36:24 -04:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
ilya
|
cdd6e2034e
|
Updated deploy scripts
|
2010-07-09 00:23:37 -04:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
895742824d
|
Sped up specs, fixed env
|
2010-07-08 21:23:08 -04:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -04:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
maxwell
|
11d4a9e2c7
|
rolled back some message handler nonsense
|
2010-07-08 11:16:38 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
Raphael
|
5e78163df3
|
added bundler to gemfile
|
2010-07-06 19:23:34 -07:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
Raphael
|
ad5c8ba548
|
dev env
|
2010-07-01 20:30:19 -07:00 |
|
Raphael
|
d211d23637
|
Thin now should stop
|
2010-07-01 19:35:31 -07:00 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|
ilya
|
5285753486
|
IZ warzombie route, the method is in the dsashboard controller
|
2010-07-01 13:28:17 -04:00 |
|
maxwell
|
dc5b321b62
|
sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up.
|
2010-06-30 00:27:11 -07:00 |
|
maxwell
|
1b2745e788
|
added socket renderer spec and slight refactor
|
2010-06-29 11:50:15 -07:00 |
|
maxwell
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
maxwell
|
46ab63de36
|
added will pagination action.
|
2010-06-28 21:56:58 -07:00 |
|
maxwell
|
36b5a90d34
|
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
|
2010-06-28 17:35:38 -07:00 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
3d76fa26ba
|
RS IZ testing GUID
|
2010-06-28 14:28:01 -04:00 |
|
maxwell
|
2b5cf0d265
|
my websocket works. wut up
|
2010-06-28 10:11:47 -07:00 |
|
maxwell
|
60091012bf
|
on client connect, websockets now tell the server where the user is. nothing more
|
2010-06-28 01:12:21 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
maxwell
|
f9879752d3
|
MS meh i have 17 failures if I run bundle exec autotest
|
2010-06-24 22:24:59 -07:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
maxwell
|
5f3a6a7aa0
|
MS mongomapper works kinda
|
2010-06-24 17:22:49 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
maxwell
|
fd5d7c63ad
|
messy application.haml file i know, but now the sockets only update pages which want their data
|
2010-06-22 18:59:11 -07:00 |
|
maxwell
|
4cd90a16a1
|
pushing updated socket.rb...
|
2010-06-22 16:55:59 -07:00 |
|
maxwell
|
aa7a2da3d1
|
put debug back into websocket
|
2010-06-22 16:23:15 -07:00 |
|
maxwell
|
56e940131f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-22 16:12:56 -07:00 |
|
maxwell
|
cc89cd5cda
|
reload object before send to websocket
|
2010-06-22 16:12:15 -07:00 |
|
Raphael
|
65f4a7f378
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-22 15:47:32 -07:00 |
|
Raphael
|
bfe5769fcb
|
rolled back to development environment
|
2010-06-22 15:47:18 -07:00 |
|
maxwell
|
3064d208eb
|
added firefox websocket stuffs, only loads if it is not safari or chrome
|
2010-06-22 14:31:16 -07:00 |
|
maxwell
|
9c1619059b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-22 10:42:45 -07:00 |
|
Raphael
|
76c5c0ce5e
|
Changed environment in thin.yml to production
|
2010-06-22 10:37:25 -07:00 |
|
maxwell
|
cf80aa4010
|
merging master in.... now I am going to go back to 187
|
2010-06-22 10:32:13 -07:00 |
|
maxwell
|
531ab3ab83
|
turned off mutex in dev
|
2010-06-22 10:19:36 -07:00 |
|
maxwell
|
51279cd519
|
turned on mutex in dev. totally my bad
|
2010-06-22 10:12:13 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
maxwell
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
maxwell
|
3581f7a7d6
|
merged in socket
|
2010-06-20 22:13:24 -07:00 |
|
maxwell
|
5b02597a05
|
added socket to initializers
|
2010-06-20 22:04:49 -07:00 |
|
maxwell
|
1610e72de9
|
fixed merge
|
2010-06-20 11:13:21 -07:00 |
|
maxwell
|
da9bcb8bec
|
just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly
|
2010-06-19 15:53:37 -07:00 |
|
maxwell
|
5637fa4e4c
|
update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env
|
2010-06-19 15:48:50 -07:00 |
|
maxwell
|
1fcd758bd4
|
removed the mutex, added rack fiber pool. this thing screams
|
2010-06-19 15:07:12 -07:00 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
Raphael Sofaer
|
807314d469
|
added htop to sprinkle
|
2010-06-18 23:54:32 -07:00 |
|
maxwell
|
63866a8128
|
playing
|
2010-06-18 23:47:42 -07:00 |
|
Raphael Sofaer
|
acfa7df1c5
|
Merge Capistrano into master
|
2010-06-18 23:41:02 -07:00 |
|
Raphael Sofaer
|
fbe8915250
|
IZ uncommented the lines for the rackspace deploy
|
2010-06-18 22:08:17 -07:00 |
|
Raphael Sofaer
|
cd1ed1d164
|
Hopefully final conf changes
|
2010-06-18 19:02:59 -07:00 |
|
Raphael Sofaer
|
c435ba28f9
|
changing configures...
|
2010-06-18 18:09:57 -07:00 |
|
Raphael Sofaer
|
ac24a9bcef
|
changing configures...
|
2010-06-18 17:58:11 -07:00 |
|
Raphael Sofaer
|
b9d3930c61
|
changing configures...
|
2010-06-18 17:56:12 -07:00 |
|
Raphael Sofaer
|
8c988be7d9
|
changed yml again
|
2010-06-18 17:49:46 -07:00 |
|
Raphael Sofaer
|
bc9158eaeb
|
changed thin yml
|
2010-06-18 17:46:52 -07:00 |
|
Raphael Sofaer
|
178085b984
|
RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf
|
2010-06-18 17:33:43 -07:00 |
|
maxwell
|
c430aaff18
|
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
|
2010-06-18 14:35:51 -07:00 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
Raphael Sofaer
|
560269ef87
|
cleaning up sprinkle
|
2010-06-17 20:52:51 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
Raphael Sofaer
|
9dd72123fc
|
deleted confusing deploy.rb
|
2010-06-17 16:24:02 -07:00 |
|
danielvincent
|
43207aeb41
|
pending: resolving post action in queue
|
2010-06-16 23:12:23 -07:00 |
|
Raphael Sofaer
|
3aa2191365
|
RS IZ deploy stuffz
|
2010-06-16 19:42:39 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
maxwell
|
9e89b2e0a7
|
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
|
2010-06-15 21:08:29 -07:00 |
|
danielvincent
|
45c926f790
|
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
|
2010-06-15 11:09:47 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
4532c39e93
|
DG MS; Status messages have owner field; defaults to user
|
2010-06-14 17:13:07 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
maxwell
|
29c6f9fa0f
|
DG, MS, IZ; status messages now functional
|
2010-06-13 22:11:16 -07:00 |
|
maxwell
|
28ba205ef3
|
blerg rspec cache sux
|
2010-06-13 21:08:17 -07:00 |
|
maxwell
|
1029fd5854
|
made devise routes slightly more intutive. chore completed MS
|
2010-06-13 16:28:48 -07:00 |
|
danielvincent
|
eaeafd3240
|
added authentication via devise
|
2010-06-12 21:56:50 -07:00 |
|
danielvincent
|
8ecaf240e6
|
user session model authenticates against users
|
2010-06-12 19:51:54 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
maxwell
|
e1a0c2f365
|
got rspec fully working
|
2010-06-12 14:44:58 -07:00 |
|
Maxwell Salzberg
|
a663844eef
|
MS IZ set up mongoid and got rid of activerecord sqlite3 nonsense
|
2010-06-12 00:59:19 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|