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

2230 commits

Author SHA1 Message Date
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
ilya
ac9854596f fb_status partial rendered in public 2010-09-24 15:04:31 -07:00
danielvincent
4f17eb4e02 stray aspect name removed from publisher 2010-09-23 20:33:34 -07:00
ilya
a594c9a34f friends in the public bucket 2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
ilya
796f198d8c notification only on user page 2010-09-23 17:20:55 -07:00
ilya
11dc225311 removed the old publish box 2010-09-23 17:19:43 -07:00
ilya
75e1ddf9d2 saying going to FB in public aspect 2010-09-23 17:17:18 -07:00
ilya
4d2bd52310 public aspect param on statusMessage create and in the partial 2010-09-23 16:41:05 -07:00
Raphael
d748d456b5 Revert "fix in person partial" 
This reverts commit 8c0bc4b9e6.
 2010-09-23 16:21:08 -07:00
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
fc2cf4fde6 typo 2010-09-23 15:21:15 -07:00
ilya
1fdbc637d1 trying profile pictures on remote 2010-09-23 15:18:29 -07:00
ilya
19c3a5ce4b fetching friend data 2010-09-23 15:07:07 -07:00
ilya
f0999628ae trying to get friends from fb 2010-09-23 14:43:08 -07:00
ilya
5857838a0a adding the new files 2010-09-23 12:29:00 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:49:41 -07:00
danielvincent
8c0bc4b9e6 fix in person partial 2010-09-23 10:49:35 -07:00
maxwell
40d736d233 MS changed the session page to show APP_CONFIG[:terse_pod_url] 2010-09-23 10:39:47 -07:00
uiri
c711e85c89 adding gif support 2010-09-24 01:10:46 +08:00
Raphael
cc3819c256 Forgot a merge conflict 2010-09-22 21:39:22 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
7303212784 DG IZ; haml typo 2010-09-22 17:50:47 -07:00
danielvincent
fc0350e4e1 DG IZ; user can post a status update from user edit page to facebook. 2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95 DG IZ; quick form in user edit 2010-09-22 17:33:57 -07:00
danielvincent
ddbde60e8c another indent... 2010-09-22 17:17:24 -07:00
danielvincent
aef3c8d7bb indent, whoops 2010-09-22 17:16:16 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	config/routes.rb
 2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
