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

708 commits

Author SHA1 Message Date
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
be916384a1 collapsed remove from aspect and remove person into one function on aspects#manage 2010-11-04 17:50:48 -07:00
danielvincent
2c24eba49c make profile photo button on photos#show works again 2010-11-04 16:04:58 -07:00
Raphael
152025f912 Update flashsocket 2010-11-04 12:01:39 -07:00
Sarah Mei
dbdd6884a7 SM MS jasmine specs for aspect edit 2010-11-03 22:19:20 -07:00
danielvincent
a995d250f1 added white text on grey asset to mailer 2010-11-02 17:19:49 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
Sarah Mei
fad9c09212 refactor aspect-edit.js in prep for jasmine testing 2010-11-02 13:37:27 -07:00
Raphael
fd0f3a9a1c Fix reshare, user_menu 2010-11-01 17:30:10 -07:00
Raphael
47f040f740 Use jquery id selector 2010-11-01 16:45:09 -07:00
OhaiBBQ
a548ab1345 Small optimizations 2010-11-01 14:58:53 -07:00
OhaiBBQ
8b0d20dec7 Small optimizations 2010-11-01 14:45:51 -07:00
OhaiBBQ
94e4c22fcf Fixed some tabbing 
Removed some more unneeded jQuery object constructors for the button fancyboxes
Replaced event.target with the this keyword
 2010-11-01 14:23:16 -07:00
OhaiBBQ
175e5bdc30 Added strict equality operator to #publisher and #stream keydown event 
Added caching of the $container jQuery object
Added caching of $controls and $this in the .make_profile_photo click event
changed the success callback to use this.src = photo_url; instead of creating a new jQuery object
 2010-11-01 10:37:07 -07:00
OhaiBBQ
6474f5c5f3 Added more caching of jQuery objects, saved a line by using .toggleClass() 2010-11-01 10:07:41 -07:00
OhaiBBQ
c8e8ef06e7 You don't need to make a new jQuery object to do that. 
Fixed typo in the click param
Cache the .edit_photo jQuery object
 2010-11-01 05:26:58 -07:00
danielvincent
3cdb48232a all box-shadows in views rendering in gecko 2010-10-31 17:29:23 -07:00
danielvincent
bfb132280a reshare button displays dropdown on click 2010-10-31 14:30:03 -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
0dcffc6227 made 404 page message clearer. 2010-10-28 14:07:52 -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
b320f5df72 fixed js for changing a user's profile photo on photos#show 2010-10-27 08:45:43 -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
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
danielvincent
d8ca91769f dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442) 2010-10-26 13:03:45 -07:00
danielvincent
ff13cad116 names of people display immediately on aspect#manage page 2010-10-26 12:19:32 -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
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
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
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
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
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
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
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
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
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
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
3436371a96 Merge remote branch 'archi/332-quickfix' 2010-10-18 11:44:47 -07:00
Raphael
d38316002e Merging in Hexagon fancybox. TODO: Refactor out fancybox options hash. 2010-10-18 11:24:47 -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
archi
5e97fd3b52 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-18 11:06:42 +02: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
archi
f2af56f4b2 Youtubelink support :) 
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
 2010-10-17 20:18:24 +02:00
archi
f676e284f7 Added Youtube links - Still TODO: Caching of titles! 2010-10-17 16:14:01 +02:00
archi
8e753cc073 Youtube proof of concept patch/preview - not done yet (see bug #332) 2010-10-17 12:56:26 +02: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
maxwell
e8c49feca4 made the public info link in all aspects publisher 2010-10-15 14:10:10 -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
Robin Nilsson
96219b7360 Making fancybox modal 2010-10-14 00:23:14 +02: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
be017bfb0a DG MS; invite is now a lightbox on feed and manage pages 2010-10-11 14:16:24 -07:00
danielvincent
82f526ea23 DG MS; added tooltip 2010-10-11 10:53:00 -07: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
955d9130a2 DG IZ; shift+enter in publisher box submits contents 2010-09-22 15:35:23 -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
f50b70da9e DG IZ; removed stray mustache 2010-09-20 18:14:12 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -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
MrZYX
7c62a5adf7 fixed drag & drop on aspect manage page 2010-09-19 09:57:58 +08:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
Rick Waldron
535f6ed334 More clean up to decrementRequestsCounter() 2010-09-18 08:05:51 +08:00
Rick Waldron
fcdc1d914c Cached all reused match selector sets, moved synchronous functions into callbacks where needed for optimization; Moved all DOM manip into $(function () {} ) 2010-09-18 08:04:47 +08:00
Rick Waldron
773839308c Moved .live(...) into $(function() {}) block - DOM logic should not be left to synchronously execute outside of a DOMContentLoaded closure 2010-09-18 08:03:59 +08: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
d74c4bd117 DG IZ; use focus instead of click 2010-09-16 16:47:10 -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
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -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
b77260af6b Decrement request counter on request action 2010-09-14 21:24:57 -07:00
Daniel Vincent Grippi
12e15ba3a1 forgot a paren 2010-09-14 21:17:27 -07:00
Daniel Vincent Grippi
6c2c3d9157 working? 2010-09-14 21:16:16 -07:00
Daniel Vincent Grippi
aaaa10b7e4 more testing 2010-09-14 21:12:56 -07:00
Daniel Vincent Grippi
509c16d953 debugging js 2010-09-14 21:10:10 -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
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -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
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi
0e5ef9e005 more informative 400 and 500 pages 2010-09-13 15:24:15 -07:00
Daniel Vincent Grippi
94765906e0 forgot licenses on javascript files. 2010-09-13 14:43:24 -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
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
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
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
Daniel Vincent Grippi
ede03fe1d5 added graident back into firefox 2010-09-13 10:23:24 -07:00
ilya
3014c4d057 silly little thing 2010-09-12 23:22:20 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
ilya
3bd686143f need to send it without data 2010-09-12 22:10:50 -07:00
ilya
593f620216 a tiny change should make the things fadeout 2010-09-12 21:57:15 -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
ilya
9b07c780c3 the acceptance now works need to do the ignores and unfriend bucket 2010-09-11 23:31:43 -07:00
ilya
b1dcc4cf43 testing request acceptance on remote 2010-09-11 21:58:01 -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
0c5ab4f20e undo for now 2010-09-10 15:44:36 -07:00
Daniel Vincent Grippi
ef6ce98c12 DG IZ alert on dragging a request, trying to check 2010-09-10 15:41:58 -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
5812bbd1f1 removed group name edit madness from javascript. 2010-09-09 09:35:32 -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
ilya
9a4edc419c DG IZ first commit from the car, now can change groups a couple of times 2010-08-31 22:55:50 -07: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
98db03d36e the group edit resets the data started to reset the from id attr 2010-08-31 10:46:49 -07:00
ilya
82ff7dc4e4 the person bg color now reset to white, need to reset the original group param and reset the moves var so that one can submit again 2010-08-29 20:38:59 -07:00