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

455 commits

Author SHA1 Message Date
Raphael Sofaer
0686c28692 Make post guids unique 2011-03-17 17:05:50 -07:00
zhitomirskiyi
6cc085d64e addded slideToggle 2011-03-17 14:32:07 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
maxwell
b7eec2e843 update schema.rb 2011-03-11 15:54:05 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
Raphael Sofaer
0c31cc4259 quote string in migration! 2011-03-11 15:00:15 -08:00
Raphael Sofaer
98633658f4 delete from in migration 2011-03-11 14:59:01 -08:00
Raphael Sofaer
70e4a671a2 tags as array in migration 2011-03-11 14:57:46 -08:00
Raphael Sofaer
20d40b7440 fix execute command in migration 2011-03-11 14:56:25 -08:00
Raphael Sofaer
c256533a2f class, not instance method 2011-03-11 14:52:23 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
Raphael Sofaer
9d92161430 Make migrations compatible with postgres 2011-03-02 11:05:16 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397 private messages wip 2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b broke out some comment logic to a replayable module 2011-03-01 12:28:33 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
a179bac689 fixed migrations, added unread to PrivateMessageVisibilities 2011-03-01 12:25:54 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
809ee8a678 Started notifications refactor 2011-03-01 10:30:29 -08:00
Raphael Sofaer
a11507d30c Take out typos for real this time 2011-02-28 16:40:03 -08:00
Raphael Sofaer
a0a901a675 fix typo 2011-02-28 16:27:47 -08:00
Raphael Sofaer
810220bc97 clear disconnected records in migration 2011-02-28 16:24:09 -08:00
Raphael Sofaer
98d8d9e0da Add the migration 2011-02-28 15:31:12 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
MrZYX
edef56c84a ruby 1.9 ftw (thanks jrichardlai) 2011-02-17 16:20:27 +01:00
Raphael Sofaer
ef9ab553bf require the called migration within the undo migration 2011-02-17 00:35:33 -05:00
Raphael Sofaer
ff4a049d2d It turns out that we need to rewrite validates_uniqueness_of :case_sensitive => false 2011-02-16 23:49:35 -05:00
Raphael Sofaer
cac8c586de Forgot that emails are no longer db-unique 2011-02-12 22:44:09 -08:00
Raphael Sofaer
8fabe0f402 Checking in the migration helps. 2011-02-12 22:41:30 -08:00
Raphael Sofaer
753a113aa9 New splunk logs indicate we need more indicies 2011-02-12 21:47:55 -08:00
Raphael Sofaer
e43cd3a8da Make error in migration more descriptive 2011-02-11 18:25:58 -08:00
Raphael Sofaer
02a66466fe Abort migration if there are post-visibilities left, so that the db is not left with no index 2011-02-11 18:25:58 -08:00
Raphael Sofaer
31fef1a55d typo in table name 2011-02-11 18:25:58 -08:00
Raphael Sofaer
316292c914 mysql2 result is not an array 2011-02-11 18:25:58 -08:00
Raphael Sofaer
2faf3fe10d delete dup pvs in migration 2011-02-11 18:25:58 -08:00
Raphael Sofaer
88da878c97 Move migration to avoid conflict 2011-02-11 18:25:57 -08:00
Raphael Sofaer
ff0f37ceea eliminate one source of dup pvs 2011-02-11 18:25:57 -08:00
zhitomirskiyi
34e2b657fd mend 2011-02-10 19:44:25 -08:00
zhitomirskiyi
66fea22f60 mend 2011-02-10 19:24:16 -08:00
zhitomirskiyi
36d7973005 fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is 2011-02-10 19:23:01 -08:00
zhitomirskiyi
7b1abacfe6 wip 2011-02-10 12:39:05 -08:00
Raphael Sofaer
7409cd8a27 remove extra sass rule, add db:seed 2011-02-09 16:07:25 -08:00
Raphael Sofaer
7b3a2b07ee Removed n-query, created mentions table 2011-02-09 16:07:25 -08:00
Sarah Mei
10d96be3c3 someone forgot to check in schema.rb? 2011-02-09 14:45:31 -08:00
zhitomirskiyi
1fbcb3c3e5 added a special case for share bc js being slow 2011-02-03 16:16:45 -08:00
danielvincent
7668e8d262 fix mobile_fu/ipad issue 2011-02-03 14:11:26 -08:00
Raphael
460f25e848 run gladiac's migration, rename migration file so it finds class 2011-02-03 11:55:36 -08:00
Andreas Schneider
aa6d616d69 db: person_id can only be updated if index is updated too. 
This fixes the following error:

