nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1843 commits 4 branches 0 tags 121 MiB
Commit graph

325 commits

Author SHA1 Message Date
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
maxwell
45a9d9e342 moved the silly destory link over a bit 2010-06-28 22:15:52 -07:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
danielvincent
5be5d82eb7 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 20:42:12 -07:00
ilya
30667a5bc9 The photo 2010-06-28 23:40:34 -04:00
ilya
775aab996a DG IZ picture in the profile 2010-06-28 23:39:55 -04:00
danielvincent
ab086e5b0e Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 20:39:34 -07:00
maxwell
36b5a90d34 MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works 2010-06-28 17:35:38 -07:00
danielvincent
fd082f52bc fixed stream's sans font showing up on linux. 2010-06-28 12:35:31 -07:00
danielvincent
462bd96189 ui fixup 2010-06-27 16:17:42 -07:00
danielvincent
5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/status_messages/_status_message.html.haml
 2010-06-27 10:32:23 -07:00
danielvincent
39e85754d8 nav should be collapsed into a filter list. comments are more clear. 2010-06-26 00:07:21 -07:00
ilya
a7d46bffab removed socket.js 2010-06-26 02:08:19 -04:00
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
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
maxwell
5cade230ac added silly debug toggle 2010-06-25 15:33:23 -07:00
maxwell
a673e48317 DG MS fixed js for statusmessage 2010-06-23 12:07:22 -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
5e5dea85a8 pushing small js fixes 2010-06-23 10:25:49 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
maxwell
94de043862 fixed not hardcoded port for websockets 2010-06-22 17:20:07 -07:00
maxwell
4af10a95fa oops forgot to add jquery_form 2010-06-22 16:44:41 -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
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
a0417d13af fixed merge with master 2010-06-21 14:38:38 -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
7bc165d7a0 added js file 2010-06-20 22:11:37 -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
danielvincent
df2b9d6ad4 more shuffling 2010-06-19 14:44:08 -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
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
danielvincent
de8d8d5cb5 in the shit 2010-06-18 23:32:47 -07:00
danielvincent
c63eac0fd9 added line delimiters for post stream on dashboard 2010-06-15 22:34:08 -07:00
maxwell
408c2c719d swaped out js for jquery 2010-06-15 09:53:19 -07:00
maxwell
3eef53892c DG MS; Dashboard shows the user's most recent update 2010-06-14 17:48:21 -07:00
danielvincent
63f5fe15d6 nav includes users and status messages 2010-06-14 11:55:52 -07:00
danielvincent
5d273ef049 removed stray rails.png file 2010-06-14 11:51:03 -07:00
danielvincent
98abb75097 added blueprint 2010-06-14 11:50:17 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -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