maxwell
|
cb23766012
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 09:03:04 -07:00 |
|
maxwell
|
01132e3dc0
|
pushing js changes
|
2010-07-01 09:02:38 -07:00 |
|
Raphael
|
27d29d5d40
|
RS; I should have figured this one out way earlier...
|
2010-07-01 01:22:37 -07:00 |
|
Raphael
|
a7659ae902
|
Marked the problem area in infieldlabels
|
2010-06-30 21:53:05 -07:00 |
|
Raphael
|
63b3d0186a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 21:19:32 -07:00 |
|
danielvincent
|
4153b7f387
|
commented out evenmachine for now
|
2010-06-30 19:31:25 -07:00 |
|
danielvincent
|
44362ee154
|
DG IZ MS; fixing tom's seed script
|
2010-06-30 18:53:29 -07:00 |
|
danielvincent
|
8038fb8585
|
DG IZ MS; eventmachine in tom's seed script
|
2010-06-30 18:43:51 -07:00 |
|
danielvincent
|
f759f5d1b7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 18:04:14 -07:00 |
|
danielvincent
|
12bbdb38a7
|
DG IZ deploying with correct names
|
2010-06-30 18:03:25 -07:00 |
|
maxwell
|
da59078b64
|
fixed small js bug so it only adds to the base route (or page 1 on pagination)
|
2010-06-30 17:49:45 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
Raphael
|
877f321d51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:26:25 -07:00 |
|
maxwell
|
40697167da
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:24:57 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
danielvincent
|
65321ed096
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:00:40 -07:00 |
|
danielvincent
|
fbd1195113
|
DG IZ; rake task for backer, can now pass in arguments [backer_num, password]
|
2010-06-30 16:00:29 -07:00 |
|
Raphael
|
5f927abffe
|
RS, slight clarification in common
|
2010-06-30 15:27:35 -07:00 |
|
Raphael
|
aa083735fa
|
Moved url mapping to push_to
|
2010-06-30 15:18:42 -07:00 |
|
maxwell
|
940b967bbb
|
fuck
|
2010-06-30 14:29:52 -07:00 |
|
maxwell
|
4077e4248e
|
pushing for cap deploy
|
2010-06-30 14:23:40 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
danielvincent
|
585906d3d4
|
DG IZ; db rake tasks ouput text; delete is now purge
|
2010-06-30 13:47:26 -07:00 |
|
danielvincent
|
df6ea31d3d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 13:36:23 -07:00 |
|
danielvincent
|
6d84eb2b6f
|
DG IZ; added rake db:reset, which aliases a delete and seed to the db
|
2010-06-30 13:36:15 -07:00 |
|
Raphael
|
34400594ec
|
RS, AML; fixed jumping to top of page on comment toggle
|
2010-06-30 13:29:20 -07:00 |
|
danielvincent
|
f7e4f1db32
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 13:12:09 -07:00 |
|
danielvincent
|
bb97aa9202
|
DG IZ; rake db:seed, rake db:delete
|
2010-06-30 11:57:11 -07:00 |
|
Raphael
|
3d976ca47e
|
RS, a little bit of autolinking in statuses and comments
|
2010-06-30 08:36:51 -07:00 |
|
Raphael
|
2b0659e21d
|
Comment toggle now applies to socketed posts
|
2010-06-30 08:28:24 -07:00 |
|
Raphael
|
340a57ea6d
|
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
|
2010-06-30 08:06:30 -07:00 |
|
danielvincent
|
74aa0debc8
|
stupid sans-serif bug finally squashed
|
2010-06-30 00:30:43 -07:00 |
|
maxwell
|
6bc68fb42e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 00:27:30 -07: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 |
|
danielvincent
|
a15cd932b6
|
nevermind, nevermind
|
2010-06-29 23:47:39 -07:00 |
|
danielvincent
|
8725ea2d57
|
high box shadow blur kills the client
|
2010-06-29 23:28:15 -07:00 |
|
danielvincent
|
cf8c669e83
|
login screen now black.
|
2010-06-29 23:24:31 -07:00 |
|
maxwell
|
93a4ac6f9c
|
added favicon from pubsite
|
2010-06-29 22:14:39 -07:00 |
|
danielvincent
|
70ece3c180
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 20:56:51 -07:00 |
|
danielvincent
|
e159b8f7f4
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/friends/show.html.haml
|
2010-06-29 20:56:44 -07:00 |
|
maxwell
|
fcbe8e42a0
|
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
|
2010-06-29 20:54:53 -07:00 |
|
danielvincent
|
19c41fb6be
|
DG IZ; comments show and hide
|
2010-06-29 20:53:49 -07:00 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -07:00 |
|
danielvincent
|
984f5f62b6
|
DG IZ; publisher reflects what type is selected
|
2010-06-29 19:55:50 -07:00 |
|
danielvincent
|
97cd3fb413
|
DG IZ; comment count in status message partial
|
2010-06-29 19:08:23 -07:00 |
|
danielvincent
|
8ff241cdde
|
DG IZ; all comments hidden by default. linking anchor issue.
|
2010-06-29 19:00:54 -07:00 |
|
danielvincent
|
746f2acaec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 18:00:09 -07:00 |
|
danielvincent
|
7d6783e446
|
DG IZ; more little changes to UI
|
2010-06-29 18:00:01 -07:00 |
|
maxwell
|
3937483bd3
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 17:45:19 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|