danielvincent
474cf77708 DG IZ; reposting now works. redirects to a template missing page, though. 2010-09-22 15:05:51 -07:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00
Raphael
7049cb3ca4 A less efficient, but simpler way of checking whether the photo is the profile photo 2010-09-22 10:31:40 -07:00
ilya
d26e7850ac RS, IZ; removed url from user and views 2010-09-21 15:52:26 -07:00
danielvincent
0a99b82bd3 Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-21 13:40:17 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
ilya
1882509a0b removed the auto_link seems to fix HTML injection, no more autolinking 2010-09-21 11:59:04 -07:00
danielvincent
4d200fea87 removed view all link from status_message#show 2010-09-20 20:17:18 -07:00
Raphael
441f75203a Add autolink and sanitize to show page 2010-09-20 17:33:05 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
maxwell
24ca139241 MS remove some stray puts 2010-09-20 17:11:07 -07:00
maxwell
e2fc48c9ff MS being slightly more proper with application helper, and fixing the person search page 2010-09-20 16:44:35 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
Arnaud Delcasse
eeb132d825 Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results. 2010-09-21 03:20:06 +08:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
maxwell
64d371d9d6 MS added a warning for account 2010-09-20 11:30:08 -07:00
Ariel Zavala
db7ad16503 Added localization to comments views 2010-09-21 02:03:51 +08:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
danielvincent
14ad24ba7e visual tweaks on header. moved upload a file button to header on album#show 2010-09-19 14:27:20 -07:00
danielvincent
b40b81e447 aspect manage tab now reads 'manage aspects' 2010-09-19 10:11:41 -07:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39 description text for all boxes in manage page. search box text defaults to query on people#index. 2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
mishudark
c46ad0d7fa photo description with ajax request 2010-09-18 12:33:22 -05:00
mishudark
b7bc4b8615 prevent next prev when youre add writting 2010-09-18 04:14:44 -05:00
mishudark
910bd71c78 prevent photho redirect next,prev if textarea has focus 2010-09-18 03:32:37 -05:00
Ariel Zavala
58c2d0dd28 merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two) 2010-09-18 02:21:45 -04:00
Don Park
2d16289e46 use photos_path to generate the correct POST destination for photo uploads 2010-09-18 07:50:12 +08:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Ariel Zavala
271925a7f6 added photo view translations 2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d Added people views translations 2010-09-17 11:27:08 -04:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57 DG IZ; dropzones on left back on aspect manage page. 2010-09-16 17:22:42 -07:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9 Added localization to status message views 2010-09-16 15:47:12 -04:00
Ariel Zavala
ec9affb849 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:14:38 -04:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Ariel Zavala
5078830785 Added localization to comments views 2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
d2f5d3c4c1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 17:05:36 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
3681ae62c7 remove google analytics 2010-09-15 16:43:38 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
55c1530c9f MS DG fixing an edit profile bug 2010-09-15 14:09:05 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
57bd052c5b user edit bug 2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
deac53f178 see yourself in aspect sidebar, because you're going to post to yourself anyway 2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
fe35d60b13 hack on aspect nav for ff & chrome compatability 2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474 fixed 500 error with @photos 2010-09-15 11:24:23 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065 moving things around for consistency. consistency isn't pretty right now. 2010-09-15 10:26:57 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Daniel Vincent Grippi
4a86632cf3 show default user photos for requests 2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8 profile photo doesn't change to null if not changed on profile update 2010-09-14 19:48:11 -07:00
ilya
8aa39c5f08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:58:55 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
be7c3f28a9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc spelling mistake, broken links on search page 2010-09-14 11:42:47 -07:00
ilya
cb12e497f6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:14:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01 DG RS; passing around params[:aspect]. querying in application controller for current aspect. 2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8 fixed photo show header 2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb minor visual tweaks 2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
fe57a698d3 minor cleanup on album flow 2010-09-13 19:54:30 -07:00
Daniel Vincent Grippi
aa5447f553 Albums are now created within a context 2010-09-13 19:39:51 -07:00
maxwell
15651a7bb6 IZ MS group manage page can now add friends to groups 2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
5ecbb28dc7 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144 albums don't show publisher, refactored css 2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
maxwell
650a502404 MS IZ removed a bunch of unused request stuff 2010-09-13 16:58:23 -07:00
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
maxwell
3b1223c9dd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:48:50 -07:00
maxwell
6f75a81a9d IZ MS trying again on fixing remote profile images 2010-09-13 15:48:30 -07:00
Daniel Vincent Grippi
48403996f0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:11:38 -07:00
Daniel Vincent Grippi
2fae1049d9 silent comments in all views except the layout and session wall 2010-09-13 15:11:14 -07:00
maxwell
a7231d041e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:09:20 -07:00
maxwell
c098be99bc MS IZ attempt one to fix remote profile images 2010-09-13 15:08:39 -07:00
Daniel Vincent Grippi
a87925b359 missing license on layout 2010-09-13 14:39:18 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
maxwell
0b33e6b3eb MS IZ album page is now not completely wonky, but still kind of pointless... 2010-09-13 14:23:38 -07:00
maxwell
24d957cb32 MS IZ removed the views and redirected the edit route 2010-09-13 12:20:47 -07:00
maxwell
27f1b29581 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:54:50 -07:00
maxwell
812f2550aa removed status message webfinger link 2010-09-13 11:52:47 -07:00
Daniel Vincent Grippi
6aeaea1b7d removed some things. also, comment buttons are now css-ified when they come through the socket 2010-09-13 11:42:41 -07:00
Raphael
1312728b88 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50 more cleanup 2010-09-13 11:05:10 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi
a74e00c159 removed hover user menu 2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
ilya
a738807cf4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 22:56:29 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
897074c869 replace in comment websocket action replaces one or more number instead of just the first 2010-09-12 22:33:51 -07:00
ilya
370e2ef688 not displaying requests in the remove 2010-09-12 21:31:03 -07:00
ilya
1e74acd9b0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 19:56:47 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
31df3cea11 friend pictures on group edit page should now display the default person image if friend's picture isn't present 2010-09-12 18:11:05 -07:00
Daniel Vincent Grippi
db5d000757 made a sticky request link on the bottom of every page 2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
1092c7b8d1 moved manage to be its own tab on right 2010-09-11 07:53:45 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -07:00
Raphael
b704704334 People index now works when there is a non-friend on the page 2010-09-10 16:49:09 -07:00
Raphael
c170726f6c Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-10 16:04:30 -07:00
Daniel Vincent Grippi
d3a8e27833 DG IZ; selector fix 2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
b4e3ea3937 another little fix 2010-09-10 15:33:16 -07:00
Daniel Vincent Grippi
9fd8cfcc99 DG IZ added the same structure as groups 2010-09-10 15:31:00 -07:00
Daniel Vincent Grippi
8afb590128 small fix 2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26 DG IZ; small fix 2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa DG IZ; requests bar added to group/edit 2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02 DG IZ; groups = relations. now you can rename groups in the manage relation page 2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
f70ade6705 DG IZ; moved info on the person show page 2010-09-10 13:52:12 -07:00
Raphael
522450c9d3 RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:19:34 -07:00
Raphael
d0de8b4988 Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-09 15:43:20 -07:00
Raphael
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d group header now has a page_title field. 2010-09-08 20:52:35 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00
maxwell
c3a1b36282 MS fixing this to be request host on the login page 2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
7072c633ec Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 19:39:42 -07:00
Raphael
061f9de668 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 17:35:39 -07:00
Raphael
91f2e2e6ae Add public key to webfinger profile 2010-09-08 17:35:18 -07:00
Daniel Vincent Grippi
ca780f3560 DG MS; hide debug info by default. also, made the text lighter. 2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163 DG MS; tweaking top nav and publisher. 2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81 DG MS; moved tabs around up top 2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9 DG MS; changed the gear on top nav to not be a tab 2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
5fd105c1dc DG MS; search now links user names if you're friends with them 2010-09-08 12:04:05 -07:00
Daniel Vincent Grippi
edae8f1e66 DG MS; fixed a view bug in user edit page. page also displays diaspora username . 2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Raphael
d25327d32d Add example to request partial 2010-09-08 11:07:49 -07:00
Raphael
91667c1990 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 10:59:17 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Daniel Vincent Grippi
1749a9c52d no console 2010-09-08 10:51:18 -07:00
Raphael
5fd1602731 Group batch edit is for all groups 2010-09-08 10:00:31 -07:00
Daniel Vincent Grippi
20d9334ce1 DG IZ; changed the photo uploader to drag and drop. now works in firefox. 2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi
41afd86fe7 DG IZ; fixed photos. 2010-09-07 12:03:43 -07:00
maxwell
6c33c2a463 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-07 00:55:02 -07:00
Daniel Vincent Grippi
39c366e2e9 group edit button up top. 2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi
48415b4de8 cleaned up group edit a little 2010-09-06 13:01:24 -07:00
maxwell
919d7d23c0 MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays 2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
7e909d4034 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-31 16:38:52 -07:00
Daniel Vincent Grippi
f9c2e0e76d moved publisher down.wn. header is now a dark grey instead of black. 2010-08-31 13:07:11 -07:00
ilya
12f7d16c0b Merge branch 'master' of github.com:diaspora/diaspora 2010-08-31 10:48:29 -07:00
ilya
98db03d36e the group edit resets the data started to reset the from id attr 2010-08-31 10:46:49 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7 controller cleanup: using respond_to and respond_with. 2010-08-29 22:49:13 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
Raphael
7b36ae7009 Move back link out of big_text 2010-08-27 12:28:39 -07:00
Raphael
7223d21721 Add singular move friend route, it must be eliminated later 2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90 Groups can now be batch edited 2010-08-27 12:23:20 -07:00
Raphael
f309299e22 Take out remove friend button on stranger, there should be an add friend 2010-08-27 10:26:03 -07:00
Raphael
e1d6c9ce03 fixing person show on stranger 2010-08-27 10:24:42 -07:00
Raphael
39380c3c06 check if you are friends before displaying group list 2010-08-27 10:22:58 -07:00
danielvincent
390bf24e14 Don't try to put yourself in any groups 2010-08-26 17:34:06 -07:00
danielvincent
81438678cd Refactored more photo js out to photos.js. That should be it for that refactor 2010-08-26 17:10:19 -07:00
danielvincent
81edef9b8a Fading out every form tag on photo upload was a bad idea 2010-08-26 17:00:45 -07:00
danielvincent
1d515e7b7e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 15:02:29 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -07:00
ilya
915144e08b size 30 by 30 2010-08-26 12:32:14 -07:00
ilya
df74020a16 small thumbnail 2010-08-26 12:27:10 -07:00
ilya
3554de48d8 trying image url 2010-08-26 12:24:53 -07:00
danielvincent
d2b471a58d Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 11:09:07 -07:00
danielvincent
39551a0162 fixed comments not showing for photos in stream 2010-08-26 11:08:03 -07:00
Raphael
19e8aa5c35 Refactored view js 2010-08-26 11:06:35 -07:00
maxwell
9b690b863a droping things 2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:20:37 -07:00
Raphael
ad67798004 User to_id on groups_with_post 2010-08-25 18:15:38 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
maxwell
b4174c664e you can now reassign a peson's group 2010-08-25 18:07:31 -07:00
Raphael
e714e0d457 Comment sets now pop open on receiving a new comment 2010-08-25 18:00:53 -07:00
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
3a91858bcf Don't alert 2010-08-25 16:47:11 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
maxwell
c9e64ae209 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 13:54:27 -07:00
maxwell
6a613c3304 addded the draggable javascript 2010-08-25 13:53:53 -07:00
Raphael
17636f4fd2 View modifications, refactored stream javascript to another file 2010-08-25 13:51:16 -07:00
Raphael
3121cf57d3 Refactored top nav haml, added non-functional gear link next to group 2010-08-25 11:35:50 -07:00
danielvincent
8497586547 linked group titles on group pages 2010-08-25 10:09:39 -07:00
danielvincent
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
d87f330369 added titles for columns in layout 2010-08-24 19:46:57 -07:00
Raphael
174dbc069b Fix publisher checkboxes on index 2010-08-24 19:25:38 -07:00
Raphael
5ac5f58679 Tabs on the top aren't all selected on group select, some other view tweaks 2010-08-24 19:22:43 -07:00
Raphael
d3c10f8777 made left column in layout a little wider 2010-08-24 19:02:00 -07:00
Raphael
008c450f66 Add friend button resized 2010-08-24 18:52:50 -07:00
Raphael
5779610659 messed with the views 2010-08-24 18:31:16 -07:00
Raphael
c102e81b03 put the visible back in 2010-08-24 16:56:04 -07:00
Raphael
de3044fa0a Remove publisher selection remnants, fix posting 2010-08-24 15:55:35 -07:00
maxwell
204c910f66 MS fixing small bugs, adding a very dump list of a groups that a friend is in for you 2010-08-24 15:47:44 -07:00
maxwell
92a2df5c77 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:23:02 -07:00
maxwell
2a28607bc6 Moved some prod changes into master 2010-08-24 15:22:48 -07:00
Raphael
03abd1ac21 Remove statuS MESsages new page. TaKE New OUt OF ROutes 2010-08-24 14:44:32 -07:00
Raphael
ef9cf8fc52 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 14:41:04 -07:00
maxwell
de335e7366 MS messed with the temporary group picker thing: whatever, it is less annoying 2010-08-24 14:37:47 -07:00
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly 
support multiple groups.
 2010-08-24 14:36:03 -07:00
