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

638 commits

Author SHA1 Message Date
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
ba88ce6be4 update db/schema 2012-03-13 16:17:39 -07:00
Diaspora Europe
41c3698ebf remove unused youtube_titles from comments and posts 2012-03-01 15:37:20 +01:00
Dennis Collinson
9e1816dc12 Participations are a federated, relayable model :) 2012-02-09 19:01:00 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Sarah Mei
d1fbf7b55c Fix migration for MySQL 2012-02-03 21:12:44 -08:00
Ricardo
6fa548e427 fix syntax for psql backend 
- PostgreSQL doesn't allow double quotes for values. Double quotes are
  used for surrounding table names that contain spaces. Single quotes
  should be used for values.

- DELETE in a JOIN is not permitted in SQL-99 (see
  http://drupal.org/node/555562) so we use USING with WHERE instead
 2012-02-04 12:45:13 +08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
Maxwell Salzberg
2ea0ca0e9b never use AR classes in migrations if you can help it 2012-02-02 14:25:33 -08:00
Maxwell Salzberg
b55cadb4a4 today is not my day. fix comment in migration 2012-02-02 14:06:40 -08:00
Maxwell Salzberg
fe4b886649 this should work, and added a bit of logging 2012-02-02 14:05:29 -08:00
Maxwell Salzberg
da1345502f possible fix for migration, hang tight before running it 2012-02-02 13:54:39 -08:00
Dennis Collinson
8a61718efd migration iterates through shareables 2012-02-02 13:37:43 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Dennis Collinson
d1a82d288d moar verbose comment [ci skip] 2012-02-02 11:50:00 -08:00
danielgrippi
7bd6a450a0 remove public share visibilities. NOTE: you should run optimize table as detailed in the migration's comments after executing this. [ci skip] 2012-02-02 11:43:37 -08:00
Sarah Mei
b9ae426015 db/schema.rb now includes an encoding line in ruby 1.9.2 2012-01-27 21:55:59 -08:00
Sarah Mei
19df6e1f59 Make rake db:rebuild work under ruby 1.9.2 2012-01-27 21:55:07 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
Daniel Grippi
643209112b Merge pull request #2526 from Pistos/postgresql-drop-table 
Fix from-scratch migration on PostgreSQL with a non-root DB user
 2012-01-04 16:14:34 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
5110b4c086 Added MySQL-friendly version of SQL code for migration. 2011-12-19 17:12:17 -05:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Pistos
57369af7a1 drop_table (with later versions of Rails?) doesn't work with PostgreSQL with a non-root DB user. 
You get problems like:

  ERROR:  permission denied: "RI_ConstraintTrigger_506060" is a system trigger

This change is necessary or else nobody will be able to install Diaspora with PostgreSQL.
 2011-12-12 22:55:21 -05:00
Jonne Hass
247863c6f7 update diaspora-client 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
7667029e71 wip, stated the serialized model 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Ilya Zhitomirskiy
8713c58860 updated schema 2011-10-31 15:19:02 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
3b1f3f90d1 removing duplicate tag followings 2011-10-26 14:24:35 -07:00
Ilya Zhitomirskiy
162d3ccd10 added the missing tag followings indecies 2011-10-26 13:40:01 -07:00
Daniel Grippi
edd4352e49 Merge pull request #2209 from Pistos/postgresql-set-photos-id-seq 
Set photos_id_seq properly for PostgreSQL
 2011-10-24 10:11:03 -07:00
Pistos
2c89a71958 PostgreSQL compatibility for FixPhotoShareVisibilities migration. 2011-10-23 21:03:54 -04:00
danielgrippi
ea3c7ec439 fixed migration 2011-10-23 16:43:21 -07:00
danielgrippi
75da4e560d fix photo share visibilities for the recently migrated 2011-10-23 16:37:36 -07:00
Maxwell Salzberg
199d2cb7dd change of encoding in schema.rb 2011-10-23 09:10:00 -07:00
Manuel Schölling
a91932c576 Fixed Pistos' issue in downmigration 2011-10-23 15:23:39 +02:00
Manuel Schölling
d8e410f242 Fixed postgre queries as suggested by Pistos 2011-10-22 19:53:59 +02:00
Manuel Schölling
eddc3eb012 Merge branch 'master' of git://github.com/diaspora/diaspora into migration_with_tmp_post_id 2011-10-22 19:50:24 +02:00
Manuel Schölling
afe8ee9889 Fixed INSERT statement 2011-10-22 19:10:29 +02:00
Manuel Schölling
b92ee9c8d5 Store old post id for photos 2011-10-22 16:12:41 +02:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
Pistos
474ccc9fc4 Set photos_id_seq properly for PostgreSQL (re: recent "MovePhotosToTheirOwnTable" migration, which neglected to do this). 2011-10-18 21:57:15 -04:00
Pistos
0ef81d7112 Added PostgreSQL-compatible versions of raw SQL migration code in ShareAnything migration. 2011-10-18 20:50:51 -04:00
Pistos
fdcd6d47ed Whitespace cleanup. 2011-10-18 20:48:49 -04:00
Ilya Zhitomirskiy
e47ccd4eff removed fake migration and migrate.txt 2011-10-18 16:25:24 -07:00
Ilya Zhitomirskiy
f7e70f8d93 lmiting the type column on share_visibilities and comments 2011-10-18 16:08:30 -07:00
Ilya Zhitomirskiy
4cae3e9d62 rolled up share_anything migration 2011-10-18 15:41:26 -07:00
Maxwell Salzberg
e4b284da7f aspect visibilities single alter table 2011-10-18 15:12:34 -07:00
Maxwell Salzberg
ed51260cf0 wip 2011-10-18 14:41:13 -07:00
Maxwell Salzberg
ce1ad0e21c rolling up the first 2011-10-18 14:18:48 -07:00
Ilya Zhitomirskiy
9b6275640d fixed the uniqueness on indecies and foreign key constrains in the down migrations 2011-10-18 12:43:24 -07:00
danielgrippi
e48e2fb56a touch up the down on the latest migration 2011-10-17 18:21:12 -07:00
danielgrippi
38d685e06e add proper index to comments 2011-10-17 18:19:02 -07:00
Pistos
724c401625 Corrected SQL syntax error in MySQL down migration (in MovePhotosToTheirOwnTable). 2011-10-17 13:21:38 -04:00
Pistos
424e736982 Correct down migration for photo migration under PostgreSQL. 2011-10-17 11:53:40 -04:00
Pistos
982e6f9b6b Added missing rollback for photo migration. 2011-10-17 10:52:03 -04:00
Pistos
f04af4c493 Added PostgreSQL-compatible version of SQL for migration (MovePhotosToTheirOwnTable). 2011-10-17 09:42:22 -04:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Manuel Schölling
6e325f8fd5 Introduced Commentable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Maxwell Salzberg
b334a048bf merged 2011-10-11 16:09:26 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy
0d00265392 temporarily disable redis caching during seed script 2011-10-05 10:39:24 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Ilya Zhitomirskiy
5f29b77b1f fixing wrong datatype on activity streams objectId 2011-10-01 19:07:11 -07:00
Ilya Zhitomirskiy
27dcdf9a11 added an index to root_id 2011-09-30 11:35:07 -07:00
danielgrippi
b27b5dba10 commit the schema [ci skip] 2011-09-26 09:43:22 -07:00
Andreas Schneider
df86bc5799 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 guru meditation

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2011-09-26 13:05:00 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Maxwell Salzberg
ca8a9e8025 update schema 2011-09-12 15:42:00 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Jonne Hass
fbf7c5c708 apply patch from and fix #1954 2011-09-12 16:29:39 +02:00
danielgrippi
1d0bec11f7 Add counter cache for comments on posts 2011-09-11 15:02:24 -07:00
danielgrippi
2cc261e938 add index on services for [type, uid] 2011-09-07 14:00:39 -07:00
danielgrippi
1844226077 paginate facebook friends. 2011-09-07 13:00:21 -07:00
Sarah Mei
b2b8e72ab2 Change index name in schema.rb 2011-09-03 22:27:19 -07:00
Sarah Mei
37d4a843a4 Shorten index name for everybody, including mysql & postgres users. 2011-09-03 22:05:32 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)." 
This reverts commit 902c40e42d.
 2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
