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

705 commits

Author SHA1 Message Date
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
ilya
f7608f6292 RS IZ trying to create user through instantiate in seed script 2010-08-19 14:12:52 -07:00
Raphael
61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 14:45:41 -07:00
Raphael
9f74cca191 Copy tom seed to dev seed 2010-08-18 14:32:33 -07:00
Raphael
453cb06691 changing settings and deploy scripts, validating email 2010-08-17 11:01:30 -07:00
Raphael
b0537e2f34 Comments pushing in the right directions 2010-08-16 15:04:09 -07:00
Raphael
4f22222b30 Splitting accept_friend_request into two methods 2010-08-16 12:10:23 -07:00
Raphael
f4d6a04f4f Get objects by bson id 2010-08-16 11:46:36 -07:00
ilya
8d0f65cd76 Bug in tom seed 2010-08-13 18:43:34 -07:00
ilya
43321213b0 rS iZ changed the friending on tom db script 2010-08-13 17:13:09 -07:00
ilya
d32a06c3cb look at the right yaml key 2010-08-13 12:47:19 -07:00
ilya
23c57c653f RS, IZ; Trying to speed up cap db reset 2010-08-13 12:34:24 -07:00
ilya
ef97b4f19d RS, IZ; updated DB seed to have a group, zombiefriend with a group 2010-08-13 11:36:59 -07:00
Raphael
aa4d428ab7 RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in => 2010-08-10 11:02:04 -07:00
Raphael
59147eb232 Person.new in dev seed 2010-08-09 13:03:27 -07:00
maxwell
4243d8efca MS IZ using the particular user's friends in the send_friend_request_to 2010-08-09 12:19:26 -07:00
Raphael
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
maxwell
7be374ac48 MS IZ fixed a couple of view things as well as the dev db seed script 2010-08-09 10:10:41 -07:00
ilya
6acdde7313 fixing the seed script for the refactor 2010-08-08 21:42:08 -07:00
ilya
fb4254535d DG IZ; slashes and http in seed script 2010-08-08 21:32:09 -07:00
Raphael
214685e5a9 Dev seed might now work 2010-08-06 17:11:50 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
Raphael
4178a78b23 Logger in receive friend request 2010-07-16 10:18:45 -07:00
Raphael
cae5700222 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 18:41:01 -07:00
Raphael
501620e9fb DG RS; fixed some visual bugs. request link now turns red on new request 2010-07-15 18:40:55 -07:00
maxwell
65deaba558 MS IZ hcard, emptyfiles, routesw 2010-07-15 18:36:07 -07:00
Raphael
63f27d8a9e Made email relative to subdomain 2010-07-15 16:09:15 -07:00
Raphael
64c81f0551 merge in master, only friend tom 2010-07-15 14:18:22 -07:00
Raphael
50addb8309 Took password out of db:seed:backer 2010-07-15 13:53:43 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
4bd50d47b7 DB seeds now use friending, presidents are not friends. 2010-07-14 12:41:22 -07:00
Raphael
a15ee6feab Changing db seed to friending 2010-07-14 12:06:39 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
Raphael
e420b65591 I am bad at syntax 2010-07-12 10:42:27 -07:00
Raphael
2c4cad2b4c Forgot a comma 2010-07-12 10:37:41 -07:00
Raphael
49c30425c1 Added user url to db seed 2010-07-12 10:25:56 -07:00
maxwell
b052ddeb84 DG MS; database seed scripts now ensure all friends are set to true 2010-07-09 14:13:39 -07:00
maxwell
275e0baa0c MS DG fixed deploy script so tom has correct URL 2010-07-09 10:27:18 -07:00
maxwell
c7e1bc3a46 DG MS debugging friend requests 2010-07-09 10:18:29 -07:00
ilya
2142ad2776 People -> Person in rake backer 2010-07-09 01:03:46 -04:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
Raphael
d211d23637 Thin now should stop 2010-07-01 19:35:31 -07:00
Raphael
2f23387b3a changed spacing in seed 2010-07-01 18:13:02 -07:00
Raphael
8a91468a62 Made deploy more readable 2010-07-01 18:07:35 -07:00
ilya
8b12f73581 pins added, typo 2010-07-01 18:52:49 -04:00
ilya
bc82b23f1d pins added 2010-07-01 18:43:33 -04:00
danielvincent
d41a970202 DG IZ; missed one typo. huge explosion. 2010-07-01 13:07:00 -07:00
danielvincent
079c4ec76e DG IZ; typo fix; also added more presidential names 2010-07-01 12:52:46 -07:00
danielvincent
53070134de fixed populate and deploy for qunicyadams 2010-07-01 11:57:54 -07:00
ilya
767c3c1979 now friending everyone and all servers deploy 2010-07-01 14:40:59 -04:00
ilya
5285753486 IZ warzombie route, the method is in the dsashboard controller 2010-07-01 13:28:17 -04:00
danielvincent
4153b7f387 commented out evenmachine for now 2010-06-30 19:31:25 -07:00
danielvincent
44362ee154 DG IZ MS; fixing tom's seed script 2010-06-30 18:53:29 -07:00
danielvincent
8038fb8585 DG IZ MS; eventmachine in tom's seed script 2010-06-30 18:43:51 -07:00
danielvincent
12bbdb38a7 DG IZ deploying with correct names 2010-06-30 18:03:25 -07:00
danielvincent
fbd1195113 DG IZ; rake task for backer, can now pass in arguments [backer_num, password] 2010-06-30 16:00:29 -07:00
danielvincent
6d84eb2b6f DG IZ; added rake db:reset, which aliases a delete and seed to the db 2010-06-30 13:36:15 -07:00
danielvincent
bb97aa9202 DG IZ; rake db:seed, rake db:delete 2010-06-30 11:57:11 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00