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

814 commits

Author SHA1 Message Date
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
danielvincent
a42a773d3d dim service icons when not public. remove 'make public' label, now checkbox title. 2010-12-18 20:00:13 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -08:00
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
c749d81fe9 putting a link to notifications, make them unread in the controller when you view the index 2010-12-17 17:06:48 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
Dan Hansen
390587777f more vendor prefix fixes 2010-12-13 01:21:54 -05:00
Dan Hansen
7c7254bf64 Vendor prefix police 2010-12-13 01:08:03 -05:00
Dan Hansen
6353f5f035 in firefox if you clicked the A with your handle and didnt hover over it it'd turn black because of screen.css:39 2010-12-12 01:49:13 -05:00
Dan Hansen
8b1c8d6a1b moz vendor prefix typo fix for .circle 2010-12-12 01:33:38 -05:00
Dan Hansen
c843b508c9 add vendor prefixes for the border radius on #new_request_pane 2010-12-12 01:29:05 -05:00
Dan Hansen
be9a7edf4d vendor prefixes for border radius on #new_request_pane 2010-12-12 01:17:20 -05:00
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
Dan Hansen
3b5ee72ed8 added that in the wrong place 2010-12-12 00:09:15 -05:00
Dan Hansen
20e2c2ed25 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-12 00:06:10 -05:00
Dan Hansen
aa40af24c9 fix http://bit.ly/fQLxaK ugliness 2010-12-12 00:05:55 -05:00
danielvincent
b4170dc991 badges on stream elements. say 'all aspects' instead of listing out all user's aspect names 2010-12-11 20:28:40 -08:00
maxwell
91c331d630 fix to limit size of request box 2010-12-11 16:28:37 -08:00
danielvincent
fd2cbc1cf4 added invite link to search page 2010-12-10 18:28:51 -08:00
danielvincent
2c5d5d9328 show already invited users on invitation#new 2010-12-10 18:05:08 -08:00
danielvincent
8de5c5babd fixing request bar on aspects#manage 2010-12-10 10:12:30 -08:00
danielvincent
624cb45ee2 fixed aspect nav FF bug 2010-12-09 20:09:21 -08:00
danielvincent
eaeb55f65b make aspect tabs look less cluttered 2010-12-09 19:04:03 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
danielvincent
fa9caf00ca added tooltip text to public icon 2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d highlight public posts in the stream 2010-12-08 18:59:02 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
Sarah Mei
9da69a4b01 Mobile log in form is usable. Also, added mixins for sass. 2010-12-04 20:45:52 -08:00
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -08:00
Sarah Mei
c3736729c9 removing mobile.css from git 2010-12-04 19:16:14 -08:00
danielvincent
c68ebc1d14 removed comic sans from the entire codebase. marker felt remains on os x. 2010-12-04 00:29:15 -08:00
danielvincent
47b6d66b83 fixed proportions in stream, etc. 2010-12-03 23:38:29 -08:00
danielvincent
5da5ee26bb two column aspect listing on manage page. made avatars smaller. 2010-12-03 16:22:20 -08:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
30668bf2e6 visual touchups 2010-12-02 23:19:30 -08:00
maxwell
9bd77916a8 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/sass/application.sass
 2010-12-02 19:18:21 -08:00
