Raphael
|
c39b69ed8c
|
Rolled back some changes to spec_helper
|
2010-06-24 17:26:33 -07:00 |
|
maxwell
|
5f3a6a7aa0
|
MS mongomapper works kinda
|
2010-06-24 17:22:49 -07:00 |
|
Raphael
|
f0db58f912
|
Moved authentication to applicationcontroller for now, refactored posting statusmessages
|
2010-06-24 17:10:45 -07:00 |
|
ilya
|
0051e50433
|
IZ RS deploy to Mario
|
2010-06-23 22:55:00 -04:00 |
|
ilya
|
b4cc4e797f
|
RS IZ my newest fix
|
2010-06-23 20:29:57 -04:00 |
|
ilya
|
81157190ac
|
RS, IZ, Merged from master
|
2010-06-23 20:19:25 -04:00 |
|
ilya
|
8829714e2d
|
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
|
2010-06-23 20:17:44 -04:00 |
|
maxwell
|
a0eeb43176
|
DG friend url validation can now take a post, sligtly regressed on some really weird edge cases
|
2010-06-23 16:30:46 -07:00 |
|
maxwell
|
fb7ed9e0e7
|
DG MS pushing a small show page fix
|
2010-06-23 15:25:46 -07:00 |
|
maxwell
|
9d0d8ce5e5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/blogs/_blog.html.haml
|
2010-06-23 14:33:55 -07:00 |
|
maxwell
|
9fa26f020e
|
DG MS; clicking on a person's name redirects to that person's post stream
|
2010-06-23 14:32:51 -07:00 |
|
Raphael
|
6acee9d158
|
changed blog.owner to blog.person.real_name
|
2010-06-23 12:16:52 -07:00 |
|
maxwell
|
a673e48317
|
DG MS fixed js for statusmessage
|
2010-06-23 12:07:22 -07:00 |
|
maxwell
|
14bdd3efce
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 11:59:03 -07:00 |
|
maxwell
|
671772f901
|
MS DG added tinyMCE, now a blog is better than a status messsage
|
2010-06-23 11:58:46 -07:00 |
|
Raphael
|
f1e789cdd7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 11:29:41 -07:00 |
|
Raphael
|
0ff87037cb
|
Added inheritance spec to user
|
2010-06-23 11:28:53 -07:00 |
|
maxwell
|
fba4ce9e3b
|
DG MS; fixed flash message visual bug
|
2010-06-23 11:11:58 -07:00 |
|
Raphael
|
129e84336b
|
commented out use transactional fixtures, seemingly without effect
|
2010-06-23 10:33:02 -07:00 |
|
maxwell
|
b24f95e462
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 10:26:28 -07:00 |
|
maxwell
|
5e5dea85a8
|
pushing small js fixes
|
2010-06-23 10:25:49 -07:00 |
|
Raphael
|
5add5188c6
|
specified devise ref
|
2010-06-23 10:20:44 -07:00 |
|
maxwell
|
663b99924f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 01:26:06 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
Maxwell Salzberg
|
e6e1c22b07
|
DG; webhooks apply incoming posts to current friends with a silent fail on no match
|
2010-06-23 01:20:56 -07:00 |
|
Maxwell Salzberg
|
523cb6f15f
|
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
|
2010-06-22 23:27:31 -07:00 |
|
Maxwell Salzberg
|
9a44578c37
|
DG; Person is now the parent of Friend and User
|
2010-06-22 23:11:55 -07:00 |
|
Raphael
|
afbefcafb5
|
added thin log dir
|
2010-06-22 21:46:08 -07:00 |
|
maxwell
|
a6b36cb93e
|
terrible fix for 50 tests by stubbing WebSocket.stub in spec helper... warrenwarrents refator
|
2010-06-22 19:20:11 -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
|
94de043862
|
fixed not hardcoded port for websockets
|
2010-06-22 17:20:07 -07:00 |
|
maxwell
|
4cd90a16a1
|
pushing updated socket.rb...
|
2010-06-22 16:55:59 -07:00 |
|
maxwell
|
4af10a95fa
|
oops forgot to add jquery_form
|
2010-06-22 16:44:41 -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
|
10faac2a86
|
fixing merge
|
2010-06-22 15:17:00 -07:00 |
|
maxwell
|
989949a8c9
|
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
|
2010-06-22 15:14:55 -07:00 |
|
maxwell
|
13e5c58847
|
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
|
2010-06-22 15:14:04 -07:00 |
|
maxwell
|
789bf877f2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-22 14:31:38 -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 |
|
Raphael
|
540b56805d
|
Fixed misc_spec.rb
|
2010-06-22 10:50:35 -07:00 |
|
maxwell
|
9c1619059b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-22 10:42:45 -07:00 |
|
maxwell
|
0546bb2582
|
pulled in all of max's changes from yesterday to 187
|
2010-06-22 10:39:06 -07:00 |
|
Raphael
|
76c5c0ce5e
|
Changed environment in thin.yml to production
|
2010-06-22 10:37:25 -07:00 |
|
maxwell
|
0ef2214526
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
|
2010-06-22 10:33:45 -07:00 |
|
maxwell
|
cf80aa4010
|
merging master in.... now I am going to go back to 187
|
2010-06-22 10:32:13 -07:00 |
|
Raphael
|
81f5ca7ef3
|
added sprinkle to bundler
|
2010-06-22 10:29:01 -07:00 |
|