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

116 commits

Author SHA1 Message Date
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +02:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
flaburgan
b8aaad6318 Hide sign up button when registration are disabled 2015-02-01 14:01:44 +01:00
Raphael Sofaer
a07d3616a5 Add lightbox html to unauthenticated header 2013-11-15 14:33:46 -08:00
Jonne Haß
2124dba3e8 update header and footer links 2013-08-25 18:21:14 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
Jonne Haß
f5a4bc51c2 Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop 
Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
 2013-05-18 20:03:59 +02:00
eloydegen
eb5bc379d1 Update _header.html.haml 
Change blog url, now there is no 301 required :)
 2013-05-06 16:27:40 +03:00
rivendale
b77c6f8a86 fix missing indent for correct header container relative positions 2013-04-29 01:27:54 -03:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Jonne Haß
55cb070ac9 add header to sign up page 2013-03-06 19:01:07 +01:00
Jonne Haß
ffc6c1102e dry up and modularize layouts 2013-03-06 19:00:34 +01:00
Maxwell Salzberg
0e2bcf18d2 the logged out logo is now in the branding folder 2012-03-31 00:15:55 -04:00
danielgrippi
dd85521701 fix header styling when not signed in; remove ilya's static page 2012-01-07 14:23:27 -08:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
danielgrippi
cc4531f73c stop censorship. sopa 2011-11-16 16:04:21 -08:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
danielgrippi
8e55fc158b use root_path in header if not logged in 2011-11-14 19:04:27 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
Pistos
db94689dfa Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5 Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." 
This reverts commit 5c8ddc3ea6.
 2011-11-03 23:54:23 -04:00
Pistos
5c8ddc3ea6 Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:44:46 -04:00
danielgrippi
f204910aa4 add 'mark all as read' on notification dropdown 2011-10-25 17:33:57 -07:00
Maxwell Salzberg
aa2fd8abcf make stream link to home icon 2011-10-24 11:34:17 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
Gonzalo Rodriguez
97e1775938 Adding alt text for header icons. Related to #2089. 2011-10-03 23:33:32 -02:00
Gonzalo Rodriguez
ae1fedc73b Preserve search term on search input. Related to #1983. 2011-10-02 23:02:48 -02:00
Dan Hansen
d0fe59af69 add cucumber feature for photo lightbox 
change step to reflect element visibility
 2011-10-01 15:52:48 -05:00
danielgrippi
eaa191515e remove logging statement in a before filter that performed a query 2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a Revert "header data as helper methods" 
This reverts commit 607013bc83.
 2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83 header data as helper methods 2011-09-30 13:22:12 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. 
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
 2011-08-28 16:08:57 -07:00
Raphael Sofaer
902edb6745 Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00