Raphael
|
80b69fd3ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:13:17 -07:00 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
Raphael
|
d9cff39bed
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:09:49 -07:00 |
|
Raphael
|
51e36b9659
|
RS, merged publisher refactor
|
2010-07-01 17:09:35 -07:00 |
|
maxwell
|
8d1ec57fa4
|
beefed it up to ie 7
|
2010-07-01 17:07:36 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|
danielvincent
|
d0560e6c74
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:57:58 -07:00 |
|
danielvincent
|
d935db7845
|
newest message font fix
|
2010-07-01 16:54:27 -07:00 |
|
Raphael
|
a70fbc6a4a
|
Changed cap script
|
2010-07-01 16:54:12 -07:00 |
|
maxwell
|
86c6cdcafa
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:38:51 -07:00 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
danielvincent
|
c27bc09e75
|
fixed user image bug
|
2010-07-01 16:35:44 -07:00 |
|
danielvincent
|
b25880f04a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:25:11 -07:00 |
|
danielvincent
|
03e7071aae
|
fixed nav list/link deal for firefox, html compliance
|
2010-07-01 16:24:51 -07:00 |
|
maxwell
|
ce60d6a93d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:17:41 -07:00 |
|
maxwell
|
6f17e5f28f
|
added chrome frame for ie lameos
|
2010-07-01 16:17:32 -07:00 |
|
ilya
|
eb0578df93
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 18:52:59 -04:00 |
|
ilya
|
8b12f73581
|
pins added, typo
|
2010-07-01 18:52:49 -04:00 |
|
maxwell
|
b0a3feb30c
|
fixed g analytics
|
2010-07-01 15:51:17 -07:00 |
|
ilya
|
01fe2a5569
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 18:43:41 -04:00 |
|
ilya
|
bc82b23f1d
|
pins added
|
2010-07-01 18:43:33 -04:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
danielvincent
|
d41a970202
|
DG IZ; missed one typo. huge explosion.
|
2010-07-01 13:07:00 -07:00 |
|
danielvincent
|
079c4ec76e
|
DG IZ; typo fix; also added more presidential names
|
2010-07-01 12:52:46 -07:00 |
|
danielvincent
|
53070134de
|
fixed populate and deploy for qunicyadams
|
2010-07-01 11:57:54 -07:00 |
|
ilya
|
48dbea7198
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 14:41:13 -04:00 |
|
ilya
|
767c3c1979
|
now friending everyone and all servers deploy
|
2010-07-01 14:40:59 -04:00 |
|
maxwell
|
8c6f197434
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 11:19:18 -07:00 |
|
maxwell
|
38465c350c
|
RS, MS; Forms now clear
|
2010-07-01 11:19:08 -07:00 |
|
danielvincent
|
99d12964b6
|
to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga
|
2010-07-01 10:55:22 -07:00 |
|
ilya
|
5285753486
|
IZ warzombie route, the method is in the dsashboard controller
|
2010-07-01 13:28:17 -04:00 |
|
maxwell
|
428284abeb
|
sorry about that, removed tiny mce, but we still had things which inited it
|
2010-07-01 09:15:27 -07:00 |
|
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 |
|