maxwell
cc1f1e2f24 removed the plus button from the all people add a friend page 2010-08-24 14:16:54 -07:00
danielvincent
c3cf135a3f tabs on top 2010-08-24 11:33:20 -07:00
danielvincent
85c268b5eb Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 11:12:04 -07:00
Raphael
fb33d955c9 Fix group show controller/view and haml error in nav 2010-08-24 11:11:25 -07:00
danielvincent
4ffb8e7fa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 11:07:56 -07:00
danielvincent
86146d195f moving stuff around to the header 2010-08-24 11:07:39 -07:00
Raphael
7ca9d1e791 Changed group_nav a little, deleted people_sidebar 2010-08-24 11:02:30 -07:00
danielvincent
562656e96a added edit link for group 2010-08-23 18:42:30 -07:00
danielvincent
2b125fdc66 fixed left friends bar a bit 2010-08-23 17:00:40 -07:00
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -07:00
Raphael
48959b3ded Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:45:20 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
danielvincent
fb7e945fc2 removed useless if/else 2010-08-23 14:19:16 -07:00
danielvincent
60b7c30a8a Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:17:26 -07:00
danielvincent
d874ba3b38 dropdown menu for user 2010-08-23 14:17:05 -07:00
Raphael
5a02f92448 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
Raphael
0092069372 Take signed in check out of websocket js 2010-08-23 11:57:29 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4 left/right arrow keys on photo show page go to prev/next 2010-08-23 11:22:55 -07:00
danielvincent
2355947d8e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 11:05:36 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
Raphael
dc1dd07720 Don't crash on requesting a non-existent email address 2010-08-23 11:04:57 -07:00
maxwell
361adda6cd added group picker. sends the right params, but posts only have one group right now so thats a bummer 2010-08-22 22:20:34 -07:00
danielvincent
36b2445a11 added title to search page 2010-08-19 13:41:48 -07:00
maxwell
35f6856380 MS search and index works 2010-08-19 12:40:50 -07:00
maxwell
756278f498 MS added friend search, and allow for autodiscover 2010-08-19 12:37:34 -07:00
maxwell
c98c52ad14 MS IZ renamed the array 2010-08-19 12:17:29 -07:00
maxwell
df435dc319 MS IZ made a reques form in the user index page 2010-08-19 11:59:58 -07:00
maxwell
af8448dd51 photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page 2010-08-19 10:20:43 -07:00
maxwell
84cc598017 MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page 2010-08-18 22:58:57 -07:00
Raphael
7ce8f94d58 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
36c06349c5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 20:59:18 -07:00
ilya
284601c6b1 got moved photo.image.stuff to photo.url[:stuff] 2010-08-18 20:59:01 -07:00
Raphael
0459631d47 Show debug 2010-08-18 20:49:06 -07:00
ilya
3243435015 the album create doesn't crash the app 2010-08-18 20:14:31 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
Raphael
5a2b42e4e5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
d0b2a23fcb Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:17:00 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
Raphael
ac694eda8c A bunch of dumb checks to make the group index publisher pass tests 2010-08-18 15:42:06 -07:00
ilya
f5811df5b7 DG IZ; added info text to add new friend button 2010-08-18 11:59:20 -07:00
ilya
055c222fc2 DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial 2010-08-18 10:53:43 -07:00
danielvincent
2409fd3f20 user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self 2010-08-18 02:40:53 -07:00
Raphael
20bc88c0bf Merge branch 'socket-group' of github.com:diaspora/diaspora_rails 2010-08-17 20:19:29 -07:00
Raphael
2b8e637934 no names in publisher 2010-08-17 19:03:47 -07:00
Raphael
f75ff0b680 Remove links from publisher 2010-08-17 18:57:26 -07:00
Raphael
86afa7a987 Remove bookmarks and blogs 2010-08-17 18:56:42 -07:00
Raphael
d554b3ef1a flashsocket 2010-08-17 18:49:23 -07:00
ilya
daf08cd9f9 DG IZ posts by the user get websocketed on the group page and albums 
get signed?
 2010-08-17 18:06:35 -07:00
