Commit graph

2328 commits

Author SHA1 Message Date
Raphael
4ce2de55e2 Fix photo show, js on people search page 2010-11-21 13:29:50 -05:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc made shared/_contatct_list.html.haml
and the type after "viewing:" in shared/_author_info.html.haml translatable
2010-11-19 17:25:05 +01:00
MrZYX
7200c007e5 made file uploader translatable 2010-11-19 15:25:14 +01:00
maxwell
466120cd58 fixing extra = 2010-11-18 20:07:57 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
Raphael
bad76d8cef Use pod url in host-meta 2010-11-18 17:02:13 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Raphael
6841ffbecc Disable_with on comment form 2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd Disable with on publisher form 2010-11-18 15:41:51 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
zhitomirskiyi
c8c0b5c8a2 made the service image the same size 2010-11-18 15:22:14 -08:00
maxwell
970d56a007 basic batch inviter 2010-11-18 15:17:22 -08:00
zhitomirskiyi
f95fd33ed4 typo 2010-11-18 12:22:39 -08:00
zhitomirskiyi
9a31d15c92 added icons for the connected services and to indicate the rss feed 2010-11-18 12:19:58 -08:00
Raphael
c564d2819e Fixing no contacts link in _no_contacts. Thanks to alepane21. 2010-11-18 11:55:03 -08:00
Raphael
589c36d1ed Merge remote branch 'hex/duplicate-ids' 2010-11-18 11:39:03 -08:00
Matt Baker
b2e6caafed Don't show skip link if user.getting_started == false 2010-11-18 11:16:18 -08:00
maxwell
597258615b adding star back to title 2010-11-18 11:06:17 -08:00
maxwell
9882fa183d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
Sarah Mei
d1a745c9cd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:42:04 -08:00
danielvincent
eda346e283 use google's jquery within current protocol (http/https) 2010-11-17 22:36:01 -08:00
Sarah Mei
64237534fd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
maxwell
5e375a30d8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:06:08 -08:00
maxwell
c6778b942f Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	app/views/layouts/application.html.haml
2010-11-17 21:57:48 -08:00
danielvincent
558c175c2b resolved translation issue in diaspora.en in user dropdown. second login link on landing page works. 2010-11-17 21:57:27 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
danielvincent
9041a81fea cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing 2010-11-17 21:21:00 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093 firefox fixes and added links to press articles on landing page 2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
Raphael
37a694ed1f Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects 2010-11-17 18:49:03 -08:00
maxwell
1a279de573 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 16:18:07 -08:00
maxwell
f442c6fe3e taking out the if true 2010-11-17 16:17:52 -08:00
Raphael
5e269edb5a Adding logging to webfinger in people_controller 2010-11-17 15:56:39 -08:00
Raphael
2ecf1e8b71 No name fields on invitation accept 2010-11-17 15:45:40 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d Add logging statements, rescue callbacks in em-webfinger 2010-11-17 13:55:58 -08:00
maxwell
045c8f1aac updated magent, now using my fork untill bugfix gets pulled 2010-11-17 13:49:12 -08:00
maxwell
e959e529ff ga looks like it only likes if the code is pasted...hrmpf 2010-11-17 12:29:58 -08:00
maxwell
ba620e5400 spell vendor correctly 2010-11-17 12:25:09 -08:00
maxwell
643950cf52 added google a 2010-11-17 12:16:44 -08:00
maxwell
5561ab9cec adding get satisfaction 2010-11-17 12:08:06 -08:00
maxwell
afc3bd63fe added button to end of getting started 2010-11-17 11:30:22 -08:00
maxwell
6a695479f7 adding updated jquery UI for compatability 2010-11-16 23:58:16 -08:00
maxwell
f55509085a upgraded jquery, and deleted a second version of both jqueries 2010-11-16 21:41:20 -08:00
maxwell
092f0ef7a8 invite link when you get a webfinger error 2010-11-16 19:07:19 -08:00
Raphael
ece1dc2cf9 In progress invites in _manage_aspect_contacts 2010-11-16 18:10:15 -08:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Raphael
d1a56e9ef2 Fix to websocket js 2010-11-16 14:35:46 -08:00
Alec Leamas
90b86690d9 Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4 2010-11-16 16:25:32 +01:00
Sarah Mei
44bd4534ce I found where we needed the one-line addition. Ruby 1.9 build now works.
I feel pretty badass.
2010-11-15 22:44:55 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
zhitomirskiyi
c5ae73f96d websocket secure params in app_config 2010-11-15 17:45:52 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Hexagon
35095f8859 Update of sv.yml to reflect latest changes + small fix to en.yml 2010-11-15 22:28:36 +01:00
Hexagon
9f8ef8ae3b Translation fix "Invite someone" 2010-11-15 22:28:36 +01:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Raphael
03eea3fc08 Class not class_name 2010-11-15 11:49:16 -08:00
Raphael
2ad74d397c fix build 2010-11-13 19:05:12 -08:00
danielvincent
60b272b243 remove validations on url for now to support ip addresses in pod_url field in app_config.yml 2010-11-13 14:55:40 -08:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
Hexagon
958be06ff1 Removed duplicate id generation in _new_comment form 2010-11-13 13:54:48 +01:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Raphael
1a5aa02c77 Removing :value => on hidden_field_tag. Thanks npouillard. 2010-11-12 14:10:49 -08:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
Raphael
ae9f4ab969 Refactor mail views, add a spec to make sure CSS is rendered 2010-11-12 11:47:59 -08:00
Raphael
0e8b1efefd Merge remote branch 'MrZYX/en.yml-refactor' 2010-11-12 11:28:05 -08:00
danielvincent
716a77f0cc fixing a refactor that broke friend requesting from the ui 2010-11-11 21:26:40 -08:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
f55a973685 two small fixes 2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7 fixes to be in sync with latest commits 2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
381c53b775 found some untranslatable strings 2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6 refactored en.yml
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
Raphael
d62a7c4ce2 Fix request views, refactor identical forms into partial. 2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
Sarah Mei
ca9331970a Renaming image_picker to image-picker since js likes dashes better than underscores 2010-11-10 10:52:33 -07:00
maxwell
71da954a76 removing deletetion 2010-11-09 15:29:43 -08:00
maxwell
f7cc01ceb2 more work done. much more to go 2010-11-09 15:29:43 -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
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 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
maxwell
18505bf23c resubmmiting object path bug. not sure how it got overwritten 2010-11-09 00:24:27 -08:00
maxwell
56c152ac6a fixed a bug in the stream partial to use object_path 2010-11-08 21:16:46 -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
091d98ea15 invite friends actually calls up the invite friends pane on all aspects 2010-11-08 18:00:36 -08:00
maxwell
7d6be51cfb making photos#show be in no aspect 2010-11-08 17:53:47 -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
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
maxwell
7e40558dc4 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:33:05 -08:00
maxwell
80c8451bf2 fixing translation text of services page 2010-11-08 10:25:11 -08:00
maxwell
0d26348e69 remove arnold from the inviter mail form 2010-11-08 10:05:34 -08:00
danielvincent
58ce81f674 Add a person to aspect contains a searchable list as opposed to a dropdown. 2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif 2010-11-07 11:07:37 -08:00
danielvincent
a4df6a8a53 bugfix in peeople#_person partial displaying relationship status 2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80 Stream is its own partial, which takes a collection of posts 2010-11-07 10:38:00 -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
a971985884 removed private info if you are not friends 2010-11-06 16:34:41 -07:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e Post a message to aspect dialog will only display if people are present. 2010-11-05 21:14:00 -07:00
Raphael
8023b6f344 Check for birthday before putting in birthday paramaters 2010-11-05 18:32:18 -07:00
danielvincent
58c3a4306f fixed the build 2010-11-05 18:16:28 -07:00
danielvincent
ddb4b2b6ee Clicking 'make public' label on everyone publisher selects respective checkbox 2010-11-05 17:49:15 -07:00
maxwell
32ed7e3b0f forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have 2010-11-05 17:48:33 -07:00
maxwell
1a642e044a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-05 17:43:30 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
maxwell
4a39d1a516 date now has a default nil value 2010-11-05 17:38:51 -07:00
danielvincent
9a055b6cba Photo partial now has a description and a link to view all photos by that person. 2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
maxwell
4300b20c34 cleaned up profile page a bit more 2010-11-05 14:28:39 -07:00
danielvincent
3ed10a22ff xml_accessor creates attr_accessors in addition to xml_readers 2010-11-05 14:25:45 -07:00
Raphael
6468f0003b Take out some xml accessors 2010-11-05 14:24:56 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04 more testing 2010-11-05 11:46:43 -07:00
maxwell
53b25728ce yay for typo 2010-11-05 11:46:43 -07:00
maxwell
4154cec28a made mailer query based on ids, rather than making them serialize ruby objects 2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
4233e45bc5 Adjust wording 2010-11-05 11:23:21 -07:00
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -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
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings'
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Derrick Camerino
087f7e90d4 removing aspect in ui only if ok is clicked on confirmation 2010-11-04 19:54:11 -07:00
Raphael
abebd18c98 Move getting_started self link color to a css class 2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
Conflicts:
	config/locales/diaspora/en.yml
