Commit graph

98 commits

Author SHA1 Message Date
danielvincent
6ce0f4464f reverted publisher javascript refactor. working again in chrome. 2010-07-01 20:04:31 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
Raphael
90b750acb2 Renamed jpegs to jpgs 2010-07-01 18:12:00 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
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
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
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
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -07:00
maxwell
38465c350c RS, MS; Forms now clear 2010-07-01 11:19:08 -07:00
Raphael
a7659ae902 Marked the problem area in infieldlabels 2010-06-30 21:53:05 -07:00
danielvincent
df6ea31d3d Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-30 13:36:23 -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
Raphael
2b0659e21d Comment toggle now applies to socketed posts 2010-06-30 08:28:24 -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
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
8ff241cdde DG IZ; all comments hidden by default. linking anchor issue. 2010-06-29 19:00:54 -07:00
danielvincent
7d6783e446 DG IZ; more little changes to UI 2010-06-29 18:00:01 -07:00
danielvincent
0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2 DG IZ; cool labels fade in 2010-06-29 17:27:09 -07:00
maxwell
eebed9d457 fixed publisher in chrome and broke it out to a seperate js file 2010-06-29 17:04:46 -07:00
danielvincent
39a1874ce3 DG IZ; all input fields are now textareas on dashboard page 2010-06-29 16:28:12 -07:00
maxwell
a0a0b9d0ad fixed stream bull 2010-06-29 15:05:09 -07:00
maxwell
ee9acc5c82 thanks to dan, GS works great now MS RS 2010-06-29 15:00:30 -07:00
danielvincent
67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/views/layouts/application.html.haml
2010-06-29 14:36:46 -07:00
danielvincent
5193a20458 DG IZ; getting there. 2010-06-29 14:34:33 -07:00
maxwell
6532962c1c trying to get google analytics working 2010-06-29 13:58:36 -07:00
maxwell
60336bd520 trying to get GS working 2010-06-29 13:45:54 -07:00
maxwell
f9d4eff7b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-29 12:32:07 -07:00
danielvincent
260805af64 DG IZ; publisher box & profile picture placeholder 2010-06-29 12:25:36 -07:00
maxwell
a683a2c1aa RS MS added goog analytics 2010-06-29 11:45:41 -07:00
danielvincent
01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	public/stylesheets/sass/application.sass
2010-06-28 22:18:47 -07:00
danielvincent
08d6a46bd8 login page 2010-06-28 22:18:05 -07:00