ilya
|
4323bc5fe7
|
RS, IZ, specs working again for real
|
2010-06-24 20:47:03 -04:00 |
|
Raphael
|
f0db58f912
|
Moved authentication to applicationcontroller for now, refactored posting statusmessages
|
2010-06-24 17:10:45 -07: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
|
fb7ed9e0e7
|
DG MS pushing a small show page fix
|
2010-06-23 15:25:46 -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
|
671772f901
|
MS DG added tinyMCE, now a blog is better than a status messsage
|
2010-06-23 11:58:46 -07:00 |
|
maxwell
|
fba4ce9e3b
|
DG MS; fixed flash message visual bug
|
2010-06-23 11:11:58 -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 |
|
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
|
aa7a2da3d1
|
put debug back into websocket
|
2010-06-22 16:23:15 -07:00 |
|
maxwell
|
cc89cd5cda
|
reload object before send to websocket
|
2010-06-22 16:12:15 -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
|
3064d208eb
|
added firefox websocket stuffs, only loads if it is not safari or chrome
|
2010-06-22 14:31:16 -07:00 |
|
maxwell
|
0546bb2582
|
pulled in all of max's changes from yesterday to 187
|
2010-06-22 10:39:06 -07:00 |
|
maxwell
|
3a8394bd59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
|
2010-06-21 19:24:07 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
danielvincent
|
1233c60f6f
|
DG IZ; user's real name displayed on top of every page
|
2010-06-21 16:09:48 -07:00 |
|
danielvincent
|
a1361da770
|
DG IZ; friend and owner now require a real name
|
2010-06-21 15:56:40 -07:00 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
danielvincent
|
7f795e05cb
|
Merge branch 'master' into half-decent
Conflicts:
app/controllers/dashboard_controller.rb
|
2010-06-21 14:25:22 -07:00 |
|
danielvincent
|
06271d5821
|
added dumb partial switcher function in dashboard controller
|
2010-06-21 14:23:59 -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 |
|
danielvincent
|
26d675af11
|
some sass cleanup
|
2010-06-20 18:36:01 -07:00 |
|
danielvincent
|
c542c08e38
|
simpler
|
2010-06-20 17:06:10 -07:00 |
|
danielvincent
|
6647ce34ab
|
status message and bookmark page
|
2010-06-20 14:52:04 -07:00 |
|
danielvincent
|
aee5f7f04f
|
took out filler elements
|
2010-06-20 11:49:05 -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 |
|
danielvincent
|
df2b9d6ad4
|
more shuffling
|
2010-06-19 14:44:08 -07:00 |
|
maxwell
|
2f6a11f018
|
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
|
2010-06-19 14:42:23 -07:00 |
|
danielvincent
|
0c392a0cce
|
moved nav to bottom header
|
2010-06-19 03:01:39 -07:00 |
|
danielvincent
|
d1630b6c45
|
shrink that header
|
2010-06-19 00:53:42 -07:00 |
|
maxwell
|
f06b645b9c
|
typo in Friend
|
2010-06-19 00:50:16 -07:00 |
|
maxwell
|
5afb97b5f7
|
dashboard controller stopped resolving, but the old behavior seems to work now...nnot sure why, could have been mongoid bug...
|
2010-06-19 00:49:35 -07:00 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
danielvincent
|
1223011a4f
|
more semi-drastic changes.
|
2010-06-19 00:01:25 -07:00 |
|
maxwell
|
63866a8128
|
playing
|
2010-06-18 23:47:42 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
maxwell
|
5286b6be69
|
DG MS; require XML root node; added header to XML (not yet required)
|
2010-06-18 18:03:13 -07:00 |
|
maxwell
|
34df8fa946
|
DG MS; resolved unknown types going to receive handler. only post objects are inputted
|
2010-06-18 16:47:34 -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 |
|