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

1232 commits

Author SHA1 Message Date
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
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
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
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -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
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
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
4300b20c34 cleaned up profile page a bit more 2010-11-05 14:28:39 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -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
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
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
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
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
danielvincent
3e001c74d6 Albums#index hidden from views. Photos must be accessed through a person. 2010-11-03 12:21:14 -07:00
danielvincent
a31c22adb3 mailer doesn't break everything anymore. attachments are also inlined. 2010-11-02 17:59:50 -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
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
Raphael
bfcb2a9e18 Remove random href 2010-11-02 12:37:32 -07:00
Raphael
a9b429d163 Merge remote branch 'ed0h/helper-method-for-markdown' 2010-11-02 12:14:41 -07:00
Raphael
8778bdab3b Merge remote branch 'ed0h/503-language-html-tag' 2010-11-02 11:43:12 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
67219248b0 unscope i18n calls 2010-11-02 10:32:34 -07:00
livefromthemoon@gmail.com
aab74cf1ff Added markdown support for status messages 2010-11-02 03:55:14 +01:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
danielvincent
3a4f100806 remove * 2010-11-01 15:01:49 -07:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
livefromthemoon@gmail.com
2b890e6ef2 Added 'lang' attribute in the html tag 2010-11-01 21:31:12 +01:00
Raphael
07e96e5a37 Merge remote branch 'jdeisenberg/492-vague-signup-wording' 2010-10-31 23:44:50 -07:00
zhitomirskiyi
c86a3eb608 moved getting started logic to the controller 2010-10-31 19:33:11 -07:00
Sarah Mei
0817409e9a Fixed deprecation warning 2010-10-31 17:48:38 -07:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
J David Eisenberg
14ccf7229b Issue #492: Informal, vague description when signing up as a new user 2010-10-30 22:07:37 -07:00
Hexagon
bba3aaa684 Translating a huge amount of untranslated strings 2010-10-30 15:25:42 +02:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
danielvincent
f2b7e4010e edit profile link on owner's profile page. 2010-10-29 15:02:56 -07:00
danielvincent
6eb50ea934 profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so. 2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad photo uploader on edit profile page. 2010-10-29 14:11:59 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
51dd6d32b3 upload a photo button next to publisher 2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3 user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show 2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
danielvincent
d02c36b53a quickfix in add_friend_dropdown 2010-10-28 11:30:45 -07:00
danielvincent
a0d83e28a1 copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
danielvincent
bb9a6e47a4 added birthday and gender to Profile. fixed a view issue on getting_started#2 2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
06654b13b2 posts don't socket into services#index anymore. 2010-10-27 22:55:58 -07:00
danielvincent
dc89d984f1 put remove buttons on incoming requests, allowing a user to ignore again. 2010-10-27 18:36:15 -07:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
db1a753add major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working. 2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -07:00
danielvincent
335bd9c96a skip getting started button sets getting_started to false via js and redirects to root_path 2010-10-27 12:53:46 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
danielvincent
4ec11691cd user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set. 2010-10-27 10:36:13 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -07:00
danielvincent
f1fbb68fd8 added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward. 2010-10-26 18:35:14 -07:00
danielvincent
385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
 2010-10-26 16:50:57 -07:00
