Commit graph

198 commits

Author SHA1 Message Date
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
8f50c622fa Fix contentUpdater spec, adjust migration and fix a couple of the js viwes 2011-07-11 16:17:11 -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
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
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
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
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
danielgrippi
d516d0a0f8 migration 2011-05-18 10:19:08 -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