ilya
|
f5d1ab14fb
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:58 -04:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
maxwell
|
a89e0d4a7f
|
We are sorry.
|
2010-06-25 18:46:27 -07:00 |
|
maxwell
|
2566b2d4e1
|
added person validations
|
2010-06-25 18:31:35 -07:00 |
|
maxwell
|
884af9a3b6
|
added debug partial
|
2010-06-25 15:35:40 -07:00 |
|
maxwell
|
b105b0d6f2
|
merged in
|
2010-06-25 15:34:40 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
ilya
|
c0167a445a
|
RS, IZ; Ended spec pollution, fixed up blog spec
|
2010-06-25 18:04:09 -04:00 |
|
maxwell
|
64c1d99b8c
|
MS found the stupid nil. from here, i have 33 failures.
|
2010-06-24 22:20:09 -07:00 |
|
ilya
|
179af4fbfa
|
Merged mongomapper and master
|
2010-06-25 00:11:45 -04:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
ilya
|
4323bc5fe7
|
RS, IZ, specs working again for real
|
2010-06-24 20:47:03 -04: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
|
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
|
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 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
maxwell
|
043924b5f5
|
made everyting so the lastest is the first thing you see
|
2010-06-17 20:58:20 -07:00 |
|
danielvincent
|
39118293eb
|
DG MS; fixed minor webhook bug when generating xml collection.
|
2010-06-17 18:45:50 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
danielvincent
|
ba6d136bc7
|
DG MS; added specs for common module
|
2010-06-17 15:22:02 -07:00 |
|
danielvincent
|
628af0372f
|
DG MS; completed event-queue intergration.
|
2010-06-17 14:29:41 -07:00 |
|
danielvincent
|
3371b87fff
|
DG MS; queue works. just need to move some tests over.
|
2010-06-17 11:32:13 -07:00 |
|
danielvincent
|
4cecb522b6
|
DG MS; queue still working. half-way finished cleaning up code.
|
2010-06-17 10:36:54 -07:00 |
|
danielvincent
|
d91cec0881
|
queue works. needs cleanup.
|
2010-06-17 10:29:30 -07:00 |
|
Maxwell Salzberg
|
67535c1113
|
tried to git rid of error in em-http-request
|
2010-06-17 09:20:59 -07:00 |
|
danielvincent
|
43207aeb41
|
pending: resolving post action in queue
|
2010-06-16 23:12:23 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
danielvincent
|
c63eac0fd9
|
added line delimiters for post stream on dashboard
|
2010-06-15 22:34:08 -07:00 |
|
Raphael Sofaer
|
ed26c82be4
|
RS, IZ; merged day's commits
|
2010-06-15 21:41:39 -07:00 |
|
Raphael Sofaer
|
8213443afd
|
RS, IZ; stubbed out and wrapped curl backtick
|
2010-06-15 21:34:52 -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 |
|
Raphael Sofaer
|
34127b070a
|
IZ Made the specs pass, time to clean
|
2010-06-15 20:38:14 -07:00 |
|
Raphael Sofaer
|
c4b931c309
|
IZ RS getting remote messages (not yet done)
|
2010-06-15 18:41:54 -07:00 |
|
maxwell
|
e6f3fc1d38
|
DG MS more test cleanup and removed a deprecation warning
|
2010-06-15 17:38:12 -07:00 |
|
maxwell
|
497b477e89
|
DG MS added a post model, going to put it more places than just status message now
|
2010-06-15 17:21:57 -07:00 |
|
danielvincent
|
f69a2bd8a1
|
RS; Merging whitespace
|
2010-06-15 11:14:00 -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 |
|
ilya
|
8a37843cd9
|
IZ no more message= in newest in status message model
|
2010-06-15 13:23:24 -04:00 |
|
ilya
|
ee295d01ff
|
IZ using factories for the spec
|
2010-06-15 13:18:26 -04:00 |
|
danielvincent
|
99d9e50ed6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-15 10:12:14 -07:00 |
|
danielvincent
|
d70cf5b7a7
|
DG RS; fixed newest messages bug in view. moved to helper.
|
2010-06-15 10:11:28 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
58dfefc3ca
|
added home to nav bar
|
2010-06-14 18:50:38 -07:00 |
|
maxwell
|
3c3c194ed5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-14 17:48:50 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
ilya
|
08e64450f3
|
IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version
|
2010-06-14 20:34:03 -04:00 |
|
maxwell
|
4532c39e93
|
DG MS; Status messages have owner field; defaults to user
|
2010-06-14 17:13:07 -07:00 |
|
maxwell
|
1f73c2351e
|
DG MS IZ; Status message renders to and from xml; Friend model in place
|
2010-06-14 16:20:57 -07:00 |
|
maxwell
|
db44081186
|
MS IZ DG completed friends should be displayed on dashboard
|
2010-06-14 13:17:20 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
danielvincent
|
63f5fe15d6
|
nav includes users and status messages
|
2010-06-14 11:55:52 -07:00 |
|
danielvincent
|
4584f1309e
|
Merge branch 'blueprint'
|
2010-06-14 11:51:56 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
maxwell
|
0ff541ba43
|
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
|
2010-06-14 11:05:55 -07:00 |
|
maxwell
|
29c6f9fa0f
|
DG, MS, IZ; status messages now functional
|
2010-06-13 22:11:16 -07:00 |
|
maxwell
|
85e6eb2132
|
added stray local files
|
2010-06-13 21:22:52 -07:00 |
|
maxwell
|
28ba205ef3
|
blerg rspec cache sux
|
2010-06-13 21:08:17 -07:00 |
|
maxwell
|
865d7d18cb
|
user login now drops to a dashboard page
|
2010-06-13 20:00:31 -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
|
8b0c3725a5
|
push for rafi
|
2010-06-12 15:55:29 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|