40b2c2370a more usecases for the seeded friend-finder 2011-08-23 12:13:06 -07:00
Maxwell Salzberg
e7071fd74c fix admin inviter 2011-08-23 08:43:42 -07:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Raphael Sofaer
32368a16dd Make latest migration postgres compatible 2011-08-19 15:55:27 -07:00
Maxwell Salzberg
8b278adff6 migration to fix old invites for resend 2011-08-18 14:51:15 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
cc6618d294 some progress 2011-08-17 16:28:21 -07:00
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -07:00
Raphael Sofaer
a5d9d6d212 Remove reference to invites counter from db seeds, close #1778 2011-08-16 15:07:25 -07:00
danielgrippi
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
danielgrippi
7b85dcec9c dg rs; seed bob with facebook friends & fixed invitation view 2011-08-12 17:05:00 -07:00
Raphael Sofaer
31b55aef0b Start saving the usernames of facebook users 2011-08-12 13:20:25 -07:00
danielgrippi
894e4ef187 added status indicators to seed script 2011-08-03 15:40:27 -07:00
Raphael Sofaer
f9f583058a Remove old seed scripts 2011-08-01 16:15:56 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
danielgrippi
f560321626 optimized people search 2011-07-29 12:04:10 -07:00
Raphael Sofaer
71ae8e5fcd MAAAAAAAXWEEEEEEEEEEL 2011-07-28 15:22:42 -07:00
Raphael Sofaer
87d0f9d6fd Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 14:42:02 -07:00
Raphael Sofaer
ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects' 
Conflicts:
	app/models/user.rb
	db/schema.rb
 2011-07-28 14:36:41 -07:00
