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

5513 commits

Author SHA1 Message Date
Maxwell Salzberg
dfd0248a78 Merge pull request #2991 from ChFernandez/master 
Pod Administration[ci skip]
 2012-03-13 15:47:57 -07:00
Maxwell Salzberg
78cbe0a1d3 Merge pull request #2997 from diasp/1994-mobile-notifications 
Mobile notifications back again #1994 [ci skip]
 2012-03-13 14:18:58 -07:00
Maxwell Salzberg
24f8447248 Merge pull request #2986 from diasp/improve-mobile 
Nice more and comment buttons[ci skip]
 2012-03-13 14:16:33 -07:00
Diaspora Europe
746a144dac now redirect to stream 2012-03-13 18:07:42 +01:00
Diaspora Europe
82c9ccfbe0 added read all button, hide count if zero 2012-03-13 17:55:48 +01:00
Diaspora Europe
c48e792c75 added notification badge 2012-03-13 17:27:40 +01:00
Diaspora Europe
f224cfe030 added link to notifications mobile view in header 2012-03-13 16:34:37 +01:00
Diaspora Europe
3c6175041d mobile notifications back again #1994 2012-03-13 11:29:20 +01:00
Maxwell Salzberg
da6866c04c Merge pull request #2994 from diasp/improve-reset-password 
Improve reset password views
 2012-03-12 18:13:52 -07:00
Diaspora Europe
bcc754b07c reset password: added localized text, improved layout 2012-03-12 12:49:47 +01:00
Diaspora Europe
248492ad15 added reset password mobile views 2012-03-12 10:39:42 +01:00
Diaspora Europe
c98a728645 remove useless cancel button 2012-03-12 08:36:34 +01:00
Diaspora Europe
746e9c5cfc nice more and comment buttons 2012-03-12 08:36:33 +01:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing 
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
 2012-03-10 23:49:56 -08:00
chfernandez
b8ca31b6b3 improved weekly_user_stats in admin with a dropdown box by week to list all new users of that week also a link_to the user profile so the admin can sent welcome msgs, etc 2012-03-10 19:08:19 -08:00
Maxwell Salzberg
000f8d3b08 Revert "adding custom landing page for heroku" 
This reverts commit 061badf74e.
 2012-03-09 17:44:45 -08:00
Maxwell Salzberg
061badf74e adding custom landing page for heroku 2012-03-09 17:20:22 -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
Diaspora Europe
07cc4f06f4 added localized text in comment view 2012-03-08 14:37:39 +01:00
Maxwell Salzberg
06f9e780e5 Merge pull request #2983 from diasp/improve-mobile-views 
Improve mobile sign up and sign in view [ci skip]
 2012-03-07 23:25:14 -08:00
Diaspora Europe
f26563c90c added localized text in getting started view 2012-03-08 08:21:22 +01:00
Maxwell Salzberg
db0859a83c bug fix: you can now mention and post a photo at the same time 2012-03-07 14:42:46 -08:00
Diaspora Europe
92a857533e improve mobile sign up and sign in view 2012-03-07 17:01:16 +01:00
Maxwell Salzberg
76450f7882 Merge pull request #2906 from Raven24/fix-2770 
fix for #2770
 2012-03-06 22:36:53 -08:00
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -08:00
Maxwell Salzberg
aa35519bf0 Merge pull request #2939 from gandaro/2938-consistent-superscripts 
disable superscripts on server-side markdownify, since they are disabled...[ci skip]
 2012-03-06 12:30:41 -08:00
Maxwell Salzberg
bd021bbd91 Correct our general exception handling. 
thanks @mperham! see: http://t.co/Jyt7vV4I
 2012-03-03 16:26:06 -08: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
Daniel Grippi
7a774661bb Merge pull request #2777 from stwf/tweak-twitter-truncation 
take url shortening into effect before truncating twitter posts
 2012-02-29 22:49:46 -08:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08:00
Maxwell Salzberg
d80afc64ec fix ordering for logged out users 2012-02-27 19:16:05 -08:00
Maxwell Salzberg
879b3d135a title now updates with switch 2012-02-27 18:40:56 -08:00
Maxwell Salzberg
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
Dennis Collective
7abbe4a642 Merge pull request #2925 from diasp/2833-conversations-should-return-json 
Conversations should return json #2833
 2012-02-27 17:34:10 -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
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Jakob Kramer
c2ae103030 disable superscripts on server-side markdownify, since they are disabled client-side too 2012-02-26 22:30:54 +01:00
Maxwell Salzberg
c85e2a9b5d Merge pull request #2935 from Raven24/host-meta 
adapt host-meta document to RFC 6415
 2012-02-25 17:11:06 -08:00
Maxwell Salzberg
27a4c1bf2d introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor 2012-02-25 16:57:14 -08:00
Maxwell Salzberg
49b0a44738 removing estates builder, as we are now using a template 2012-02-25 16:55:26 -08:00
Maxwell Salzberg
a1f39398be Merge pull request #2902 from JMSilla/master 
Fix atom feed bug (bug mash 7) [ci skip]
 2012-02-25 16:47:13 -08:00
JMSilla
8178e0712c Users controller small fix; removed the to_activity method and the corresponding tests for status_message model 2012-02-25 22:24:43 +00:00
Florian Staudacher
6a9a0e61f9 adapt host-meta document to RFC 6415 2012-02-25 16:56:34 +01:00
danielgrippi
73f224e690 don't render page-viewer twice; last_post should actually get the last post posted, not the first one 2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac Merge branch 'profiles' of github.com:diaspora/diaspora into profiles 2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
David Morley
33fada305c put all the elements back on the page and make facebook inviter usable again 2012-02-24 20:46:27 -06:00
danielgrippi
39d31d5888 Merge branch 'master' of github.com:diaspora/diaspora into profiles 2012-02-24 14:36:18 -08:00
Dennis Collinson
6e55d6c011 DC MS DG; un-namespace single post JSON responses 2012-02-24 13:30:16 -08:00
Maxwell Salzberg
0db2bd9e40 Merge pull request #2908 from diasporg/adminclean 
clean up admin page [ci skip]
 2012-02-24 10:44:52 -08:00