Mysql2::Error: Duplicate entry '0' for key
'index_profiles_on_person_id': ALTER TABLE `profiles` CHANGE `person_id`
`person_id` int(11) NOT NULL
 2011-02-02 20:37:55 +01:00
Andreas Schneider
e63b605b2a db: Create limited varchar to be able to add index. 2011-02-02 20:37:55 +01:00
Andreas Schneider
8bdc3ec35a db: Alter the import tables to avoid a mysql bug. 2011-02-02 20:37:55 +01:00
Andreas Schneider
2ddd810dea db: Fixed the migration of the database. 
The limit down to 127 is needed cause of a long time bug in mysql. The
error message looks like this when creating an index.

Mysql2::Error: Specified key was too long; max key length is 1000 bytes

So with utf8 (3 bytes for one char) you exceed this with two
varchar(255).

See http://bugs.mysql.com/bug.php?id=4541
 2011-02-02 20:37:55 +01:00
Sarah Mei
1de4976915 remove histories table from schema.rb. this is why you don't edit or revert migrations >.< 2011-02-02 08:54:57 -08:00
maxwell
d4f99ca080 move search init to search.js, because mobile does not have search to init 2011-02-01 22:13:52 -08:00
zhitomirskiyi
358bf0a856 fix migration on open aspects boolean 2011-02-01 17:56:16 -08:00
zhitomirskiyi
21e3c2ae73 Merge branch 'open-aspects' 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
 2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046 storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'" 
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
 2011-02-01 13:15:20 -08:00
zhitomirskiyi
789ff679a9 persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:31:41 -08:00
zhitomirskiyi
a789be737a also making sure that the notification actor id is unique in the keep delete table 2011-01-31 11:42:49 -08:00
zhitomirskiyi
2d078a212a remove mongo id from the notifications table 2011-01-31 11:31:59 -08:00
zhitomirskiyi
7cb23fd803 added a select for the actor id to group by it 2011-01-31 11:27:56 -08:00
zhitomirskiyi
03e8aa31f4 fixed notifications migration 2011-01-31 11:02:51 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
zhitomirskiyi
3119fc660f another space 2011-01-29 20:56:21 -08:00
zhitomirskiyi
2b4d27d2cf another typo 2011-01-29 18:53:13 -08:00
zhitomirskiyi
5d3e08227e whitespace 2011-01-29 18:46:05 -08:00
zhitomirskiyi
05cab33dad notification migration need to try it out 2011-01-29 18:36:04 -08:00
zhitomirskiyi
8c77f65cdb notes for later 2011-01-29 02:01:40 -08:00
zhitomirskiyi
d7f06b9e6e removed commented out non working migration code for now 2011-01-28 22:39:29 -08:00
zhitomirskiyi
74e0d03b8f wip' 2011-01-28 22:39:29 -08:00
zhitomirskiyi
9d4d0cecdb wip 2011-01-28 22:39:29 -08:00
zhitomirskiyi
f48d7a0826 wip 2011-01-28 22:37:38 -08:00
Raphael
a23290986a add contacts_visible field in aspects 2011-01-27 13:41:22 -08:00
Raphael
b67aca0ffc Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns 2011-01-26 18:29:23 -08:00
zhitomirskiyi
906dd8d6d4 added the migration 2011-01-26 16:32:51 -08:00
zhitomirskiyi
1a911a8b99 translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier) 2011-01-26 16:01:57 -08:00
zhitomirskiyi
6242ac64ed removed unique index on email to a regular index in order to make inviting users through fb work (no email present) 2011-01-26 15:04:46 -08:00
zhitomirskiyi
8bc857cf4d updated devise added a devise_invitable fork and performed migration 2011-01-26 13:46:50 -08:00
zhitomirskiyi
a92d5f41c9 added the migration to invitation_service and invitation_identifier 2011-01-26 12:16:47 -08:00
Raphael
1b6ae9406e Use raw sql 2011-01-25 12:27:57 -08:00
Raphael
def20a4d31 Make person_id on profile unique, delete duplicate profiles in migration 2011-01-25 12:10:24 -08:00
maxwell
4b63a14198 updating schema 2011-01-24 12:18:38 -08:00
zhitomirskiyi
56831cec63 stats WIP 2011-01-21 10:29:07 -08:00
zhitomirskiyi
f89c442730 statistics class does distributions and averages on its DataPoints 2011-01-21 10:29:07 -08:00
zhitomirskiyi
55bfbfd5b0 added users_with_posts_today to DataPoint 2011-01-21 10:29:07 -08:00
zhitomirskiyi
ecb059b661 added Statistic and DataPoint models 2011-01-21 10:29:06 -08:00
Raphael
2578ac15b6 Add some indicies 2011-01-19 14:29:22 -08:00
maxwell
465dd9ba96 check to see if rails is already loaded in a couple of places 2011-01-19 13:30:12 -08:00
Sarah Mei
dd3f8f4bee Add compound index to post_visibilities 2011-01-19 00:19:16 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Raphael
f79c08b235 Add indicies 2011-01-13 16:17:11 -08:00
Raphael
7abd1aceca Add a couple indicies 2011-01-13 15:13:42 -08:00
Raphael
8885b8a354 Services now importing 2011-01-07 15:19:04 -08:00
Raphael
9bd2de06ee Services need a mongo_id 2011-01-07 15:14:45 -08:00
Raphael
1187c13170 Import for users, test for aspects import 2011-01-07 13:25:50 -08:00
Raphael
0f8b8bbd5b update the down for the import table migration 2011-01-06 17:44:38 -08:00
Raphael
89a41826c1 Started raw post import 2011-01-06 17:01:17 -08:00
Raphael
e46b3e6cf3 Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain. 2011-01-06 16:23:18 -08:00
Raphael
283a5501be Boolean values aren't importing; we may need SET statements for them 2011-01-06 14:58:42 -08:00
Raphael
7c4d35cf28 raw import of notifications, failing to pull in unread 2011-01-06 14:37:59 -08:00
Raphael
564dd993b7 raw import of Invitation 2011-01-06 14:30:38 -08:00
Raphael
a1419b9dc0 Person#owner_mongo_id should be null if the csv has an empty string 2011-01-06 14:16:51 -08:00
Sarah Mei
75ac7e91c8 Refactor ImportToMysql; add import_raw. Add rake task for import. 
Remove unique constraint on index on mongo_requests.
 2011-01-05 23:54:22 -08:00