maxwell
9ad9e205a5 upping zindex on photo button 2010-12-02 19:17:26 -08:00
maxwell
8aaedb4240 upping zindex on photo button 2010-12-02 19:02:33 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
danielvincent
6c05d01177 enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index. 2010-12-02 17:36:46 -08:00
danielvincent
ee47a2ffda fixed diaspora logo asset on landing page 2010-12-01 16:18:13 -08:00
danielvincent
d392239355 removed brandongrotesque from repo, logos are now assets. 2010-12-01 11:45:54 -08:00
maxwell
96776f93f9 we need this for socketing... sorry 2010-11-29 16:19:36 -08:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
danielvincent
d65ba2f291 removing contact pictures from contact list re aspects#show 2010-11-27 17:25:40 -05:00
Alexandre DE DOMMELIN
b0a123b270 Fix hidden fields issue in Iceweasel 2010-11-26 23:23:32 +01:00
Hexagon
f87ac4cb0b Adjusting YT-video size for posts 2010-11-26 17:28:08 +01:00
Hexagon
bd204c554e Fixing errors in application.sass 2010-11-26 16:20:12 +01:00
Hexagon
a520b371e1 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix 2010-11-26 16:18:41 +01:00
Dan Hansen
37c2e52be9 Fixed styling for a video in a comment 2010-11-25 20:53:05 -08:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
Dan Hansen
21fa3fff8c Styling for the youtube iframe 2010-11-25 19:54:09 -08:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Raphael
eeac6901b9 Revert "Change invite button text" 
This reverts commit d443b15c97.
 2010-11-24 21:01:48 -05:00
