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

1305 commits

Author SHA1 Message Date
Daniel Vincent Grippi
e94b48e19a Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
 2010-09-15 15:55:18 -07:00
maxwell
6e29a66e09 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/user.rb
 2010-09-15 15:46:15 -07:00
maxwell
3a4eb294f8 MS made it two callbacks for handles and keys 2010-09-15 15:45:26 -07:00
Daniel Vincent Grippi
b2b2748fea seed aspects on user create 2010-09-15 15:39:04 -07:00
Daniel Vincent Grippi
82ada7d2d6 Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 15:36:59 -07:00
Daniel Vincent Grippi
cd21ee8652 just seed family and work 2010-09-15 15:36:41 -07:00
maxwell
7741951a42 MS removing production stuff from master... yowch 2010-09-15 15:26:06 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
c1077b3eed Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 14:11:24 -07:00
maxwell
55c1530c9f MS DG fixing an edit profile bug 2010-09-15 14:09:05 -07:00
maxwell
b68ec3a5b8 MS DG setting diaspora handle in a unclean way 2010-09-15 13:53:36 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
aad24fdfcc Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 12:22:16 -07:00
Daniel Vincent Grippi
57bd052c5b user edit bug 2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
97b0b7b322 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:59:51 -07:00
Daniel Vincent Grippi
deac53f178 see yourself in aspect sidebar, because you're going to post to yourself anyway 2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
10bbf367ad Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 11:55:52 -07:00
Daniel Vincent Grippi
fe35d60b13 hack on aspect nav for ff & chrome compatability 2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474 fixed 500 error with @photos 2010-09-15 11:24:23 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065 moving things around for consistency. consistency isn't pretty right now. 2010-09-15 10:26:57 -07:00
Raphael
8c8eb02316 Reset albumscontroller 2010-09-15 10:20:46 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
Raphael
d63cc358c5 Remerging master and production 2010-09-15 09:48:06 -07:00
Daniel Vincent Grippi
4a86632cf3 show default user photos for requests 2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
8647220328 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 20:44:47 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8 profile photo doesn't change to null if not changed on profile update 2010-09-14 19:48:11 -07:00
Daniel Vincent Grippi
f256d433fd nevermind 2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi
02e1ed82a3 making profiles socket 2010-09-14 19:07:23 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
ilya
8aa39c5f08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:58:55 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
be7c3f28a9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc spelling mistake, broken links on search page 2010-09-14 11:42:47 -07:00
Daniel Vincent Grippi
426d038aaf Remove email based filter 2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125 remember that aspects are seeded 2010-09-14 11:15:10 -07:00
ilya
cb12e497f6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:14:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01 DG RS; passing around params[:aspect]. querying in application controller for current aspect. 2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8 fixed photo show header 2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb minor visual tweaks 2010-09-13 20:51:27 -07:00