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

926 commits

Author SHA1 Message Date
Sarah Mei
72bf683c87 Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec. 2010-11-10 10:53:23 -07:00
maxwell
4037ae9f33 fixing controller test 2010-11-09 16:55:54 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
ae28a6f70c Don't pluralize in model spec name 2010-11-09 14:07:26 -08:00
Raphael
4818973643 Beginning to refactor invitations into an Invitation class 2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
Sarah Mei
16e2ccc614 Specs for aspect edit during and stop drag. 2010-11-09 06:53:55 -08:00
Sarah Mei
16ea7a321b specs for AspectEdit#animateImage 2010-11-08 21:19:49 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
zhitomirskiyi
7d39f8ae5f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:36:11 -08:00
zhitomirskiyi
a6dff4f78e removing the posts from the aspect on unfriending 2010-11-08 15:35:37 -08:00
Raphael
70af10ee62 user#friends is now a many-foreign_key assoc, rather than a many-in 2010-11-08 15:19:23 -08:00
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Sarah Mei
1a4fa2713a More specs for aspect-edit.js. Initialize now fully covered. 
Also, bundler upgraded our cucumber and rspec.
 2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900 rename spec file 2010-11-05 11:26:49 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
4eba0595f9 Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
f4dba54ff3 posting to a person with a user on the same pod will send internally, skipping the http queue and encryption. 2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc separating object receiving in user#receive 2010-11-04 15:33:16 -07:00
Raphael
7e568db032 Add a couple specs to user_spec 2010-11-04 15:23:58 -07:00
zhitomirskiyi
7f5b98a6cb the photo image url is now randomized 2010-11-04 14:37:08 -07:00
danielvincent
b33aa9a0fb retracting on a non existant post does not raise a permissions error. 2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
9389d99ba8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 23:05:47 -07:00
zhitomirskiyi
a55878f2a3 invitations controller test, tnx coyote 2010-11-03 22:58:42 -07:00
Sarah Mei
dbdd6884a7 SM MS jasmine specs for aspect edit 2010-11-03 22:19:20 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62 oops did not save the pending 2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
Raphael
03b272db60 Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC 2010-11-03 15:26:58 -07:00
Raphael
2eef9f7ad1 Refactor ostatus builder spec 2010-11-03 15:26:58 -07:00
zhitomirskiyi
0ac4c5b04f IZ MS refactored invites to use user.build 2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
zhitomirskiyi
5e9d70f88c Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 11:00:04 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00
maxwell
62c25057e6 adding photocontroller spec for IZ 2010-11-03 10:43:27 -07:00
maxwell
0343e7a226 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 00:10:11 -07:00
maxwell
545577a950 em-webfinger ssl should work 2010-11-02 19:16:08 -07:00
Raphael
d5a4de58b3 User#post is now like a future controller, Photo#instantiate no longer saves 2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc Move post dispatching to dispatch_post 2010-11-02 19:16:02 -07:00
maxwell
d482334ca2 Revert "Revert "IZ MS webfinger now trys ssl first, then http"" 
This reverts commit 153265aae8.
 2010-11-02 18:59:18 -07:00
maxwell
0ecc27a935 MS IZ posts should now update 2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc MS IZ setting the diaspora handle in photo instantiate 2010-11-02 18:32:02 -07:00
Raphael
ab4e3a9f7f add a couple specs to album_spec 2010-11-02 18:16:14 -07:00
danielvincent
bf12dc6bc7 fix spec 2010-11-02 17:44:13 -07:00
maxwell
153265aae8 Revert "IZ MS webfinger now trys ssl first, then http" 
This reverts commit af3247b62f.
 2010-11-02 17:37:45 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -07:00
Raphael
ccd92fb850 make requests controller spec a little clearer 2010-11-02 16:55:23 -07:00
maxwell
1951df8d9c Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:49:54 -07:00
maxwell
3baa8b4552 IZ MS two pending photo specs now pass 2010-11-02 16:49:40 -07:00
danielvincent
e9f3efea79 person searchable by diaspora_handle 2010-11-02 16:48:58 -07:00
maxwell
8c89f8d87a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:42:52 -07:00
Raphael
20d5daafbc Two pending specs on photo serialization for Max and Ilya 2010-11-02 16:41:53 -07:00
Raphael
15ecc22130 Unpending user spec 2010-11-02 16:41:31 -07:00
Raphael
2c903ea519 check that User#build does not save a Person 2010-11-02 16:28:55 -07:00
danielvincent
da8124f8a7 hcard has searchable field, and is taken in to account when building Person from webfinger 2010-11-02 16:12:43 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
maxwell
34f190ce75 MS IZ added a check for person in webfinger response in receive_salmon method 2010-11-02 16:10:17 -07:00
maxwell
af3247b62f IZ MS webfinger now trys ssl first, then http 2010-11-02 15:49:41 -07:00
maxwell
449a6f3ea0 MS IZ removed a refrence to REDFINGER 2010-11-02 15:14:40 -07:00
maxwell
4332174525 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 13:58:36 -07:00
maxwell
3251b8ba2e MS IZ fixed a hole where another user could update another friends post 2010-11-02 13:58:27 -07:00
Sarah Mei
cd7bdf6758 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 13:37:40 -07:00
Sarah Mei
fad9c09212 refactor aspect-edit.js in prep for jasmine testing 2010-11-02 13:37:27 -07:00
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
a9b429d163 Merge remote branch 'ed0h/helper-method-for-markdown' 2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4 Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'" 
This reverts commit 2b128d88ec, reversing
changes made to 8778bdab3b.
 2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec Merge remote branch 'ed0h/336-markdown-for-status-messages' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-02 11:45:16 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
0b8425cbde user.aspect is gone 2010-11-02 11:02:08 -07:00
Raphael
c031416ca8 Merge branch 'master' into HEAD 
Conflicts:
	lib/diaspora/user/receiving.rb
	pkg/ubuntu/dist
 2010-11-02 10:54:37 -07:00
Sarah Mei
dc97c852f4 Person delegates first_name and last_name to profile. 2010-11-01 22:22:15 -07:00
livefromthemoon@gmail.com
aab74cf1ff Added markdown support for status messages 2010-11-02 03:55:14 +01:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
maxwell
ccf897ed62 IZ MS; fixing parser spec 2010-11-01 14:56:31 -07:00