ilya
f15b3c46b2 DG IZ; reverted to before removing latest message methods 2010-08-17 17:40:48 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
ilya
054dafdf99 couple more 2010-08-17 17:16:11 -07:00
ilya
c1ff8544d3 removed a couple of js lines 2010-08-17 17:04:37 -07:00
ilya
e5036862f6 DG IZ removed the latest message javascript as well as the hash 2010-08-17 16:49:58 -07:00
ilya
d211abb1bc DG IZ on page for group js method now returns true 2010-08-17 16:32:14 -07:00
ilya
d5d1a2d00f DG IZ; javascript variable misnamed 2010-08-17 16:29:51 -07:00
ilya
7d68089c8b DG IZ using group_id when passing the id around the app 2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d DG IZ added group id to the action hash 2010-08-17 15:27:12 -07:00
ilya
fc7f59bdfc DG IZ stream for the current user's posts 2010-08-17 10:13:23 -07:00
ilya
33ed838b79 DG IZ added an error message on request delete 2010-08-16 15:08:05 -07:00
ilya
4a36df29e5 DG IZ now the links are of button style 2010-08-16 14:59:23 -07:00
ilya
92aa72447f DG IZ fixed the css in selector 2010-08-16 14:57:30 -07:00
ilya
b1c29083df changed the link data-method 2010-08-16 14:34:16 -07:00
ilya
2bc9d0156d 2 arguments in the hidden field 2010-08-16 11:59:13 -07:00
ilya
0ee03afe1d DG IZ selector box on request page 2010-08-16 11:39:33 -07:00
danielvincent
18cd4b858a broke out group index and show 2010-08-14 00:27:43 -07:00
danielvincent
c81ea5a632 minor changes 2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c minor section header tweaks (album stuff) 2010-08-13 23:20:39 -07:00
danielvincent
f7e43ee3d0 photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now... 2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849 add photo is now in a fancy-pancy box 2010-08-11 20:45:57 -07:00
danielvincent
97b04fc0d7 nevermind 2010-08-11 20:12:10 -07:00
danielvincent
3e1081acaa commented out tinyMCE js for the time being 2010-08-11 20:09:16 -07:00
Raphael
eb36190188 DG, RS; Albums create failure prettier 2010-08-11 18:13:23 -07:00
Raphael
144d673dac DG, RS; album button looks better 2010-08-11 17:16:20 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
355aba75df RS, DG; removing the last link_to_person 2010-08-11 10:02:45 -07:00
Raphael
cc070ba168 RS, DG; Removed fancybox gone mad from photo adder 2010-08-10 18:08:27 -07:00
Raphael
a201390123 DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken 2010-08-10 17:59:22 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
Raphael
37bf5b45f1 RS, DG; You now can't open the photo upload form while photos are uploading 2010-08-10 16:56:19 -07:00
Raphael
3104eeebc9 RS, DG; Photo websocket margins fixed 2010-08-10 16:40:25 -07:00
Raphael
a9ebe44b1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
maxwell
016c8fa471 MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up 2010-08-10 14:11:41 -07:00
maxwell
b5f962c725 trying root path in host meta 2010-08-10 13:58:17 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -07:00
Raphael
4308f35b4b Changed partial on request index 2010-08-10 10:18:16 -07:00
Raphael
d1bedeb993 RS, DG; don't show the group-specific nav if there is no group 2010-08-10 10:11:13 -07:00
danielvincent
4e062c143b new album partial has a title. album title is in italics in new photo partial 2010-08-09 21:29:19 -07:00
danielvincent
d207c8b955 fixed way too high z-index in album div 2010-08-09 21:27:17 -07:00
danielvincent
988eea4215 fixed comment view bug 2010-08-09 21:21:35 -07:00
danielvincent
96fa34ea60 changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error. 2010-08-09 21:10:11 -07:00
danielvincent
fd8d92a095 moved next/prev links in photo show to be inline with full size link. 2010-08-09 20:23:01 -07:00
danielvincent
d712218a14 removed commented out stuff on photo_new partial. also, fixed the delete button in photo show. 2010-08-09 20:18:20 -07:00
danielvincent
acd00c2a59 fixed top right buttons on album page, etc. also, made the image loader simpler. 2010-08-09 20:14:03 -07:00
Raphael
91b42ac0e2 Specs now mostly pass again, one is failing 2010-08-09 18:06:09 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top 
Conflicts:
	app/views/albums/show.html.haml
	app/views/authors/show.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
 2010-08-09 15:09:05 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -07:00
