Maxwell Salzberg
|
22cda15aa8
|
presenter now has a title
|
2012-02-27 18:11:41 -08:00 |
|
danielgrippi
|
0df179c514
|
fix specs
|
2012-02-27 17:56:52 -08:00 |
|
Maxwell Salzberg
|
fce3cba946
|
post viewer styling cleanup
|
2012-02-27 17:28:04 -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 |
|
Jonne Haß
|
38e4394e55
|
updated 22 locale files [ci skip]
|
2012-02-27 22:33:19 +01: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 |
|
Maxwell Salzberg
|
a4e312d537
|
Merge pull request #2936 from DeadSuperHero/messagepanefix
Fix positioning in message pane timestamps. [ci skip]
|
2012-02-26 11:03:46 -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
|
3e65d39b68
|
rename some stuff in hydra to make it more clear [ci skip]
|
2012-02-25 18:19:19 -08:00 |
|
Maxwell Salzberg
|
42a93f9490
|
remove weird monkey patch in sessions controller #wtf
|
2012-02-25 17:41:46 -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 |
|
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
|
9e236e0234
|
Merge pull request #2930 from jbivins/spacing-between-paragraphs
Add spacing between paragraphs and dots before items in an unordered lis...[ci skip]
|
2012-02-25 17:10:48 -08:00 |
|
Maxwell Salzberg
|
3874c40084
|
committed a notes file by accident, sry [ci skip]
|
2012-02-25 17:00:28 -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 |
|
Jonne Haß
|
0604a36a15
|
updated 161 locale files [ci skip]
|
2012-02-26 01:07:13 +01: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
|
c5b30b39de
|
don't page nav when focused in the comment box
|
2012-02-24 22:47:00 -08:00 |
|
danielgrippi
|
2ee329d786
|
make sneaky passive by default. this fixes the bug where a user would like something when the interaction pane is active and the sneaky would show up when the feedback view was re-rendered.
|
2012-02-24 22:36:37 -08: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 Collective
|
81141958a3
|
Merge pull request #2931 from diasporg/33fada3
fix facebook finder [ci-skip]
|
2012-02-24 19:20:03 -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 |
|
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 |
|
danielgrippi
|
39d31d5888
|
Merge branch 'master' of github.com:diaspora/diaspora into profiles
|
2012-02-24 14:36:18 -08:00 |
|
Dennis Collinson
|
5154500239
|
small refactoring around router.js
|
2012-02-24 14:33:57 -08:00 |
|
danielgrippi
|
2c0cfa53dc
|
don't show left-right nav when idle
|
2012-02-24 13:31:17 -08:00 |
|
Dennis Collinson
|
6e55d6c011
|
DC MS DG; un-namespace single post JSON responses
|
2012-02-24 13:30:16 -08:00 |
|
Maxwell Salzberg
|
ead0b14a48
|
Merge pull request #2916 from Raven24/photos-lightbox
make lightbox work for photos page (+tests)
|
2012-02-24 10:46:01 -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 |
|
Maxwell Salzberg
|
b287cfa714
|
Merge pull request #2927 from Raven24/fix-2922
bookmarklet - escape all passed params in js [ci skip]
|
2012-02-24 10:43:47 -08:00 |
|
Florian Staudacher
|
663a5a0e7c
|
escape all passed params in js - fixes #2922
|
2012-02-24 14:15:08 +01:00 |
|
Benjamin Neff
|
392625dd4c
|
fix css for searchbox (fixes #2878)
|
2012-02-24 03:20:30 +01:00 |
|
danielgrippi
|
34b9e1c7ca
|
fix padding on comment button
|
2012-02-23 17:26:16 -08:00 |
|