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

2214 commits

Author SHA1 Message Date
Dennis Collinson
358414371e MS DC framer shows rudimentary version of post 2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2 MS DC Post framer process init 2012-03-27 14:52:52 -07:00
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
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
Dennis Collinson
1ec2b73d59 DG DC remotipartjarvascripts 2012-03-27 14:52:51 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1 Select multiple aspects 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
danielgrippi
fd0065598c DG MS; posting to services now works, updated form serializer to handle array attributes. 2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8 DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services 2012-03-27 14:52:50 -07:00
Dennis Collinson
680e7f6637 select one aspect 2012-03-27 14:52:50 -07:00
Dennis Collinson
a3ecd32264 DG DC Change dropdown text on select 2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd DC DGtoggle between public an private 2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06 DG DC OMG FORMZ 2012-03-27 14:52:50 -07:00
Dennis Collinson
9fbc4b745a MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
bf4dabc4f4 MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -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
David Morley
15847d672d show your own reshare count but not allow for reshare of your own 2012-03-26 11:33:48 -05:00
Florian Staudacher
f3a7385eca webkit apparently uses 'undefined' instead of "" for non-matches 2012-03-24 21:27:39 +01:00
Maxwell Salzberg
a0d6df6afa Merge pull request #3047 from Raven24/fix-umlauts-2665 
allow umlauts and other non-ascii characters in markdown urls
 2012-03-24 09:04:59 -07:00
Vittorio Cuculo
d02ecacb26 fix spinner path 2012-03-24 12:52:35 +01:00
Florian Staudacher
49801644cc also handle images and links without sub-domain 2012-03-24 02:57:32 +01:00
Florian Staudacher
c5139c9a71 improve behaviour, add more tests 2012-03-24 01:51:41 +01:00
Florian Staudacher
b7b8a11551 fix #2665 - allow umlauts and other non-ascii characters in url 2012-03-24 00:10:36 +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
78b0ee10da bump item height for great justice. 2012-03-22 18:43:35 -07:00
Dennis Collinson
254bd9b89c move padding down to post 2012-03-22 18:14:29 -07:00
Dennis Collective
48d2bf02b6 Merge pull request #3030 from Raven24/patch-1 
don't let oembed content grow beyond stream width
 2012-03-22 11:40:55 -07:00
danielgrippi
0883ce1dbb fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly 2012-03-21 13:50:24 -07:00
Raven24
907e19e885 don't let oembed content grow beyond stream width 2012-03-21 17:51:05 +01:00
Maxwell Salzberg
af008ab713 remove unused expander plugin 2012-03-19 19:13:15 -07: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
784f1ffbe1 using $ instead of jQuery ... 2012-03-15 20:15:48 +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
danielgrippi
5e75c6d675 fix jasmine around contact-list.js 2012-03-14 16:26:30 -07:00
Maxwell Salzberg
7aa906b463 make setupBinds make even more sense 2012-03-14 11:16:25 -07:00
Florian Staudacher
cd965e32fa fix comment stream jasmine - bind function after spy has been defined 2012-03-14 18:43:06 +01:00
Florian Staudacher
813b706f8e added little fix for extra long content 2012-03-14 02:09:27 +01:00
Florian Staudacher
9aa0a7ed58 extracted "show more" part from #2941, tests still WIP 2012-03-14 02:09:27 +01:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07: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
Maxwell Salzberg
0d5c518630 Merge pull request #2976 from jbivins/legacy-browser-support 
Legacy browser support
 2012-03-09 16:51:34 -08:00
Florian Staudacher
7505670a2a removed unnecessary js/css, since it works differently now 2012-03-09 18:16:21 +01:00
Steven Fuchs
9de477cf5a jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches. 2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Maxwell Salzberg
b7fc774d06 semi-colons; use them 2012-03-07 16:24:02 -08: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
Joe Bivins
7b47edff14 Move date parsing to a helper. 2012-03-04 13:36:35 -05:00
Joe Bivins
8df0bb85fe Wrap the publisher params tag in a div instead of a paragraph. 
Safari 4.1.3 cited the closing params tag as being an unmatched tag.
Changing the paragraph to a div causes the error to disappear.
 2012-03-03 12:42:54 -05:00
Joe Bivins
4769a25d59 Add ISO 8601 timestamp parsing for legacy browsers. 
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
 2012-03-03 12:14:43 -05: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
cb9420bfd6 don't use symlinks; fix assets ordering issues. 2012-02-28 11:04:15 -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
74cdc91bb1 fix likes and comment loading in the stream 2012-02-27 20:38:59 -08: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
879b3d135a title now updates with switch 2012-02-27 18:40:56 -08:00
Maxwell Salzberg
fce3cba946 post viewer styling cleanup 2012-02-27 17:28:04 -08:00
Dennis Collective
f5ef1e8c14 Merge pull request #2814 from stwf/aspects-javascript-fixes 
update aspect name in aspects listing after editing.
 2012-02-27 17:19:05 -08:00
danielgrippi
0e9f825208 parse markdown in rich media view 2012-02-27 15:59:25 -08:00
danielgrippi
57c3bdb685 added home button to an active interaction-pane 2012-02-27 15:58:13 -08:00
danielgrippi
932f2e526c fix bug with interaction pane scrolling 2012-02-27 15:30:44 -08:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
danielgrippi
7bbf69e35e added lock to private posts on show pages 2012-02-27 15:09:15 -08:00
danielgrippi
278c7ee0c4 show feedback for posts on their show pages if user is not logged in. 2012-02-27 14:49:13 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
danielgrippi
66352c8bad have a guard on a handlebars helper. 2012-02-27 14:15:56 -08:00
danielgrippi
ebe7a302b6 DG MS; comments are back! 2012-02-27 12:29:09 -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
danielgrippi
c5b30b39de don't page nav when focused in the comment box 2012-02-24 22:47:00 -08:00