ilya
8e6dfe7166 DG IZ having an email key makes devise work, ring to deploy 2010-08-08 17:00:39 -07:00
danielvincent
a6f5603dc9 added email field to login screen. strange error won't let me log in? 2010-08-06 23:55:05 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c Merging ostatus deletion with selenium start 2010-08-04 16:01:19 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
09958bc207 DG MS; removed delete friend button from current user's show page 2010-08-04 15:43:24 -07:00
danielvincent
3d5f27fe5a javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing 2010-08-02 17:27:45 -07:00
danielvincent
102b912878 moved group nav to its own partial 2010-08-02 16:20:30 -07:00
danielvincent
3e5cecd532 Merge branch 'master' into group-top 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-08-02 16:09:13 -07:00
Raphael
d503c6541f RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
danielvincent
5974bf3571 group nav is now links to nothing 2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3 top nav for groups partially there. 2010-08-01 22:26:56 -07:00
Raphael
6fe00982f2 RS, IZ, fixing another error on person show 2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1 RS, IZ, fixing error on person show with no posts 2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed Websocketed photos now fade in 2010-07-30 10:20:50 -07:00
ilya
27bf29119d restoring display inline 2010-07-29 18:03:18 -07:00
ilya
085ea0a665 RS, IZ, DG Removing display inline 2010-07-29 17:59:44 -07:00
ilya
f6495e2bec RS IZ photos now fade in on the album upload page 2010-07-29 17:26:05 -07:00
Raphael
a636d97837 Removed crash if there was no latest status message 2010-07-29 14:38:46 -07:00
danielvincent
fd4475370d added profile url to author show page 2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
c8b40001e5 IZ album edit page was not added 2010-07-28 21:10:35 -07:00
ilya
96a9c9455d DG IZ; make photos in stream larger, because they need love too 2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -07:00
ilya
1700ce8e18 DG IZ; tweaks to album index page 2010-07-28 16:12:49 -07:00
ilya
3f27e1f67d DG IZ photo spacing now works 2010-07-28 14:48:28 -07:00
ilya
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
ilya
9e3c6a0936 DG IZ; brushed up ostatus user page 2010-07-28 12:13:36 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
a57727c1fc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 16:18:59 -07:00
maxwell
c41dea1e8b MS small profile tweaks 2010-07-27 16:18:46 -07:00
danielvincent
7992b1b0e0 delete photo button on photo show page instead of delete album. 2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b more recovery 2010-07-27 16:04:59 -07:00
maxwell
92cc48beaf Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 15:52:50 -07:00
maxwell
3cecbf1511 MS profile page fixes 2010-07-27 15:52:42 -07:00
danielvincent
34291340b2 trying to get back up to speed 2010-07-27 15:50:44 -07:00
maxwell
9dd5c08296 fixed two small UI bugs 2010-07-27 14:45:04 -07:00
maxwell
86e090bac3 MS figured out moz gradient business 2010-07-27 14:34:16 -07:00
maxwell
9c7b3f0c07 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 14:23:44 -07:00
maxwell
bdca2348a6 MS IZ profile page has more useful info, but ultimatly kinda ugly 2010-07-27 14:23:31 -07:00
danielvincent
d4ac19e9ce all form buttons are now using button definition in UI 2010-07-27 12:23:21 -07:00
danielvincent
dbc8f0112e some misc design cleanup. album page toggle pending. 2010-07-27 12:12:25 -07:00
danielvincent
97daaf81c2 made custom css3 buttons (pending FF compatability; works in webkit for now.) 2010-07-26 21:48:02 -07:00
maxwell
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
danielvincent
9afb8beb25 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 17:04:00 -07:00
danielvincent
ec59b89e83 DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page 2010-07-26 16:57:44 -07:00
maxwell
a9b1954ff6 MS status message now updates the big one on the index page...hooray for jquery 2010-07-26 16:27:10 -07:00
danielvincent
65acd48885 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 15:52:02 -07:00
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
maxwell
88c83bb028 MS added pagination to the author show page 2010-07-26 15:15:42 -07:00
maxwell
47f5c77e1a kinda prettied up the albums page 2010-07-26 15:09:02 -07:00
maxwell
d7550568ad added pagination to photo picker on the user profile. still ugly, less sucky 2010-07-26 13:55:44 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
maxwell
2cbdc5413f MS nuked some random non helpful puts statements 2010-07-24 12:12:48 -07:00
danielvincent
261a7d177d fixed for real 2010-07-24 11:09:25 -07:00
danielvincent
926eacc588 mend 2010-07-24 10:37:35 -07:00
danielvincent
03e06cb279 person sidebar has a view all; displays user images with names in tooltips instead of text 2010-07-24 10:24:43 -07:00
maxwell
c9709dd1e7 MS put current status back on page 2010-07-24 01:39:15 -07:00
maxwell
8a174d37c7 MS trying a dan-like thing in the publisher 2010-07-23 23:56:41 -07:00
danielvincent
4c3a51833f user name is bigger 2010-07-23 22:35:12 -07:00
danielvincent
4d2b11310b nudged layout 2010-07-23 21:34:47 -07:00
maxwell
302cf54fab MS subscribers should now unsubscribe 2010-07-23 21:31:28 -07:00
danielvincent
e5d298040d little things 2010-07-23 21:11:21 -07:00
danielvincent
f6fd6bc9e6 added breadcrumb to albums 2010-07-23 20:28:10 -07:00
danielvincent
7eb59a654c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 20:12:37 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
ilya
2fa9462e05 Next and Previous for photos buttions are now in the center 2010-07-23 20:09:52 -07:00
danielvincent
ad61c290fb took current user's name out of the layout 2010-07-23 19:44:34 -07:00
ilya
61a9ba7a6e put album owner on unless mine 2010-07-23 16:36:59 -07:00
ilya
48975cc59e put album owner on album show page 2010-07-23 16:33:10 -07:00
ilya
4eccf63fef Can't upload to other people's album 2010-07-23 16:26:05 -07:00
ilya
1c0d5f6e6b Removing destroy link from albums that are not yours 2010-07-23 16:07:15 -07:00
ilya
79aa12ee67 RS IZ Removing the destroy link from photos 2010-07-23 15:59:42 -07:00
maxwell
dfad30e33b MS typo 2010-07-22 22:34:30 -07:00
maxwell
3e3fcc57f9 MS author author? 2010-07-22 22:32:47 -07:00
maxwell
1f414c9347 MS so close to subscribing to tantek 2010-07-22 22:30:08 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
3f4219cf94 added debugging stuff to index page for ostatus stuffs 2010-07-22 20:19:52 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
maxwell
6f7f82e818 added helpers for photo show page 2010-07-21 15:47:30 -07:00
maxwell
a5f359ef1b MS DG added a safe for viewing photosize 2010-07-21 15:08:00 -07:00
maxwell
0f407b11ed MS DG comments now work on photo show page; full size photos now available 2010-07-21 14:58:06 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
danielvincent
d5c28eb9a6 album photos as links were too janky; removed 2010-07-21 00:42:41 -07:00
danielvincent
5fc2dfa0bb delete links removed from album index 2010-07-21 00:40:57 -07:00
danielvincent
aece0fc1c7 removed duplications used for testing 2010-07-21 00:32:38 -07:00
danielvincent
c01e9846cf began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere 2010-07-21 00:24:11 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
Raphael
afc150c719 Reverting reverrsion 2010-07-20 11:56:11 -07:00
Raphael
382caf7adc Reverting last commit 2010-07-20 11:53:13 -07:00
Raphael
7b6289c78a Took label out of publisher for photo 2010-07-20 11:52:38 -07:00
ilya
715a6ae770 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:50:45 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -07:00
maxwell
453d2ee827 RS MS fail. totally made a new bug and fixed it re: resizing 2010-07-20 11:50:23 -07:00
maxwell
e856945a94 RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page. 2010-07-20 11:41:50 -07:00
ilya
e08ed8805f DG IZ photo upload form now with all the others 2010-07-20 10:00:02 -07:00
danielvincent
55710ffbdb image uploader does two thumbnails 2010-07-17 21:10:21 -07:00
danielvincent
c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/post.rb
 2010-07-17 19:00:53 -07:00
