ilya
|
f5ecfebcb9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:23:44 -04:00 |
|
ilya
|
d4f528bba8
|
Removed bookmark new page, moved form to index
|
2010-06-25 23:23:37 -04:00 |
|
maxwell
|
faa5d21636
|
Change the form_for not to need a message passed, and adding it to the home page
|
2010-06-25 19:58:40 -07:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
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 |
|
ilya
|
5fb8d90738
|
added a validation to bookmark
|
2010-06-25 21:46:20 -04: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
|
720c68e2c6
|
Specs all pass
|
2010-06-25 18:18:20 -04:00 |
|
ilya
|
c0167a445a
|
RS, IZ; Ended spec pollution, fixed up blog spec
|
2010-06-25 18:04:09 -04:00 |
|
maxwell
|
f9879752d3
|
MS meh i have 17 failures if I run bundle exec autotest
|
2010-06-24 22:24:59 -07: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 |
|
Raphael
|
305cfb5eb0
|
removing science for real
|
2010-06-24 19:45:25 -07:00 |
|
Raphael
|
db08ef9a1a
|
Revert "science eliminated..."
This reverts commit 644d2943c0632365a7ecf9c4c7f95f763b3e1b03.
|
2010-06-24 19:44:55 -07:00 |
|
ilya
|
ade43e74f8
|
science eliminated...
|
2010-06-24 22:23:12 -04:00 |
|
ilya
|
4323bc5fe7
|
RS, IZ, specs working again for real
|
2010-06-24 20:47:03 -04:00 |
|
ilya
|
db8970eb48
|
RS, IZ, reversing Rafi's stupidity
|
2010-06-24 20:44:32 -04:00 |
|
ilya
|
3a26738446
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-24 20:33:45 -04:00 |
|
ilya
|
e44c6d9eda
|
RS IZ fixed the specs running
|
2010-06-24 20:33:40 -04:00 |
|
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 |
|