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

1925 commits

Author SHA1 Message Date
maxwell
bcec2d04e6 do not pass in the diaspora handle query as a regex, we want to search on the string literal. also use dynamic finder 2010-10-22 15:27:59 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
maxwell
20a5ec863f small bugfixes for the mailer 2010-10-22 00:49:01 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00
ilya
e677e4782e the handle is now in the email if only one user invited the person 2010-10-21 16:07:31 -07:00
Raphael
fe1a6bce20 Attr-accessible on aspects, check whether built user is persisted 2010-10-21 12:49:50 -07:00
danielvincent
8e175be2ba fixed comments not showing up through websocket on photo show page 2010-10-20 23:40:48 -07:00
ilya
84e19f833a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 18:30:36 -07:00
ilya
30bae4f807 throws an alert if you try to remove person from the last aspect 2010-10-20 18:30:22 -07:00
danielvincent
a1830b5d40 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 18:15:19 -07:00
danielvincent
e880a5a11f comment submit buttons show again. further changes to show pages. 2010-10-20 18:15:07 -07:00
maxwell
bc9c852e25 fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -07:00
ilya
bec1842bed redirects to the right place 2010-10-20 17:40:58 -07:00
danielvincent
183ac75c6a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 17:35:35 -07:00
danielvincent
6d8b670150 changed show layouts for album and photos. still needs work. 2010-10-20 17:35:27 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
ae7891194e added links to the aspects a person is in on the show page 2010-10-20 16:57:09 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
6bee872039 moved the add people into a partial 2010-10-20 15:42:03 -07:00
ilya
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -07:00
ilya
0afe83b5e3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 14:52:30 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
danielvincent
d3d7131c8d stream using data-guid for messages. view fix in photo show 2010-10-20 13:47:16 -07:00
danielvincent
e9ced7b2e6 changing photo now updates all user images in page 2010-10-20 12:35:16 -07:00
danielvincent
65ffe2ecdd Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:19:24 -07:00
danielvincent
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
ilya
e6de6179e9 MS IZ dependant destroy is back for aspects 2010-10-20 11:47:09 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a MS, IZ finished adding and removing people from aspects methods, refactored the move friend method 2010-10-20 11:28:56 -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
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -07:00
danielvincent
e4d6e170e3 aspect tab no longer selected on user#edit and person#show, person#index 2010-10-20 10:22:29 -07:00
Raphael
e52e600a4d Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 3faca8380b.
 2010-10-20 09:52:03 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Alec Leamas
3faca8380b Revert "Merge remote branch 'upstream/master'" 
This reverts commit 4bb5aeb34b, reversing
changes made to fb70dc8c99.
 2010-10-20 14:52:18 +02:00
danielvincent
e7d7e1f258 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 00:02:22 -07:00
danielvincent
d2945c83dc status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album. 2010-10-20 00:02:15 -07:00
Raphael
a01c1c7461 Remove remove_all_aspects without ill effect 2010-10-19 23:54:12 -07:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
Sarah Mei
f8400389de Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 22:39:05 -07:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
maxwell
d0055cee37 changed a bit of text in the invite, also made it show on all aspects now that we have it fixed 2010-10-19 21:07:10 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
maxwell
f26dc039c9 removed empty hash from invite email 2010-10-19 20:43:45 -07:00
maxwell
bfe57b13cc added diaspora handle to user profile page 2010-10-19 20:34:10 -07:00
maxwell
da95930c9a added a bit to test email 2010-10-19 20:23:20 -07:00
ilya
38e8af2300 better querying 2010-10-19 19:16:44 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
danielvincent
d200aaab52 mail has some style. couldn't figure out devise mailer templating at the time... 2010-10-19 18:26:02 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -07:00
danielvincent
8751503aa4 header on public explain fancybox 2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff reshare dropdown looks nicer. fixed user menu to drop down on click 2010-10-19 16:16:46 -07:00
Raphael
3557d66749 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 16:07:03 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
0a4bf225d0 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 14:06:51 -07:00
danielvincent
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
Raphael
d6f8fe106a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 13:51:43 -07:00
Raphael
2c66bbbe00 Strip profile names, resolve 357 2010-10-19 13:51:31 -07:00
danielvincent
8c92c31323 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 12:29:34 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
Raphael
962f282cbc Validate uniqueness of aspect name, 359 2010-10-19 12:23:24 -07:00
danielvincent
d87345ca33 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 12:10:36 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Raphael
d68644c358 Resolve #387 2010-10-19 11:47:43 -07:00
Raphael
296afdc871 Beat Dan at bugfixing 2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1 Fix bug 376 2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb Remove unused helper method 2010-10-19 11:36:33 -07:00
danielvincent
3866b83dab Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 11:29:47 -07:00
danielvincent
7e9585c5f0 default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
Raphael
fce902821b Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive. 2010-10-19 11:06:43 -07:00
maxwell
8ada8414c7 username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons 2010-10-18 22:55:09 -07:00
ilya
8894fa4daa Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 16:28:57 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Raphael
676e802fd2 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 15:46:44 -07:00
Raphael
b681850783 Get rid of warning/error on invites/_new partial 2010-10-18 15:46:14 -07:00
ilya
7ab2b00231 moved fb posting into the user model 2010-10-18 14:50:48 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
244accc9a9 flash error on friending self 2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07:00
Raphael
3436371a96 Merge remote branch 'archi/332-quickfix' 2010-10-18 11:44:47 -07:00
Raphael
8e4691b9d0 Merge remote branch 'rmaskey/269-album-link' 2010-10-18 11:27:13 -07:00
danielvincent
4b1516542d various. fixed publisher in new layout. 2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb add new aspect back on manage page. changed badges 2010-10-18 11:00:52 -07:00
danielvincent
15104cf920 somewhat there 2010-10-18 11:00:52 -07:00
ilya
e648042b15 the user destroy now deletes the aspects 2010-10-18 10:26:45 -07:00
ilya
73dfab8601 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 09:56:36 -07:00
archi
5e97fd3b52 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-18 11:06:42 +02:00
danielvincent
eca37e1a28 small view cleanups 2010-10-17 21:55:03 -07:00
danielvincent
2f5547626e fixed error in status_messages_controller 2010-10-17 21:31:12 -07:00
danielvincent
1139299f42 removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller 2010-10-17 20:47:51 -07:00
danielvincent
108bf9d99e Merge branch 'master' of github.com:diaspora/diaspora 2010-10-17 19:33:57 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
archi
baa0b43655 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79 Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger. 2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d Modified spec (doesn't check Youtube handling due to disabled net::http) 2010-10-17 21:07:49 +02:00
archi
f2af56f4b2 Youtubelink support :) 
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
 2010-10-17 20:18:24 +02:00
