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

2876 commits

Author SHA1 Message Date
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
8ac7a74f50 kinda gross hack to prevent mobile notifications from show up for unauthenticated users 2012-03-13 16:31: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
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
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
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
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
8344422aef partial rename no longer needed 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
Diaspora Europe
92a857533e improve mobile sign up and sign in view 2012-03-07 17:01:16 +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
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -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
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08: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
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
Florian Staudacher
6a9a0e61f9 adapt host-meta document to RFC 6415 2012-02-25 16:56:34 +01: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
Maxwell Salzberg
0db2bd9e40 Merge pull request #2908 from diasporg/adminclean 
clean up admin page [ci skip]
 2012-02-24 10:44:52 -08:00
Florian Staudacher
663a5a0e7c escape all passed params in js - fixes #2922 2012-02-24 14:15:08 +01:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
ebcde41e69 display original author if post is a reshare 2012-02-21 15:23:30 -08:00
danielgrippi
f31418feb3 pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now 2012-02-21 15:23:29 -08:00
danielgrippi
f83b82902c markdownify text; better folder structure for photo-viewer templates 2012-02-21 15:23:29 -08:00
danielgrippi
3d1ac7ed55 added basic reshare attribution 2012-02-21 15:23:29 -08:00
danielgrippi
c0eeb7680b pages wip 2012-02-21 15:23:28 -08:00
danielgrippi
7acbfe1b78 refactored some js to make sense of how we're going to attack the post show page with a js Page 2012-02-21 15:23:28 -08:00
danielgrippi
30de08b340 fix post presenter / arrow ordering 2012-02-21 15:23:28 -08:00