Commit graph

1110 commits

Author SHA1 Message Date
danielgrippi
65f20f439c new post form touchup 2012-03-27 14:52:52 -07:00
Dennis Collinson
60420f1061 DG DC form autosubmits on file field change 2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1 Select multiple aspects 2012-03-27 14:52:51 -07:00
Steven Hancock
f5fdb8ade1 Add an error message to the mobile login page
This adds an error message to the mobile version of the login page
for failed logins, as requested in #3048

This (along with the standard login page) appears to use the Devise
i18n for the error message, which may need to be updated to reflect
the fact that we're not using email addresses for authentication.
2012-03-27 04:41:56 -07:00
Vittorio Cuculo
d02ecacb26 fix spinner path 2012-03-24 12:52:35 +01:00
Maxwell Salzberg
4006c1502e Merge pull request #3013 from diasp/mobile-header
Mobile: added activity link to header
2012-03-23 11:05:01 -07:00
=
2e6355d780 rtl statuses 2012-03-23 16:33:10 +02:00
=
46efb7237c rtl in textarea 2012-03-23 16:23:13 +02:00
=
a631cee005 rtl 2012-03-23 16:20:06 +02:00
Maxwell Salzberg
5517eb45e6 omg remove ugly boarder from css3 spinner 2012-03-22 18:54:26 -07:00
Dennis Collinson
254bd9b89c move padding down to post 2012-03-22 18:14:29 -07:00
Raven24
907e19e885 don't let oembed content grow beyond stream width 2012-03-21 17:51:05 +01:00
Maxwell Salzberg
2e1f353ac4 Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more
Conflicts:
	public/javascripts/app/views/content_view.js
2012-03-19 19:11:57 -07:00
Maxwell Salzberg
e0c71e13de Merge pull request #3012 from Raven24/oembed-fixes
small fixes for oembed in posts [ci skip]
2012-03-19 19:03:26 -07:00
Diaspora Europe
cd62c33f17 mobile: added stream and activity links to header 2012-03-16 08:20:42 +01:00
Florian Staudacher
3d1925ec63 small fixes for oembed:
- make container inline-block to fit content (for overlay buttons to be centered)
- fix javascript ("src" instead of "href" for iframes), also disambiguate variable names
2012-03-15 17:39:02 +01:00
Diaspora Europe
563e94b804 let date looks nice 2012-03-15 16:44:25 +01:00
Florian Staudacher
9aa0a7ed58 extracted "show more" part from #2941, tests still WIP 2012-03-14 02:09:27 +01:00
Maxwell Salzberg
298327d2af Merge pull request #2982 from diasp/2912-message-overflows
Handle many users in a message #2912[ci skip]
2012-03-13 15:58:18 -07:00
Diaspora Europe
c48e792c75 added notification badge 2012-03-13 17:27:40 +01:00
Diaspora Europe
afd750536f added badges to mobile css 2012-03-13 16:46:04 +01:00
Maxwell Salzberg
51c47695b2 Merge pull request #2978 from Raven24/video-thumbnail
oembed video thumb [oh yeah]
2012-03-09 16:56:42 -08:00
Florian Staudacher
7505670a2a removed unnecessary js/css, since it works differently now 2012-03-09 18:16:21 +01:00
Diaspora Europe
ecc86c1f86 handle many users in a message #2912 2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882 Merge pull request #2906 from Raven24/fix-2770
fix for #2770
2012-03-06 22:36:53 -08:00
Maxwell Salzberg
d211272cab Merge pull request #2981 from DeadSuperHero/beautyqueen
Fix #2974, markdown headers now different from headers in post [ci skip]
2012-03-06 22:35:04 -08:00
Florian Staudacher
2976f7d7d1 added overlayed "play" icon to thumb,
made the "loader" gif background for oembed container
make videos autoplay after click
2012-03-07 00:52:26 +01:00
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -08:00
Sean Tilley
053ca1d20b Fix #2974, markdown headers now different from headers in post 2012-03-06 17:10:04 -06:00
Florian Staudacher
98d1e29055 extracted oembed thumb stuff from #2941, also fixes oembed cukes 2012-03-05 00:44:08 +01:00
Sean Tilley
b4332b80e4 Add extra bit to ensure fixedness for #2951 2012-03-01 03:59:49 -06:00
Sean Tilley
d505826bc5 Fix photo uploader, kill breakage #2951 2012-03-01 00:38:03 -06:00
Maxwell Salzberg
0d93227f07 hopefully make travis happy: 2012-02-28 17:52:13 -08:00
danielgrippi
b6c4cab669 fix styling issue with popup comment box and last paragraphs [ci skip] 2012-02-28 15:27:31 -08:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08:00
Dan Hansen
1a0c756bb3 Hovering over the upload file button uses the cursor pointer, Bug Mash Monday #5 2012-02-28 12:11:15 -06:00
danielgrippi
3d48dc4fb0 fix stream css 2012-02-27 19:08:37 -08:00
danielgrippi
1e518cbcff fix media view 2012-02-27 18:50:33 -08:00
danielgrippi
81de530ce3 use better serif fonts 2012-02-27 18:41:28 -08:00
Maxwell Salzberg
fce3cba946 post viewer styling cleanup 2012-02-27 17:28:04 -08:00
danielgrippi
57c3bdb685 added home button to an active interaction-pane 2012-02-27 15:58:13 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles
Conflicts:
	lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
danielgrippi
896c098a07 changed handlebars "avatar" helper to "personImage"; added home button to interaction pane (only when sneaky -- needs further investigating on getting it showing up when the interaction pane is invoked); minor css tweaks. 2012-02-26 21:17:20 -08:00
danielgrippi
98a834884f this is not the right solution... it's way too obnoxious.
Revert "don't show nsfw posts without a shield in the viewer"

This reverts commit 722116cebc.
2012-02-26 14:24:16 -08:00
danielgrippi
6e0b351d70 remove repetitive clock icon from the post viewer. 2012-02-26 14:23:47 -08:00
Sean Tilley
577c337705 Fix positining in message pane timestamps. 2012-02-26 04:31:48 -06:00
danielgrippi
722116cebc don't show nsfw posts without a shield in the viewer 2012-02-25 20:01:30 -08:00
danielgrippi
f70b290316 added two helpers to handlebars for avatar images / links to people. 2012-02-25 19:29:14 -08:00
Maxwell Salzberg
bb75458b74 Merge pull request #2923 from SuperTux88/searchbox-css-fix
fix css for searchbox (fixes #2878)[ci skip]
2012-02-25 17:13:39 -08:00
Joe Bivins
b179de1e64 Add spacing between paragraphs and dots before items in an unordered list. [ci skip] 2012-02-24 20:18:10 -05:00