Maxwell Salzberg
a325970e5d test to make sure mobile site does not 500 with all media types 2011-07-28 13:16:43 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Raphael Sofaer
0e664b2caf Fix likes on comments migration 2011-07-11 16:22:36 -07:00
Raphael Sofaer
be5f3bf95e Merge branch 'like-comments' 2011-07-11 16:18:19 -07:00
Raphael Sofaer
8f50c622fa Fix contentUpdater spec, adjust migration and fix a couple of the js viwes 2011-07-11 16:17:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ee0ecc790c making the service users badge wider, added a commented out seed step for having some service user data 2011-07-11 16:05:07 -07:00
Raphael Sofaer
a7d8535d36 Update migration to handle duplicate likes 2011-07-11 15:06:35 -07:00
danielgrippi
67882c775e Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable. 2011-07-11 15:06:35 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Manuel Schölling
0855144a0a Issue #842: Sortable aspects 
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
 2011-07-10 20:37:11 +02:00
Raphael Sofaer
e98cc4b960 Sort on and index taggings, ftw 2011-07-07 15:14:29 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e2b373695d Add null false on tag_followings fields 2011-07-05 16:29:48 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Raphael Sofaer
130914267b Update the Post counter caches when adding the counter cache column 2011-07-05 08:47:40 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
Sarah Mei
b495e71c77 DH SM MS update schema.rb to reflect edited migration 2011-06-30 20:35:09 -07:00
Wouter Timmermans
7de12e7a5a typo in oauth2 migration 2011-06-29 12:39:59 +02:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
Raphael Sofaer
e22701a12d Only run the data migration if there are profiles in the db 2011-06-27 10:26:12 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
Raphael Sofaer
728a547cb2 Undo some pg changes 2011-06-19 16:16:30 +02:00
Raphael Sofaer
9309456c41 Don't run non pg compatible migrations on empty tables 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
2a4932ea34 WIP verifying sig in the pre-registration endpoint 2011-06-13 22:57:56 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
Raphael Sofaer
31c081a19f Actually take out the mongo_ids 2011-06-07 11:38:32 -07:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
Raphael Sofaer
3ca5353f08 get rid of mongo ids 2011-06-06 12:27:21 -07:00
Sarah Mei
ba9df59977 Fix migration for ruby 1.9. Move YAML check into application.rb, and add guard for ruby 1.8.x. 2011-06-04 20:12:34 -07:00
Raphael Sofaer
e22eee3669 Add Index on users remember token, should make login much faster 2011-06-04 13:47:56 -07:00
Raphael Sofaer
c73af11ba6 Remove some mongo stuff 2011-06-03 18:32:35 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
e720fc097d chubbies tests mow take diaspora handle 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
Raphael Sofaer
7e0944fb69 Make likes dependent delete, rather than dependent restrict. The fk in the former migration had dependent spelled wrong, and it silently failed 2011-06-03 14:38:42 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Raphael Sofaer
158401e17d ActiveRecord::Base.record_timestamps didn't actually stop timestamps from being updated 2011-06-01 12:02:14 -07:00
Raphael Sofaer
1f04094956 Make sure migration up and down deal with all indicies 2011-06-01 10:49:05 -07:00
Sebastian
5b408ecca3 Added User#unconfirmed_email and #confirm_email_token with specs 2011-06-01 16:26:53 +02:00
MrZYX
787a5ae749 don't update timestamps in the migration 2011-05-27 19:57:51 +02:00
MrZYX
f5488bd032 made migration more failure tolerant 2011-05-27 19:26:47 +02:00
MrZYX
fba69bd8a5 Photo association on GUID 1/2: Migration 2011-05-27 17:32:09 +02:00
danielgrippi
d12944d57e record objectId in post (cant use object_id booo) 2011-05-25 12:16:52 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
danielgrippi
d516d0a0f8 migration 2011-05-18 10:19:08 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
danielgrippi
38e75d47f1 remove request notifications migration 2011-05-17 11:06:36 -07:00
danielgrippi
12b5bd4b23 remove pending contacts 2011-05-17 10:43:25 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
Raphael Sofaer
da6769cbbf Devise invitable changed the meaning of t.invitable 2011-05-14 11:32:01 -07:00
Raphael Sofaer
3afd529379 Don't delete facebook invitations 2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1 Don't use rails case_sensitive false, it is very slow. 2011-05-13 16:32:07 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
Dennis Schubert
3a29bef99f This should fix any 500 at notifications-page. Thanks @MrZYX an Chandler 2011-05-07 23:36:10 +02:00
danielgrippi
e854bd0a32 split 'mutual' flag into 'sharing' and 'receiving' on Contact 2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
MrZYX
b297648072 Added migration that downcases all usernames. This should solve the "Can only login via password reset" problems 2011-04-21 14:24:32 +02:00
Raphael Sofaer
4870ffb944 Fix db seed, refactor aspect-filters a bunch, fix stream_element a little 2011-04-13 18:13:26 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
MrZYX
bb2b708a69 basename vs. dirname fail -.-, sorry my bad 2011-04-08 22:01:10 +02:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
48cfa49582 change the mention notification wording to be less akward 2011-04-07 17:45:03 -07:00
Raphael Sofaer
e2103788f5 Merge branch 'tag_name_uniqueness' 2011-04-07 17:00:58 -07:00
Raphael Sofaer
a05b141366 Add tagged posts to db seed, make people#show and tags#show infinite scroll 2011-04-07 16:36:14 -07:00
Raphael Sofaer
883ff63ec9 Add some posting to rake db:seed 2011-04-07 15:00:57 -07:00
MrZYX
ef124d748b fixed another require for ruby 1.9, #1002 2011-04-07 21:48:22 +02:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
Raphael Sofaer
9e05f3196c finish tag name uniqueness migration 2011-04-06 15:08:10 -07:00
Raphael Sofaer
d825463472 Working on tag name uniqueness 2011-04-06 14:44:29 -07:00
Raphael Sofaer
75a1d9dda0 Forgot to check in db schema 2011-04-06 14:32:46 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
danielgrippi
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
Raphael Sofaer
03e37d2186 Using union in stream query 2011-04-05 11:40:32 -07:00