nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4872 commits 4 branches 0 tags 121 MiB
Commit graph

877 commits

Author SHA1 Message Date
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