danielvincent
7160e9f85b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-17 10:25:38 -07:00
archi
f676e284f7 Added Youtube links - Still TODO: Caching of titles! 2010-10-17 16:14:01 +02:00
archi
8e753cc073 Youtube proof of concept patch/preview - not done yet (see bug #332) 2010-10-17 12:56:26 +02:00
Sarah Mei
50f9e8f240 Reorganize User model. Preserve case of username. 2010-10-16 23:58:01 -07:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
798d904e7e strip username on create 2010-10-16 23:27:18 -07:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f Backfill specs for RegistrationsController#create. 
Remove RegistrationsController#new (which just called super, so it's not necessary).
 2010-10-16 21:14:37 -07:00
archi
035db98367 Added HTML links to posts 2010-10-17 02:06:46 +02:00
rmaskey
569376df00 Issue #269: the album back link updated for aspect reference 2010-10-16 19:32:02 -04:00
rmaskey
7c99b89d43 Issue #269: the album back link updated for aspect reference 2010-10-16 19:31:47 -04:00
romanov
2787eb0c6b Issue #269: the album back link updated for aspect reference 2010-10-16 19:26:46 -04:00
danielvincent
eafc01de2a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-16 12:33:33 -07:00
maxwell
13a2464484 adding a confirm link on the aspect remove button 2010-10-16 02:55:45 -07:00
danielvincent
5ca3570667 added prefetch rels to prev/next links in photo show. fixed shadow bug in header 2010-10-16 02:06:46 -07:00
ilya
f33298e762 removed the puts, initial token checking 2010-10-16 00:42:37 -07:00
danielvincent
72479343bc Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:37:39 -07:00
danielvincent
7611bc1c8f user dropdown 2010-10-15 17:37:32 -07:00
ilya
d4702aefa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:20:19 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
adbe5f7c38 i love foaf 2010-10-15 16:54:56 -07:00
maxwell
ca604ffe5a added public atom discovery link 2010-10-15 16:51:37 -07:00
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -07:00
maxwell
a0ce9630b1 added test for facebook posting 2010-10-15 16:03:02 -07:00
maxwell
3af3e86911 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 16:02:43 -07:00
ilya
d06c6ced38 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 15:30:39 -07:00
danielvincent
47be7b1f0a correct html5 search box 2010-10-15 15:29:57 -07:00
maxwell
d56800f9e8 fixing facebook posting 2010-10-15 14:53:36 -07:00
ilya
2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/invitations/_new.haml
 2010-10-15 14:36:49 -07:00
danielvincent
6f282e77ff make public checkbox 2010-10-15 14:22:28 -07:00
ilya
0074aadd48 added a select tag to email invitations 2010-10-15 14:21:08 -07:00
maxwell
e8c49feca4 made the public info link in all aspects publisher 2010-10-15 14:10:10 -07:00
maxwell
7e0825e492 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 13:58:40 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
maxwell
a61c126aad manage page now uses partial 2010-10-15 11:29:23 -07:00
maxwell
20f164fd45 fixing some of the invite copy 2010-10-15 11:11:25 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
ilya
b4b338b3cd Merge branch 'master' of github.com:diaspora/diaspora 2010-10-14 18:12:34 -07:00
ilya
4a7c4e0848 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
Raphael
9e90463455 Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric. 2010-10-14 17:29:26 -07:00
Raphael
51c5b73256 Merge branch 'empty-page' 
Conflicts:
	public/stylesheets/application.css
 2010-10-14 17:00:19 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maxwell
d61a227fc7 posts now serialize their created_at time 2010-10-14 16:49:08 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00
danielvincent
45d7d54c66 added an empty message for the case of an aspect with no friends 2010-10-14 16:23:29 -07:00
Raphael
65958cf85c Should close Issue 368 2010-10-14 15:53:43 -07:00
danielvincent
750b4b4388 empty message re-appears if all stream posts are deleted 2010-10-14 15:40:34 -07:00
danielvincent
8daf2d0fd5 add none message to aspect#index 2010-10-14 15:23:15 -07:00
danielvincent
cf2a4c25ae DG RS; remove empty message from stream upon adding something 2010-10-14 15:19:37 -07:00
danielvincent
5722f85c85 message in aspect if stream is empty 2010-10-14 15:00:47 -07:00