Raphael
d443b15c97 Change invite button text 2010-11-24 16:48:24 -05:00
danielvincent
6a6661d42b prevent text overflow in stream 2010-11-23 15:58:23 -08:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
danielvincent
9d98afb94f took out fade on photos#index, because it only displayed all photos half the time. 2010-11-23 09:44:58 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
danielvincent
376d403651 made publisher semi-hidden on home page 2010-11-23 00:34:28 -08:00
danielvincent
f725641eaf added shadow on diaspora text on landing page. 2010-11-22 20:53:20 -08:00
danielvincent
69cac02ade landing page fix 2010-11-22 20:35:30 -08:00
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -08:00
danielvincent
26a11f7ab6 firefox bugfix on photo#show 2010-11-22 14:52:13 -08:00
danielvincent
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -08:00
danielvincent
c7ac90538a added some spacing between photos and text on stream 2010-11-22 01:57:51 -08:00
maxwell
cdbd9df15e Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 01:50:23 -08:00
maxwell
ae2b3d75c2 added some copy to the landing page, and some basic styling 2010-11-22 01:50:15 -08:00
danielvincent
cb837f5fd7 moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading. 2010-11-22 01:24:04 -08:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
maxwell
f0b9f0f406 making width of checkbox smaller 2010-11-21 23:48:36 -08:00
maxwell
3a99ec3f8c uploader now shows current file uploading, and progress 2010-11-21 23:44:20 -08:00
maxwell
ce1768d0d3 fixing dropdown, and removing margin on publisher 2010-11-21 22:58:01 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
danielvincent
069b372c19 photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http. 2010-11-21 16:30:47 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
4742f61925 made the rss button a link to the feed, and aligned correctly 2010-11-21 16:13:03 -08:00
danielvincent
a9a91c436a user menu is a button. fixed remove aspect button on aspect#show 2010-11-21 16:13:03 -08:00
maxwell
16141bf1ff removed ... from user name, spread out menu, added a hover state to dropdown elements 2010-11-21 16:13:02 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
0b13168ba2 remove zindex on photo uploader so the dropdown menu is above it 2010-11-21 16:13:02 -08:00
maxwell
f4445a1a0d removed ... from user name, spread out menu, added a hover state to dropdown elements 2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts. 2010-11-21 16:13:02 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812 MS DG form now works reasonably well. still need to limit number of photos 2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e added photos to status messages 2010-11-21 16:13:00 -08:00
danielvincent
f6491816a3 adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing. 2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
danielvincent
52cde14221 more touchups 2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5 adjusting more page structure. drafting about there. 2010-11-21 16:10:54 -08:00
danielvincent
7a259d6d53 drafted a basic structure 2010-11-21 16:09:27 -08:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
zhitomirskiyi
9a31d15c92 added icons for the connected services and to indicate the rss feed 2010-11-18 12:19:58 -08:00
danielvincent
9041a81fea cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing 2010-11-17 21:21:00 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093 firefox fixes and added links to press articles on landing page 2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
maxwell
f55509085a upgraded jquery, and deleted a second version of both jqueries 2010-11-16 21:41:20 -08:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
3b303e1cf2 adding fancybox assets back 2010-11-11 19:42:11 -08:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
maxwell
f7cc01ceb2 more work done. much more to go 2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
maxwell
bc0263f16e added white background for search box, so at least it shows up in opera. thx Pistos 2010-11-09 12:14:46 -08:00
maxwell
7ca6677b33 making publisher submit button have a higher zindex 2010-11-08 10:18:00 -08:00
danielvincent
58ce81f674 Add a person to aspect contains a searchable list as opposed to a dropdown. 2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif 2010-11-07 11:07:37 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e Post a message to aspect dialog will only display if people are present. 2010-11-05 21:14:00 -07:00
danielvincent
9a055b6cba Photo partial now has a description and a link to view all photos by that person. 2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -07:00
Raphael
aac9080299 smells like... greenery 2010-11-04 19:45:23 -07:00
Raphael
abebd18c98 Move getting_started self link color to a css class 2010-11-04 19:29:15 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
danielvincent
3cdb48232a all box-shadows in views rendering in gecko 2010-10-31 17:29:23 -07:00
danielvincent
f2b7e4010e edit profile link on owner's profile page. 2010-10-29 15:02:56 -07:00
danielvincent
79ec02c6ad photo uploader on edit profile page. 2010-10-29 14:11:59 -07:00
danielvincent
51dd6d32b3 upload a photo button next to publisher 2010-10-29 10:38:53 -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
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
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
danielvincent
039bf374d8 soft shadow on header 2010-10-26 23:38:12 -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
ea46fa8fd8 save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -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
danielvincent
a9451d19b9 another publisher fix (broke aspect#show pages with last fix). changed flash message colors/opacity. 2010-10-24 18:16:38 -07:00
danielvincent
26cada5866 ff 3.6 publisher fix. 2010-10-24 18:01:38 -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
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
ed4c253ea8 show pages now identify content with content creator. publisher now takes a local 2010-10-22 15:32:41 -07:00
Raphael
645685a8fb Make flash notice CSS less deadly 2010-10-21 23:18:53 -07:00
danielvincent
06e2b43516 252,252,252 rgb for body background. you won't even notice. 2010-10-20 23:46:24 -07:00
danielvincent
8e175be2ba fixed comments not showing up through websocket on photo show page 2010-10-20 23:40:48 -07:00
danielvincent
e880a5a11f comment submit buttons show again. further changes to show pages. 2010-10-20 18:15: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
danielvincent
e9fc086089 users name doesn't overflow in user menu 2010-10-20 14:45:01 -07:00
danielvincent
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
danielvincent
98a8fbcfb6 request badge text color fix 2010-10-20 10:37:00 -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
danielvincent
f6303b8fff reshare dropdown looks nicer. fixed user menu to drop down on click 2010-10-19 16:16:46 -07:00
danielvincent
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -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
danielvincent
d18757b5c1 pushed stream up 2010-10-18 11:00:52 -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
060767e794 comments submit on enter. design touchup 2010-10-17 19:36:43 -07:00
danielvincent
5ca3570667 added prefetch rels to prev/next links in photo show. fixed shadow bug in header 2010-10-16 02:06:46 -07:00
danielvincent
7611bc1c8f user dropdown 2010-10-15 17:37:32 -07:00
danielvincent
47be7b1f0a correct html5 search box 2010-10-15 15:29:57 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
Raphael
51c5b73256 Merge branch 'empty-page' 
Conflicts:
	public/stylesheets/application.css
 2010-10-14 17:00:19 -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
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
Raphael
1ab34ab07a Removing generated CSS from git 2010-10-14 14:05:51 -07:00
Raphael
be8cacdc79 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-14 13:15:38 -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
Shawn McGuire
eaef6bdf04 Issue #272 Fixed color contrast 2010-10-13 11:12:27 -05:00
Raphael
3b82001a42 Step down font size 1px in info 2010-10-12 18:19:31 -07:00
Raphael
900a085124 Merging in bigbash's fixes 2010-10-12 15:09:32 -07:00
Shawn McGuire
b548520591 Changed div.info color and font size to be larger and darker 
Issue #285
 2010-10-12 16:42:03 -05:00
danielvincent
884d7b7dd7 flash message should slide in 2010-10-10 23:13:03 -07:00
danielvincent
b313272ff3 flash messages look nicer 2010-10-09 22:32:39 -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
danielvincent
edd8f0ba6d links now have active state 2010-10-08 15:35:22 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07: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
894d6654b2 only selected nav element should be a tab on aspect_nav, preventing tab overload. 2010-10-07 23:35:55 -07:00
danielvincent
8f741795fb aspect manage margin fix 2010-10-07 23:27:31 -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
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Alec Leamas
e9252e8aec After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png 2010-10-07 14:59:13 +02:00
Alec Leamas
a9806ddad0 Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc. 2010-10-06 04:59:46 +08:00
danielvincent
e145cbab5b tar the app's source and throw it in the public folder on server boot. 2010-09-29 17:42:56 -04:00
danielvincent
fa8cc5b876 moz box shadow does not like negative blur 2010-09-28 23:24:04 -04: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
0a34c24f22 tag fix 2010-09-28 11:51:52 -07:00
danielvincent
577b5545bf comment blocks slide 2010-09-28 11:50:13 -07:00
danielvincent
b068eaf15c limit content width to 600px 2010-09-28 10:48:45 -07:00
danielvincent
241ea4559a gradients on aspect tags on status messages 2010-09-28 10:41:38 -07:00
danielvincent
263615ad14 all status messages have labels 2010-09-27 23:51:20 -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
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
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
Raphael
264555e63b Update css 2010-09-23 15:15:19 -07:00
Raphael
c6c361b5e6 Add lucida sans, thanks danieleds 2010-09-23 15:14:44 -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
b019ade588 minor changes from production 2010-09-20 21:50:06 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
danielvincent
5a9b0fbd03 tabs rounded 2010-09-19 22:16:58 -07: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
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
danielvincent
292a38e694 DG IZ; arrow keys work in fancybox. removed background color change on close button on hover 2010-09-16 18:55:54 -07:00
danielvincent
755e2a744c DG IZ; dropzones now light up when dragging on aspect page 2010-09-16 17:30:49 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Daniel Vincent Grippi
c1414c5207 flash messages are now colored on session wall 2010-09-15 16:59:44 -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
ac7fb673c5 show add new friend links on aspect manage page 2010-09-15 11:25:39 -07:00
Raphael
89ac38f630 Sass licenses changed 2010-09-15 11:00:55 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
Daniel Vincent Grippi
1d04c89b48 header tweak 2010-09-15 00:39:48 -07:00
Daniel Vincent Grippi
8a59f3b26e aspect manage less rounded 2010-09-14 20:42:08 -07:00
Daniel Vincent Grippi
c763a663ac z-index fix 2010-09-14 20:37:31 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -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
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -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
Daniel Vincent Grippi
3be86c2b5c fixed tab bug in ff 2010-09-13 11:51:25 -07:00
Daniel Vincent Grippi
200b0045f7 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:22:05 -07:00
Daniel Vincent Grippi
8c80174e73 removed some unneeded sass 2010-09-13 11:16:59 -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
Daniel Vincent Grippi
f5565025cb removed glyphish icons 2010-09-13 10:44:20 -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
Daniel Vincent Grippi
ede03fe1d5 added graident back into firefox 2010-09-13 10:23:24 -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
1874ebe51d forgot to map to group ids in retraction 2010-09-12 21:33:39 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -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
7fefdd3753 minor cleanup 2010-09-11 08:59:25 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
95765139d6 link color less morbid. 2010-09-10 23:37:16 -07:00
Daniel Vincent Grippi
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -07:00
Daniel Vincent Grippi
d3a8e27833 DG IZ; selector fix 2010-09-10 15:37:59 -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
a15bf73287 minor textbox css fix 2010-09-08 23:35:07 -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
3cf7938028 MS fixing pagination numbers and couple of other things 2010-09-08 20:51:46 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00
maxwell
2a9e988b1f MS fixing the zindex on the search 2010-09-08 20:03:01 -07:00
Daniel Vincent Grippi
e6114e76f5 MS DG more tweaking 2010-09-08 19:39:24 -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
36730978ca login page is more elegant 2010-09-08 11:37:54 -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
Daniel Vincent Grippi
2daa31b7bf added a line to the bottom of the publisher 2010-09-06 17:28:09 -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
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
Daniel Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
danielvincent
a886b8ddbc made photos for album previews 200x200, small thumbnails now at 50x50 2010-08-26 15:13:33 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -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
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
501f98b9e1 fixed comments from not showing. also, touched them up a bit. 2010-08-24 20:13:37 -07:00
Raphael
d3c10f8777 made left column in layout a little wider 2010-08-24 19:02:00 -07:00
Raphael
5779610659 messed with the views 2010-08-24 18:31:16 -07:00
Raphael
3f5df61810 minor tab tweaks 2010-08-24 16:38:42 -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
de335e7366 MS messed with the temporary group picker thing: whatever, it is less annoying 2010-08-24 14:37:47 -07:00
danielvincent
c3cf135a3f tabs on top 2010-08-24 11:33:20 -07:00
danielvincent
86146d195f moving stuff around to the header 2010-08-24 11:07:39 -07:00
danielvincent
a8803a1c0b fixed flash messages 2010-08-23 17:40:59 -07:00
danielvincent
2b125fdc66 fixed left friends bar a bit 2010-08-23 17:00:40 -07:00
danielvincent
1f59d2ccc4 minor ui tweaks 2010-08-23 15:55:19 -07:00
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -07:00
danielvincent
41b3117a41 removed that annoying rollover on diaspora text 2010-08-23 15:13:27 -07:00
danielvincent
4e996f8412 user name darker 2010-08-23 14:30:20 -07:00
danielvincent
d874ba3b38 dropdown menu for user 2010-08-23 14:17:05 -07:00
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -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
ilya
f5811df5b7 DG IZ; added info text to add new friend button 2010-08-18 11:59:20 -07:00
ilya
6c729b382f fixed some color on the header 2010-08-17 21:50:18 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -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
d207c8b955 fixed way too high z-index in album div 2010-08-09 21:27:17 -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
acd00c2a59 fixed top right buttons on album page, etc. also, made the image loader simpler. 2010-08-09 20:14:03 -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
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
b74438a5dc Made comments a little easier to see, especially on photo show page 2010-08-04 18:12:12 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
danielvincent
7afe8e12a0 DG MS; correctly aligned publisher box submit button 2010-08-04 15:39:19 -07:00
danielvincent
f3bc651359 stuff fades 2010-08-02 19:16:01 -07:00
danielvincent
5030fbb8b5 Merge branch 'master' into group-top 2010-08-02 17:28:17 -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
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -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
8658276385 Post button back, but needs moving, did latest_message css change in sass 2010-08-02 11:21:48 -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
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -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
b5b8e29d6a DG IZ album view page brush up 2010-07-28 15:33:27 -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
maxwell
75fd69bc67 MS; pushing weirdy buble thing 2010-07-28 11:14:27 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
ef0a2c465d fixed photo show comment picture bug 2010-07-28 10:06:20 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
danielvincent
d710ff6f4a shadows on album titles on album/index 2010-07-27 23:08: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
e6d2f51675 more visual recovery 2010-07-27 16:08:28 -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
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
9b0206df1b forgot to add ui stylesheet 2010-07-27 12:36:05 -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
danielvincent
261a7d177d fixed for real 2010-07-24 11:09:25 -07:00
danielvincent
9ad8e80982 fixed now? 2010-07-24 11:00:35 -07:00
danielvincent
1a51d99ad7 fixed sidebar? 2010-07-24 10:49:01 -07:00
danielvincent
eb15dcb4ce fixed images on friend sidebar 2010-07-24 10:35:47 -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
2646a52cbb header padding fix 2010-07-23 22:40:23 -07:00
danielvincent
4c3a51833f user name is bigger 2010-07-23 22:35:12 -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
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -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