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
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
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
danielgrippi
ead286bf99
DG RY; moved actions to the bottom of the show pages; fixed arrows
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
25cf776059
the previous and next posts are now supplied in json of the presenter; give the template creator a default value
2012-02-21 15:23:28 -08:00
danielgrippi
cc0e04ea3f
DG MS; fix user controls
2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd
DG MS; post vitals on top left; user action placeholder on top right
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
a3e8ced6a1
haha more arrow controlz
2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4
haxy auto comment functionality; try me and then revert me"
2012-02-21 15:23:27 -08:00
danielgrippi
c3c23209c3
more fiddling with box model; added arrows
2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7
DG MS; added a new layout for post pages.
2012-02-21 15:23:27 -08:00
danielgrippi
e3ebf05ac2
DG MS; new templates for post show pages.
2012-02-21 15:23:27 -08:00
David Morley
a63bcd0080
make popular tags human readable
2012-02-19 21:28:12 -06:00
David Morley
c41923081a
resque with header
2012-02-19 15:50:12 -06:00
David Morley
6e4844629a
admin cleanup
2012-02-19 15:29:07 -06:00
Florian Staudacher
7c73a526dd
fix for #2770
...
- apply the padding to the wrapper element, not to the textarea
apparently padding a textarea makes it shrink in firefox... ?
- don't use manual padding, instead specify max-height for images
extra-huge images are jolted, but they don't explode the layout
- closing handled by view,
gets rid of "Publisher.close is not a function" error msg
2012-02-19 21:14:12 +01:00
JMSilla
1fe15654c5
Fix problem with atom feed entry titles being too long
2012-02-18 16:18:54 +00:00
Maxwell Salzberg
063912287c
use the user presenter, luke
2012-02-16 13:19:14 -08:00
danielgrippi
62c0ad13b7
DG MS; move logic out of layout into LayoutsHelper.
2012-02-15 18:38:36 -08:00
Daniel Grippi
10c5757193
Merge pull request #2891 from Raven24/bookmarklet-oops
...
bookmarklet - publisher needs a little more js...
2012-02-14 12:33:32 -08:00
Florian Staudacher
a03a57efb7
publisher needs a little more js...
2012-02-14 21:28:37 +01:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
Florian Staudacher
4263797099
bookmarklet now is a complete html document (+test)
...
it auto-expands to the size of the text that was selected
it self-closes after posting again
2012-02-14 18:57:30 +01:00
