Commit graph

11184 commits

Author SHA1 Message Date
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
Diaspora Europe
57de352238 added some specs for json response 2012-02-24 10:22:16 +01:00
Diaspora Europe
89179ecbd3 conversations should return JSON #2833 2012-02-24 09:39:40 +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
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
b38c49883b sneaky dock has an arrow now. you can click the top of the interaction bar to close/open it. 2012-02-23 17:23:24 -08:00
danielgrippi
2fa673b140 get sneaky 2012-02-23 16:45:10 -08:00
Dennis Collective
2e3d70f5ae Merge pull request #2921 from diasp/2557-deal-with-long-usernames
Deal with long usernames
2012-02-23 15:52:05 -08:00
danielgrippi
a35dfa1157 remove some unused stuff in templates 2012-02-23 13:59:29 -08:00
danielgrippi
857f51b684 more moz fixes 2012-02-23 13:12:03 -08:00
danielgrippi
c3c20db8e8 fix arrow positioning for moz. 2012-02-23 13:12:03 -08:00
Dennis Collinson
8d2376b3bf just sleep 2012-02-23 12:53:05 -08:00
danielgrippi
e78ab14fc5 remove top-level divs from handlebars templates -- move that logic into the backbone view. 2012-02-23 12:18:29 -08:00
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
Diaspora Europe
019b68281e handle text-overflow for long usernames #2557 2012-02-23 12:21:01 +01:00
danielgrippi
91e77e9dce small css tweaks 2012-02-22 20:50:56 -08:00
danielgrippi
71146f27db fix activity streams photo template 2012-02-22 19:23:52 -08:00
danielgrippi
b4923a77f0 add keybinding to the viewer 2012-02-22 19:19:24 -08:00
danielgrippi
8f3cc6769c update reshare count when resharing; return PostPresenter for reshare root in the success response 2012-02-22 18:02:08 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
21d91f1b4c interaction buttons morph into reaction popup 2012-02-22 14:44:13 -08:00
danielgrippi
8f4fed8c0e add participants to info pane on post viewer 2012-02-22 13:15:54 -08:00
Florian Staudacher
412853bfcc make lightbox work for photos page (+tests) 2012-02-22 14:45:43 +01:00
Jonne Haß
0430d940f1 git urls are still better than http ones :P, close #2915 2012-02-22 12:29:15 +01:00
Maxwell Salzberg
cd274cad0d adding likes, reshares and comments in a naive presenter way 2012-02-21 22:13:46 -08:00
Maxwell Salzberg
7755c254fb some basic tests for post presenter; added user.reshare! 2012-02-21 21:56:11 -08:00
danielgrippi
3ec7755c83 update reshare count when resharing; return PostPresenter for reshare root in the success response 2012-02-21 21:51:40 -08:00