Commit graph

1528 commits

Author SHA1 Message Date
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Maxwell Salzberg
3184d7aad1 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:32:50 -07:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public
dispatcher
2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
danielgrippi
293afd80ff all_public scope in Post for clarity 2011-09-11 19:28:52 -07:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec initial tests for AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
Sarah Mei
8b789bfe35 Notifications don't 500 anymore, but I don't know how to make it render the mobile view. 2011-09-10 13:38:01 -07:00
danielgrippi
fe915ecb09 don't redirect to AspectsController#new from AspectsController#index if no aspect is present 2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e touched up AspectsController#index for readability's sake 2011-09-10 09:24:35 -07:00
Ilya Zhitomirskiy
ad11bd2a31 the Devise email regex was not catching pods that were anything other than a standard url 2011-09-09 18:05:58 -07:00
danielgrippi
1844226077 paginate facebook friends. 2011-09-07 13:00:21 -07:00
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Gonzalo Rodriguez
4a2b609d53 Join two aspect_ids calculations into one 2011-09-06 23:12:03 -03:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
Gonzalo Rodriguez
0aeab944bf Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es
What i did was to redirect to the tag without dots, in this case cubbies
I didn't consider a good idea to add route support for /tags/cubbi.es
since it get messed with request formats
2011-09-03 00:22:27 -03:00
Gonzalo Rodriguez
eae9c14168 Use named helper instead of hardcoded route 2011-09-02 22:49:16 -03:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted
B1126 deletion of all photos from a post with no words should result in the post being deleted
2011-09-01 10:04:10 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
2011-08-28 16:08:57 -07:00
Gonzalo Rodriguez
b048d1dd54 When deleting an aspect from contacts page do not redirect to aspects page 2011-08-27 19:24:21 -03:00
Gonzalo Rodriguez
cc1add81b0 Avoid RecordNotFound exception thrown by find method when invalid person_id 2011-08-27 02:45:58 -03:00
Dan Hansen
d084c708b6 use @like.target instead of @target, build should be green 2011-08-26 16:08:39 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files
require confirmation for comments in js, get rid of rails helper
2011-08-26 15:24:07 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Raphael Sofaer
7f0677ab16 connect wip 2011-08-23 16:37:51 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
a63d1ad4ae Sign out the signed in user if a different uid is passed to AuthorizationsController#new 2011-08-23 16:37:50 -07:00
Raphael Sofaer
6b88a75174 Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user 2011-08-23 16:37:50 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Maxwell Salzberg
e7071fd74c fix admin inviter 2011-08-23 08:43:42 -07:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
2011-08-20 14:40:56 -05:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
Gonzalo Rodriguez
3d7297ba5e Closes #1753. Render thats_you message instead of dropdown for your hovercard 2011-08-19 00:47:26 -03:00
Maxwell Salzberg
6beeecefd8 add better messages telling a user that they sent share requests if they try and email exsisting users 2011-08-18 18:27:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2777f16f4f Merge branch 'issue1586-aspectdropdown-when-posting' 2011-08-18 16:02:09 -07:00
Maxwell Salzberg
7d9b1636c0 dont raise runtime error if invitation token is not found 2011-08-18 14:14:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Maxwell Salzberg
0473037d1b fix notification links 2011-08-18 11:12:58 -07:00