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

508 commits

Author SHA1 Message Date
danielvincent
f5a0f44c25 fixed error in posting to all albums through publisher on albums#index 2010-10-23 00:36:29 -07:00
danielvincent
b5976753ea removed unused view 2010-10-22 15:47: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
danielvincent
6d8b670150 changed show layouts for album and photos. still needs work. 2010-10-20 17:35:27 -07:00
ilya
6bee872039 moved the add people into a partial 2010-10-20 15:42:03 -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
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
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
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
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
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
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -07:00
danielvincent
6f282e77ff make public checkbox 2010-10-15 14:22:28 -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
20f164fd45 fixing some of the invite copy 2010-10-15 11:11:25 -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
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -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
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
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
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
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -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
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
ilya
63cb7dcbdd Fb friends are displayed only once 2010-10-05 13:00:42 -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
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
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
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
ilya
f38bcc9eb3 tiny change in view 2010-09-24 15:54:53 -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
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
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
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -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
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -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
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
b40b81e447 aspect manage tab now reads 'manage aspects' 2010-09-19 10:11:41 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -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
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -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
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -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
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
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -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
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
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -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
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -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
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
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
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
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
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -07:00
Raphael
3121cf57d3 Refactored top nav haml, added non-functional gear link next to group 2010-08-25 11:35:50 -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
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
maxwell
de335e7366 MS messed with the temporary group picker thing: whatever, it is less annoying 2010-08-24 14:37:47 -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
Raphael
fb33d955c9 Fix group show controller/view and haml error in nav 2010-08-24 11:11:25 -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
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -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
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
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
danielvincent
a7eab9e50c minor section header tweaks (album stuff) 2010-08-13 23:20:39 -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
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -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
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
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
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -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
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
bdca2348a6 MS IZ profile page has more useful info, but ultimatly kinda ugly 2010-07-27 14:23:31 -07:00
maxwell
8a174d37c7 MS trying a dan-like thing in the publisher 2010-07-23 23:56:41 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -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
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
e08ed8805f DG IZ photo upload form now with all the others 2010-07-20 10:00:02 -07:00
danielvincent
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
danielvincent
984f5f62b6 DG IZ; publisher reflects what type is selected 2010-06-29 19:55:50 -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
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
danielvincent
5193a20458 DG IZ; getting there. 2010-06-29 14:34:33 -07:00
danielvincent
260805af64 DG IZ; publisher box & profile picture placeholder 2010-06-29 12:25:36 -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
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