danielvincent
e62afae045 deselected tabs in top nav, made user drop down a bit clearer 2010-10-26 16:12:58 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
danielvincent
ea46fa8fd8 save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00
danielvincent
ec141a2019 a user can add a person to an aspect from getting_started#2 2010-10-26 13:04:47 -07:00
danielvincent
0c72257c50 aspects can be created/destroyed via ajax on getting_started#2 2010-10-26 13:04:47 -07:00
danielvincent
dd4f46c8b0 repositioning layout on getting started 2010-10-26 13:04:47 -07:00
danielvincent
69b1b71a5d removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers). 2010-10-26 13:04:47 -07:00
danielvincent
f23d199230 added slider to getting started flow 2010-10-26 13:04:46 -07:00
danielvincent
b52afdd93c changed account and profile partials to better reflect styling changes 2010-10-26 13:04:46 -07:00
danielvincent
31713d9597 html5 placeholder text 2010-10-26 13:04:46 -07:00
danielvincent
278a74f1f9 draft 2010-10-26 13:04:46 -07:00
zhitomirskiyi
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
maxwell
a992c5fbc2 dont show service if you dont have the keys for it. also, update deploy script 2010-10-25 22:06:53 -07:00
danielvincent
060d8f9c7b DG MS; fixed some bugs with posting publicly. 2010-10-25 19:24:48 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
maxwell
606c7a02a4 MS DG public message now post to twitter, if connected 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
danielvincent
7b3f6f66c1 removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments. 2010-10-24 14:44:43 -07:00
danielvincent
661ad20a02 added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM. 2010-10-24 14:44:43 -07:00
danielvincent
f8347a3dd4 added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show 2010-10-23 22:21:51 -07:00
danielvincent
18acdc7b55 everyone instead of all on aspect#index page. photo partial avatar now links to poster's profile. 2010-10-23 22:01:01 -07:00
danielvincent
f5a0f44c25 fixed error in posting to all albums through publisher on albums#index 2010-10-23 00:36:29 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
maxwell
de04e717c0 made image or default to help with hcard parsing, deleted old default user picture 2010-10-22 16:57:01 -07:00
danielvincent
c0423e5e56 reverting commit manually 2010-10-22 15:57:00 -07:00
danielvincent
829ad6360a multiple dropzones function. person image does not copy, delete is disabled. 2010-10-22 15:56:28 -07:00
danielvincent
a52870b21c improved animations 2010-10-22 15:56:28 -07:00
danielvincent
e1f4e12b8f style. also, made sense of aspect-edit.js 2010-10-22 15:56:28 -07:00
danielvincent
69528b95a3 removed ignore bucket. people now have x's to delete them 2010-10-22 15:56:27 -07:00
danielvincent
b5976753ea removed unused view 2010-10-22 15:47:22 -07:00
danielvincent
f2cfa3c378 user name in breadcrumb 2010-10-22 15:38:22 -07:00
danielvincent
ed4c253ea8 show pages now identify content with content creator. publisher now takes a local 2010-10-22 15:32:41 -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
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
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
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
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
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -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
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
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
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
danielvincent
d200aaab52 mail has some style. couldn't figure out devise mailer templating at the time... 2010-10-19 18:26:02 -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
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -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
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
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
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -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
danielvincent
eca37e1a28 small view cleanups 2010-10-17 21:55:03 -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
7160e9f85b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-17 10:25:38 -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
5ca3570667 added prefetch rels to prev/next links in photo show. fixed shadow bug in header 2010-10-16 02:06:46 -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
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
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
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -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
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
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
danielvincent
2b97e8751c include blueprint/print.css in layout 2010-10-14 10:40:39 -07:00
danielvincent
58d5fbfb3e moved invite link to account#edit on settings page. changed text on person partial. 2010-10-14 10:26:06 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
ilya
d6b08de6fc corrected link on the account page 2010-10-11 15:07:17 -07:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
be017bfb0a DG MS; invite is now a lightbox on feed and manage pages 2010-10-11 14:16:24 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
danielvincent
82f526ea23 DG MS; added tooltip 2010-10-11 10:53:00 -07:00
danielvincent
c5affa07e8 tweaked reshare button 2010-10-08 16:19:51 -07:00
danielvincent
9ac13ccb3e fixed reshare a bit 2010-10-08 15:47:06 -07:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
danielvincent
086df28a37 removed connected to facebook text under everyone publisher 2010-10-08 15:21:27 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -07:00
danielvincent
526fbe9a90 fixed error where publisher would cause status_message_controller to error out 2010-10-08 14:19:54 -07:00
danielvincent
7d96c95caf fixed breaking aspect show pages 2010-10-08 14:15:35 -07:00
danielvincent
48e92c2c33 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:07:05 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
Crimer
3754b519a7 Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'. 2010-10-08 21:51:59 +00:00
danielvincent
a3aab92212 fixed photo partial 2010-10-08 12:25:42 -07:00
danielvincent
3a876770f3 minor tweaks 2010-10-08 00:36:55 -07:00
danielvincent
5b66a191cd more stream tweaks 2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec intermediate misc ui polish 2010-10-07 22:51:08 -07:00
danielvincent
ed1cb5a0e7 DG MS; moved change password to account page; fixed the styling on password inputs 2010-10-07 18:52:46 -07:00
danielvincent
7a56d82873 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00
danielvincent
4deea95057 DG MS; export photos button in users#edit 2010-10-07 16:56:10 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72 DG MS; test for users#export 2010-10-07 15:22:03 -07:00
Raphael
ec9e180eab Merge branch 'master' into HEAD 
Conflicts:
	public/stylesheets/application.css
 2010-10-07 13:58:06 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
c68a026658 MS changed the profile edit field to be private 2010-10-06 18:19:58 -07:00
danielvincent
6b74053e06 scratch that last commit 2010-10-05 20:37:28 -07:00
danielvincent
982f51b9c7 prepend pod_url to image paths 2010-10-05 20:31:40 -07:00
danielvincent
dc88110716 img tag in hcard 2010-10-05 20:22:13 -07:00
danielvincent
d519e46f4d webfinger edit 2010-10-05 19:01:04 -07:00
maxwell
ec4c63ada7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:51:10 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -07:00
Raphael
5847e7767d Add profile photo url to hcard parser 2010-10-05 17:24:01 -07:00
kook
85b384010e exchange photos on adding new friend 2010-10-05 17:18:51 -07:00
Raphael
22f90086ca Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 16:58:06 -07:00
Raphael
37fb2bfd32 Don't require a facebook yml 2010-10-05 16:57:22 -07:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08:00
danielvincent
c284c9b07f added public back into webfinger 2010-10-05 13:47:42 -07:00
ilya
63cb7dcbdd Fb friends are displayed only once 2010-10-05 13:00:42 -07:00
danielvincent
f5a57a6f4a photo partial now has labels 2010-09-28 13:05:58 -07:00
danielvincent
e0159aaaeb small visual tweaks 2010-09-28 12:58:34 -07:00
danielvincent
4627c5338e found placement of all aspects tab confusing; moved it to be the first tab 2010-09-28 12:29:35 -07:00
danielvincent
263615ad14 all status messages have labels 2010-09-27 23:51:20 -07:00
danielvincent
79926da3d3 removed owner image repeat 2010-09-27 23:16:19 -07:00
danielvincent
cb7c35af73 fixed thumbnail positioning 2010-09-27 23:15:48 -07:00
danielvincent
bf587be461 public indicator tag on status message partial. 2010-09-27 22:50:11 -07:00
ilya
52313b799b added a warning, moved connected as into a partial, removed the 
publishing box from settings page
 2010-09-27 16:31:19 -07:00
ilya
d41b370630 removing the fb feed for now 2010-09-27 16:20:27 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Chiggins
f74b0a6f2c Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text". 2010-09-25 08:13:16 +08:00
ilya
f38bcc9eb3 tiny change in view 2010-09-24 15:54:53 -07:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -07:00
ilya
c7757a302c typo 2010-09-24 15:06:48 -07:00