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

109 commits

Author SHA1 Message Date
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Sarah Mei
17757a2e2d Merging upstream changes 2010-09-25 15:57:59 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
Raphael
1f62f910e3 fix requires in db seeds 2010-09-24 14:43:23 -07:00
ilya
a6c1ff8ce2 fixed the deploy scripts 2010-09-23 20:21:17 -07:00
danielvincent
8941975224 DG IZ; example extension convention for app_config 2010-09-22 10:59:23 -07:00
ilya
96aaf3093c Make load_app_config more robust, point to the right folder in db seed 2010-09-21 18:04:36 -07:00
ilya
e3d52bb467 putting the config file in a shared directory for in the deploy scripts 2010-09-21 17:39:44 -07:00
ilya
020ff603bd terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml. 2010-09-21 16:59:06 -07:00
ilya
c8e52526d9 another silly mistake, need to symbolize keys in deploy scripts 2010-09-21 16:31:27 -07:00
ilya
dc0a08172d syntax error in seed script 2010-09-21 16:23:42 -07:00
ilya
d3b0b9c07e Make db seed set app_config[:pod_url] 2010-09-21 16:13:21 -07:00
maxwell
fc9cddc7b8 make the remote tom work 2010-09-20 15:40:43 -07:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
 2010-09-15 17:24:00 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Daniel Vincent Grippi
ee89bfaf8f removed do bad things 2010-09-15 16:18:33 -07:00
maxwell
77bd68e7c7 MS the deploy config is wrong 2010-09-15 15:55:26 -07:00
maxwell
12f6872484 commas in seed script 2010-09-15 15:49:16 -07:00
maxwell
3a4eb294f8 MS made it two callbacks for handles and keys 2010-09-15 15:45:26 -07:00
maxwell
16625f4ee9 MS removing production stuff from master... yowch 2010-09-15 15:31:53 -07:00
maxwell
e375af352c added url to backer script 2010-09-15 15:21:52 -07:00
maxwell
78cc51efb4 MS DG more emails for person in the seedfile 2010-09-15 13:34:06 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -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
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
maxwell
919d7d23c0 MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays 2010-09-06 17:46:09 +02:00
ilya
75d5f19a7d added photos to tom and korth 2010-08-25 10:17:31 -07:00
ilya
55c43b4498 grr, silly comma 2010-08-24 16:48:40 -07:00
ilya
b62d76bd66 going back to the old simple way of doing things 2010-08-24 16:45:38 -07:00
maxwell
68bd5bf5f5 MS merging in master again 2010-08-24 16:21:20 -07:00
ilya
e65ce0e5c1 Mr. Clean! deploy even cleaner, no more silly way of doing things 2010-08-24 15:54:02 -07:00
ilya
45f3eb2a9a trying yet again 2010-08-24 15:37:55 -07:00
maxwell
f5316fb3c1 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-08-24 14:45:04 -07:00
ilya
a70132fcdc IZ we update profile in zombie friends accept 2010-08-24 14:22:21 -07:00
maxwell
4f63f60b03 MS merging, and added a dumb check for the email validating twice 2010-08-24 14:03:57 -07:00
ilya
79be6f0628 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 12:33:39 -07:00
ilya
319f87f9a8 trying setting profile photos 2010-08-24 12:29:00 -07:00
Raphael
88e8a11871 Tom should start with two groups 2010-08-24 11:40:49 -07:00
Raphael
f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
 2010-08-19 16:09:08 -07:00