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

440 commits

Author SHA1 Message Date
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