2010-11-04 18:56:43 -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
be916384a1 collapsed remove from aspect and remove person into one function on aspects#manage 2010-11-04 17:50:48 -07:00
Raphael
20508ad37a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-04 16:45:03 -07:00
Raphael
3634658cbf The Governator's party has lost the election. 2010-11-04 16:44:17 -07:00
danielvincent
b74dfcf5fd comments autolink 2010-11-04 16:18:49 -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
b4679c9041 Take application_controller before filters out of publicscontroller 2010-11-04 15:33:16 -07:00
zhitomirskiyi
ea0f0fbdc5 add moved dev controller to use the user post api 2010-11-04 15:07:24 -07:00
zhitomirskiyi
7f5b98a6cb the photo image url is now randomized 2010-11-04 14:37:08 -07:00
danielvincent
9da7272e59 should query the correct collection on perform 2010-11-04 12:58:24 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19 unscope are_you_sure in photos/show.html.haml 2010-11-04 20:49:50 +01: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
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04: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
zhitomirskiyi
7771219a0a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 13:16:57 -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
danielvincent
3e001c74d6 Albums#index hidden from views. Photos must be accessed through a person. 2010-11-03 12:21:14 -07:00
Raphael
c8a8849518 Move to build_post and dispatch_post in most controllers 2010-11-03 09:30:41 -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
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
danielvincent
a31c22adb3 mailer doesn't break everything anymore. attachments are also inlined. 2010-11-02 17:59:50 -07:00
maxwell
8c350282d3 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 17:52:22 -07:00
maxwell
2f1fbaf686 temp. logging statement 2010-11-02 17:52:04 -07:00
Raphael
ae039442c3 Websocket now uses cookie to authenticate 2010-11-02 17:39:50 -07:00
danielvincent
a79d1f5240 tabbing on publisher to everyone focuses submit button 2010-11-02 17:35:12 -07:00
danielvincent
a995d250f1 added white text on grey asset to mailer 2010-11-02 17:19:49 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -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
maxwell
51d419f41a removed diaspora handle method from user 2010-11-02 16:42:37 -07:00
Raphael
a5dedc9bdb User.build no longer saves people, user now has attr_accessible 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
Raphael
6503cefd68 Get rid of some repeated ids, fix infieldlabels on manage page 2010-11-02 15:37:06 -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
bfcb2a9e18 Remove random href 2010-11-02 12:37:32 -07:00