Raphael
ff1cad6e63 raw import for requests 2011-01-05 17:38:00 -08:00
Raphael
0d80ded2d3 Raw import for post_visibilities 2011-01-05 17:25:11 -08:00
Raphael
b34acfd4eb Add contact raw import, fixtures have no comments 2011-01-05 16:40:16 -08:00
Raphael
e4ef2641f8 raw import of aspects and aspect memberships 2011-01-05 15:40:04 -08:00
Sarah Mei
7f86a9e1ba ImportToMysql now loads users.csv. Spec currently failing on datetime conversion. 2011-01-04 22:43:32 -08:00
Raphael
16d7ccdf0b fix youtube title stting 2011-01-04 11:48:02 -08:00
Philip Champon
607fea6722 Handling bug http://bugs.joindiaspora.com/issues/767 
Added email argument to task, warn and replace if address resolves to
an invalid user@domain one.
 2010-12-31 14:53:32 +01:00
Sarah Mei
f18439fa14 ZOMG specs pass on mysql! 
Make '_type' column on services into 'type'.
 2010-12-28 21:08:54 -08:00
Alec Leamas
122d1142b9 Fixing "Can't modify frozen string" error messages from rake db:first_user 2010-12-28 18:07:09 +01:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Sarah Mei
a13136a4dc Clean up first_user rake tasks; create add_user rake task 2010-12-24 13:46:25 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
Raphael
e539688e1c Fix rake db:reset 2010-12-15 11:28:50 -08:00
Alec Leamas
308c653945 Cleaning up db:first_user patch. 
Removing duplicated reset task (what happened?). Hate long lines.
Let user.rb handle all error checks. Clean up.
 2010-12-02 15:24:10 +01:00
Alec Leamas
1a8e0788c2 Add rake task db:first_user. 
Purges database and adds a user without development dependencies.
Closes http://bugs.joindiaspora.com/issues/548. Note error handling
for User.build...
 2010-12-02 12:00:44 +01:00
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
maxwell
3c16a46f0e MS IZ updated the backer script to use aspects.create 2010-11-01 14:54:40 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Raphael
fd2fac865b Without typos 2010-10-28 18:07:17 -07:00
Raphael
83f8cbbb5c Try fixing db:seed:backer 2010-10-28 18:02:06 -07:00
zhitomirskiyi
a5099bb89f IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync 2010-10-27 10:32:09 -07:00
ilya
a60287348d not overwriting app config if it already exists 2010-10-22 19:13:35 -07:00
maxwell
494a0e2d3f updating the db script for dev to set the default pictures 2010-10-20 18:24:09 -07:00
ilya
02c0bf3c43 fixed the seed script 2010-10-20 14:52:17 -07:00
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
Raphael
41a0718fc2 Don't overwrite existing pod_url in db:seed:dev 2010-10-18 12:56:22 -07:00
Raphael
c287e30f07 fix db seeds 2010-10-14 14:46:46 -07:00
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
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