danielvincent
79536dcfb7 all post partials now use object_path for links 2010-07-17 13:59:04 -07:00
danielvincent
b221e19746 every post partial shows a user picture. a post's comments are displayed with a count in its show page 2010-07-17 13:41:54 -07:00
maxwell
eb4153ec8f did a couple of things to the request page 2010-07-16 23:22:18 -07:00
danielvincent
180138610c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 23:02:31 -07:00
danielvincent
04eb66b2e6 user has a image url field for user picture 2010-07-16 23:02:24 -07:00
maxwell
f34e033bce MS IZ getting the profile 2010-07-16 21:59:40 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	Gemfile
 2010-07-16 21:33:57 -07:00
maxwell
36c911d20b IZ MS added diaspora rel to webfinger profile 2010-07-16 21:33:08 -07:00
danielvincent
5637ab2a8e added multipart option to new photo form. needed to remove remote true for now. 2010-07-16 21:14:42 -07:00
Raphael
93fdbae9c5 fixed small bug on user show page, added header text to user edit page 2010-07-16 17:27:57 -07:00
Raphael
bb4d5cad59 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 17:26:22 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
maxwell
98bc754627 trying to get it reporting from diaspora 2010-07-16 14:54:14 -07:00
maxwell
86718dbec3 trying to get it reporting from diaspora 2010-07-16 14:53:07 -07:00
maxwell
642db5006f trying to get it reporting from diaspora 2010-07-16 14:49:44 -07:00
maxwell
03a8f2ea5c trying to get it reporting from diaspora 2010-07-16 14:36:50 -07:00
maxwell
3d87c111df webfinger is now not washington specific 2010-07-16 14:15:19 -07:00
maxwell
7e190047ec IZ MS host 2010-07-16 11:14:26 -07:00
maxwell
4259dc7dfe IZ MS changing end slash 2010-07-16 11:10:38 -07:00
maxwell
172141db0a IZ MS setting alias to not idendica 2010-07-16 11:07:17 -07:00
maxwell
081a6a2c73 MS IZ trying to delete commented stuff 2010-07-16 10:39:02 -07:00
maxwell
bf3d34090e MS IZ = AHHH 2010-07-15 19:08:25 -07:00
maxwell
9ff4cd015d MS IZ = AHHH 2010-07-15 19:05:59 -07:00
maxwell
f927ace140 MS IZ = AHHH 2010-07-15 19:01:14 -07:00
maxwell
8f59a9d788 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 18:42:44 -07:00
maxwell
b903163d3f MS IZ = AHHH 2010-07-15 18:42:25 -07:00
Raphael
cae5700222 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 18:41:01 -07:00
Raphael
501620e9fb DG RS; fixed some visual bugs. request link now turns red on new request 2010-07-15 18:40:55 -07:00
maxwell
65deaba558 MS IZ hcard, emptyfiles, routesw 2010-07-15 18:36:07 -07:00
maxwell
45abeb2346 MS IZ small webfinger bug fixes 2010-07-15 17:11:20 -07:00
maxwell
6bab2fedc8 MS IZ small webfinger bug fixes 2010-07-15 17:06:48 -07:00
maxwell
2dc6b5f46a MS IZ small webfinger bug fixes 2010-07-15 17:02:36 -07:00
maxwell
d393458ae8 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 16:55:09 -07:00
maxwell
cc712196a6 MS IZ small webfinger bug fixes 2010-07-15 16:54:46 -07:00
Raphael
7fb7c519cc Adding active to friend view 2010-07-15 16:30:56 -07:00
maxwell
720550189d MS more cleanup 2010-07-15 10:59:36 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
maxwell
902a8cb349 MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change 2010-07-10 10:34:46 -07:00
maxwell
d37461a432 ms dg post deletions now come thru the socket again 2010-07-09 19:27:39 -07:00
danielvincent
7bfdaac691 added unfriend button to person show page 2010-07-09 18:54:48 -07:00
danielvincent
aa916d0604 moved User.first out of the application view 2010-07-09 18:50:39 -07:00
maxwell
48adc9ebc1 DG MS; person object now properly stored with request object save 2010-07-09 14:07:35 -07:00
maxwell
b49f198c4f DG MS cleaned up some of the request stuff 2010-07-09 11:14:00 -07:00
maxwell
408b58cbbf Merge branch 'safe-without-gpg' 2010-07-08 21:45:27 -07:00
maxwell
6cc9deaa65 merging with head 2010-07-08 21:44:14 -07:00
maxwell
583d3d0c82 DG MS friending now tests out 2010-07-08 21:34:38 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
ilya
122bbf0cd2 Merging dashboards 2010-07-08 20:56:25 -04:00
ilya
a5db2cd231 Added keyrings to gitignore, symlinked to shared dir in cap scripts 2010-07-08 20:54:20 -04:00
maxwell
900f1080a2 DG MS; fixed destroy links for status messages, added link for requests on top nav 2010-07-08 14:38:26 -07:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
1fa2dfd6eb DG MS cleaning up friend request 2010-07-08 12:05:06 -07:00
maxwell
89959bdcb8 MS dont make person request remote for now 2010-07-08 10:42:42 -07:00
maxwell
d04093f456 Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-08 10:18:03 -07:00
ilya
3ff32e4905 DG IZ; removed views and controller associated with friend object 2010-07-08 12:38:14 -04:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7 RS MS added url for for the socket controller 2010-07-07 18:59:32 -07:00
danielvincent
a33acd134e DG IZ; fixed person requesting (friend requests). 2010-07-07 18:10:47 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
ilya
a23a2691f3 DG IZ; starting fresh with requests 2010-07-06 20:09:20 -04:00
ilya
f71b5b51d1 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-06 19:33:00 -04:00
ilya
14e5b23eb5 trying deploying 2010-07-06 19:32:44 -04:00
Raphael
bb325cbf6b cleaned up a little 2010-07-06 12:41:28 -07:00
Raphael
7bdf52e173 comment numbers update uncleanly 2010-07-06 12:38:24 -07:00
ilya
3974b01b29 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-06 14:49:08 -04:00
ilya
9cddf26a53 DG IZ fixed views for friend request 2010-07-06 14:48:44 -04:00
Raphael
e971c71451 refactor websocket receive insert javascript 2010-07-06 11:40:19 -07:00
ilya
0587688d18 DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler 2010-07-06 02:15:49 -04:00
danielvincent
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
0001797850 moved user's name to the right of their picture 2010-07-03 23:39:05 -07:00
danielvincent
85cee4064b Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	public/javascripts/publisher.js
 2010-07-03 22:45:56 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
