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

200 commits

Author SHA1 Message Date
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -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
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
maxwell
e696ef7023 comments now go go go and are tested RS MS 2010-06-30 16:24:44 -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
Raphael
3d976ca47e RS, a little bit of autolinking in statuses and comments 2010-06-30 08:36:51 -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
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
cf8c669e83 login screen now black. 2010-06-29 23:24:31 -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
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
7961d11669 uncommenting get satisfaction 2010-06-29 17:09:07 -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
a685c6c0ab Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-29 16:28:20 -07:00
danielvincent
39a1874ce3 DG IZ; all input fields are now textareas on dashboard page 2010-06-29 16:28:12 -07:00
maxwell
77c0bb5c4e urls are now unique, and a user can not add a friend with the exact same url 2010-06-29 16:04:15 -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
19e03c7077 person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field 2010-06-29 12:33:00 -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