Raphael
fffd3aebfc Added remote is true to stream partials, no more redirecting 2010-07-02 15:36:07 -07:00
danielvincent
df3fe6c2a9 DG IZ RS; deletion now gets sent through the websocket 2010-07-02 15:16:28 -07:00
Raphael
737614e04b google analytics for real 2010-07-01 22:20:57 -07:00
Raphael
418635aa72 Added google to session wall layout 2010-07-01 22:13:55 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
danielvincent
4f7579a5db DG MS; fixed delete button bug on stream 2010-07-01 19:49:56 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
maxwell
8d1ec57fa4 beefed it up to ie 7 2010-07-01 17:07:36 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
maxwell
b0a3feb30c fixed g analytics 2010-07-01 15:51:17 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -07:00
danielvincent
99d12964b6 to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga 2010-07-01 10:55:22 -07:00
ilya
5285753486 IZ warzombie route, the method is in the dsashboard controller 2010-07-01 13:28:17 -04:00
maxwell
428284abeb sorry about that, removed tiny mce, but we still had things which inited it 2010-07-01 09:15:27 -07:00
maxwell
cb23766012 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 09:03:04 -07:00
maxwell
01132e3dc0 pushing js changes 2010-07-01 09:02:38 -07:00
Raphael
27d29d5d40 RS; I should have figured this one out way earlier... 2010-07-01 01:22:37 -07:00
maxwell
da59078b64 fixed small js bug so it only adds to the base route (or page 1 on pagination) 2010-06-30 17:49:45 -07:00
maxwell
9631977597 RS MS comments propagate, and show up IN REAL TIME 2010-06-30 17:29:32 -07:00
Raphael
3d976ca47e RS, a little bit of autolinking in statuses and comments 2010-06-30 08:36:51 -07:00
maxwell
6bc68fb42e Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-30 00:27:30 -07:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
danielvincent
a15cd932b6 nevermind, nevermind 2010-06-29 23:47:39 -07:00
danielvincent
cf8c669e83 login screen now black. 2010-06-29 23:24:31 -07:00
danielvincent
e159b8f7f4 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/friends/show.html.haml
 2010-06-29 20:56:44 -07:00
danielvincent
19c41fb6be DG IZ; comments show and hide 2010-06-29 20:53:49 -07:00
maxwell
448fcf8f89 MS RS fixed real name, now profiles are created with a new friend 2010-06-29 20:33:55 -07:00
danielvincent
984f5f62b6 DG IZ; publisher reflects what type is selected 2010-06-29 19:55:50 -07:00
danielvincent
97cd3fb413 DG IZ; comment count in status message partial 2010-06-29 19:08:23 -07:00
danielvincent
8ff241cdde DG IZ; all comments hidden by default. linking anchor issue. 2010-06-29 19:00:54 -07:00
danielvincent
7d6783e446 DG IZ; more little changes to UI 2010-06-29 18:00:01 -07:00
danielvincent
0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2 DG IZ; cool labels fade in 2010-06-29 17:27:09 -07:00
maxwell
7961d11669 uncommenting get satisfaction 2010-06-29 17:09:07 -07:00
maxwell
eebed9d457 fixed publisher in chrome and broke it out to a seperate js file 2010-06-29 17:04:46 -07:00
danielvincent
39a1874ce3 DG IZ; all input fields are now textareas on dashboard page 2010-06-29 16:28:12 -07:00
maxwell
a0a0b9d0ad fixed stream bull 2010-06-29 15:05:09 -07:00
maxwell
ee9acc5c82 thanks to dan, GS works great now MS RS 2010-06-29 15:00:30 -07:00
danielvincent
67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
 2010-06-29 14:36:46 -07:00
danielvincent
5193a20458 DG IZ; getting there. 2010-06-29 14:34:33 -07:00
maxwell
6532962c1c trying to get google analytics working 2010-06-29 13:58:36 -07:00
maxwell
60336bd520 trying to get GS working 2010-06-29 13:45:54 -07:00
maxwell
f9d4eff7b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-29 12:32:07 -07:00
danielvincent
260805af64 DG IZ; publisher box & profile picture placeholder 2010-06-29 12:25:36 -07:00
maxwell
a683a2c1aa RS MS added goog analytics 2010-06-29 11:45:41 -07:00
danielvincent
01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	public/stylesheets/sass/application.sass
 2010-06-28 22:18:47 -07:00
danielvincent
08d6a46bd8 login page 2010-06-28 22:18:05 -07:00
maxwell
45a9d9e342 moved the silly destory link over a bit 2010-06-28 22:15:52 -07:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
ilya
775aab996a DG IZ picture in the profile 2010-06-28 23:39:55 -04:00
ilya
0fa11806ba Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 21:32:18 -04:00
ilya
b5b9c647d7 DG IZ Created the profile model & friend view now shows the information 2010-06-28 21:32:09 -04:00
maxwell
36b5a90d34 MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works 2010-06-28 17:35:38 -07:00
maxwell
f4a8671854 fixed the remote socket updating bug? we will see 2010-06-28 16:15:30 -07:00
maxwell
b6c6316886 trying to fix status message bug 2010-06-28 15:03:45 -07:00
maxwell
d9a6bb7ba2 merged my socket changes 2010-06-28 14:52:43 -07:00
maxwell
5cf2e3c3ea commiting so i can pull 2010-06-28 14:47:23 -07:00
ilya
44b25e3eaa DG IZ; fixed javascript bug. stream fades in recents again. 2010-06-28 17:02:26 -04:00
danielvincent
762cbcb0f2 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/comments/_comment.html.haml
	app/views/layouts/application.html.haml
 2010-06-28 12:09:35 -07:00
ilya
a540f09109 RS, IZ; Added ids to views 2010-06-28 14:46:43 -04:00
maxwell
60091012bf on client connect, websockets now tell the server where the user is. nothing more 2010-06-28 01:12:21 -07:00
danielvincent
462bd96189 ui fixup 2010-06-27 16:17:42 -07:00
danielvincent
5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/status_messages/_status_message.html.haml
 2010-06-27 10:32:23 -07:00
maxwell
b017f1b0f9 forgot to add partial file to git...sorry 2010-06-26 23:43:30 -07:00
Maxwell Salzberg
b804bdc220 forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts 2010-06-26 15:40:33 -07:00
danielvincent
39e85754d8 nav should be collapsed into a filter list. comments are more clear. 2010-06-26 00:07:21 -07:00
maxwell
a6c33b3e7b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-25 22:15:49 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00
ilya
a7f6eaefdf no friends panel on page 2010-06-26 00:47:21 -04:00
ilya
d9ffb0d07d RS IZ No Friends list before signin 2010-06-25 23:53:04 -04:00
ilya
f5ecfebcb9 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-25 23:23:44 -04:00
ilya
d4f528bba8 Removed bookmark new page, moved form to index 2010-06-25 23:23:37 -04:00
maxwell
faa5d21636 Change the form_for not to need a message passed, and adding it to the home page 2010-06-25 19:58:40 -07:00
maxwell
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
ilya
2557271dcc removed users link 2010-06-25 21:57:18 -04:00
maxwell
884af9a3b6 added debug partial 2010-06-25 15:35:40 -07:00
maxwell
5cade230ac added silly debug toggle 2010-06-25 15:33:23 -07:00
maxwell
e558d4833f DG MS fixing tests 2010-06-24 20:45:49 -07:00
maxwell
fb7ed9e0e7 DG MS pushing a small show page fix 2010-06-23 15:25:46 -07:00
maxwell
9fa26f020e DG MS; clicking on a person's name redirects to that person's post stream 2010-06-23 14:32:51 -07:00
maxwell
671772f901 MS DG added tinyMCE, now a blog is better than a status messsage 2010-06-23 11:58:46 -07:00
maxwell
fba4ce9e3b DG MS; fixed flash message visual bug 2010-06-23 11:11:58 -07:00
maxwell
663b99924f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
Maxwell Salzberg
523cb6f15f DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time 2010-06-22 23:27:31 -07:00
Maxwell Salzberg
9a44578c37 DG; Person is now the parent of Friend and User 2010-06-22 23:11:55 -07:00
maxwell
fd5d7c63ad messy application.haml file i know, but now the sockets only update pages which want their data 2010-06-22 18:59:11 -07:00
maxwell
94de043862 fixed not hardcoded port for websockets 2010-06-22 17:20:07 -07:00
maxwell
aa7a2da3d1 put debug back into websocket 2010-06-22 16:23:15 -07:00
maxwell
cc89cd5cda reload object before send to websocket 2010-06-22 16:12:15 -07:00
maxwell
989949a8c9 added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y 2010-06-22 15:14:55 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
3a8394bd59 Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse 2010-06-21 19:24:07 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
danielvincent
1233c60f6f DG IZ; user's real name displayed on top of every page 2010-06-21 16:09:48 -07:00
maxwell
a0417d13af fixed merge with master 2010-06-21 14:38:38 -07:00
danielvincent
06271d5821 added dumb partial switcher function in dashboard controller 2010-06-21 14:23:59 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
3581f7a7d6 merged in socket 2010-06-20 22:13:24 -07:00
danielvincent
26d675af11 some sass cleanup 2010-06-20 18:36:01 -07:00
danielvincent
c542c08e38 simpler 2010-06-20 17:06:10 -07:00
danielvincent
6647ce34ab status message and bookmark page 2010-06-20 14:52:04 -07:00
danielvincent
aee5f7f04f took out filler elements 2010-06-20 11:49:05 -07:00
danielvincent
df2b9d6ad4 more shuffling 2010-06-19 14:44:08 -07:00
maxwell
2f6a11f018 fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit 2010-06-19 14:42:23 -07:00
danielvincent
0c392a0cce moved nav to bottom header 2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45 shrink that header 2010-06-19 00:53:42 -07:00
maxwell
8019fc8d31 working websocket 2010-06-19 00:09:58 -07:00
danielvincent
1223011a4f more semi-drastic changes. 2010-06-19 00:01:25 -07:00
danielvincent
de8d8d5cb5 in the shit 2010-06-18 23:32:47 -07:00
maxwell
d4bf2f539d DG MS; removed signup link and route 2010-06-18 10:48:37 -07:00
danielvincent
da9f33aa72 fixed post stream to ascend by time 2010-06-16 17:35:39 -07:00
danielvincent
c63eac0fd9 added line delimiters for post stream on dashboard 2010-06-15 22:34:08 -07:00
maxwell
9e89b2e0a7 DG MS did some basic work on the dashboard controller and some super basic fallback partial view 2010-06-15 21:08:29 -07:00
maxwell
e6f3fc1d38 DG MS more test cleanup and removed a deprecation warning 2010-06-15 17:38:12 -07:00
danielvincent
45c926f790 DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs 2010-06-15 11:09:47 -07:00
danielvincent
99d9e50ed6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-15 10:12:14 -07:00
danielvincent
d70cf5b7a7 DG RS; fixed newest messages bug in view. moved to helper. 2010-06-15 10:11:28 -07:00
maxwell
408c2c719d swaped out js for jquery 2010-06-15 09:53:19 -07:00
maxwell
1a1887f77f DG MS completed bookmark story 2010-06-14 20:20:19 -07:00
maxwell
58dfefc3ca added home to nav bar 2010-06-14 18:50:38 -07:00
maxwell
3c3c194ed5 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-14 17:48:50 -07:00
maxwell
3eef53892c DG MS; Dashboard shows the user's most recent update 2010-06-14 17:48:21 -07:00
ilya
08e64450f3 IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version 2010-06-14 20:34:03 -04:00
maxwell
4532c39e93 DG MS; Status messages have owner field; defaults to user 2010-06-14 17:13:07 -07:00
maxwell
db44081186 MS IZ DG completed friends should be displayed on dashboard 2010-06-14 13:17:20 -07:00
maxwell
960db53b9b MS IZ DG completed crud for friend 2010-06-14 13:12:17 -07:00
danielvincent
63f5fe15d6 nav includes users and status messages 2010-06-14 11:55:52 -07:00
danielvincent
4584f1309e Merge branch 'blueprint' 2010-06-14 11:51:56 -07:00
danielvincent
98abb75097 added blueprint 2010-06-14 11:50:17 -07:00
maxwell
0ff541ba43 fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS 2010-06-14 11:05:55 -07:00
maxwell
29c6f9fa0f DG, MS, IZ; status messages now functional 2010-06-13 22:11:16 -07:00
maxwell
85e6eb2132 added stray local files 2010-06-13 21:22:52 -07:00
maxwell
28ba205ef3 blerg rspec cache sux 2010-06-13 21:08:17 -07:00
maxwell
865d7d18cb user login now drops to a dashboard page 2010-06-13 20:00:31 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00