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

5490 commits

Author SHA1 Message Date
Maxwell Salzberg
653e93fb11 fix the query to only cycle thru the current authors posts 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
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
Maxwell Salzberg
aa3ffbea7f log to the logger, not to the rails module 2012-02-21 13:27:17 -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
Maxwell Salzberg
7aba1ce1f7 Merge branch 'Raven24-user-photos' 
Conflicts:
	public/javascripts/app/router.js
	public/stylesheets/sass/application.sass
 2012-02-18 17:12:14 -08:00
Maxwell Salzberg
90452744fc fix logging to work great with non-persisted objects 2012-02-18 16:28:05 -08:00
Maxwell Salzberg
28504f09bb federation logger now in place. 2012-02-18 16:28:04 -08:00
Maxwell Salzberg
d7f56e556b use the user presenter, luke 2012-02-18 16:28:03 -08:00
danielgrippi
be363b98e5 DG MS; move logic out of layout into LayoutsHelper. 2012-02-18 16:28:03 -08:00
Florian Staudacher
c4deea3ab9 publisher needs a little more js... 2012-02-18 16:26:17 -08:00
danielgrippi
debdd6cb6b change routes to properly reflect page names (activity/stream). 2012-02-18 16:26:16 -08:00
Maxwell Salzberg
a81d1133cb basic federation profile testing stuff 2012-02-18 16:26:16 -08:00
Maxwell Salzberg
6fa2a4246f fix for federating profile pictures [ci skip] 2012-02-18 16:26:16 -08:00
Florian Staudacher
8249847e9c 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-18 16:26:15 -08:00
danielgrippi
2f7465450e you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-18 16:26:15 -08:00
danielgrippi
87aa1fde34 change language around explore/participate. 2012-02-18 16:26:15 -08:00
danielgrippi
dba50ae273 Bring the likes back. Ditch the pins. 
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
 2012-02-18 16:26:15 -08:00
Maxwell Salzberg
0d77ca2c94 small typo [ci skip] 2012-02-18 16:26:15 -08:00
Maxwell Salzberg
1f8c087f68 fix authorizations page css to use media box 2012-02-18 16:26:14 -08:00
Maxwell Salzberg
fd90ab1cec added some methods to make it easier to figure out how many active users a pod has 2012-02-18 16:26:14 -08:00
danielgrippi
b139cc5479 DC DG; a participation is created in StatusMessageController 2012-02-18 16:26:13 -08:00
danielgrippi
ef7ffa2cbd remove joindiaspora specific home page from repo [ci skip] 2012-02-18 16:26:13 -08:00
danielgrippi
c2695697d3 forgot to save a template [ci skip] 2012-02-18 16:26:13 -08:00
danielgrippi
d89358d80b adding custom landing page for heroku 2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4 fix a bunch of small css related media box issues [ci skip] 2012-02-18 16:26:13 -08:00
Maxwell Salzberg
f01dcb1354 make posts have empty photos so reshared stop messing up 2012-02-18 16:26:13 -08:00
Dennis Collinson
d6fd5cdb20 federated generators take a user 2012-02-18 16:26:12 -08:00
Dennis Collinson
a0ca983c57 Participate stream query uses participations 2012-02-18 16:26:12 -08:00
Dennis Collinson
c9487ee12f move user modules into user namespace. 2012-02-18 16:26:12 -08:00
Dennis Collinson
b0e81af1fa Refactor Relayable Creation 2012-02-18 16:26:12 -08:00
Dennis Collinson
8ae6303a91 Participations are a federated, relayable model :) 2012-02-18 16:26:12 -08:00
danielgrippi
24e37cf32b fix syntax in comment.rb 2012-02-18 16:26:11 -08:00
danielgrippi
2c041701ea allow comments to be 65535 chars long (as opposed to 2500) 2012-02-18 16:26:11 -08:00
danielgrippi
173894d926 stubbornella media and img dom structure FTW! major css deletion <3 2012-02-18 16:26:10 -08:00
danielgrippi
a16a8fc784 Participate / Explore have been upgraded to top-level status. 2012-02-18 16:26:10 -08:00
Diaspora Europe
92b29d31db added user_is_following method, added 2 model specs 2012-02-18 16:26:10 -08:00
Diaspora Europe
55cb328fe2 tags should be case insensitive 2012-02-18 16:26:10 -08:00
Florian Staudacher
56d9da6e04 make previously added specs green 2012-02-18 16:26:09 -08:00
Maxwell Salzberg
42bed7ae1f Merge pull request #2868 from gandaro/2677-sanitize-bio 
fix server-side markdownify to sanitize links
 2012-02-18 16:23:33 -08:00
JMSilla
123e7ba3cb Fix problem with atom feed entry titles being too long (2) 2012-02-18 16:20:02 +00:00
JMSilla
1fe15654c5 Fix problem with atom feed entry titles being too long 2012-02-18 16:18:54 +00:00
Maxwell Salzberg
1f4e255f57 fix logging to work great with non-persisted objects 2012-02-17 14:59:42 -08:00
Maxwell Salzberg
ab727fc846 federation logger now in place. 2012-02-16 17:58:15 -08: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
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Maxwell Salzberg
b2e9e47b38 fix for federating profile pictures [ci skip] 2012-02-14 10:39: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
Daniel Grippi
1638f32042 Merge pull request #2841 from Raven24/bookmarklet-specs 
intentionally failing specs - dirty input breaks bookmarklet (+fix)
 2012-02-13 21:14:56 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a change language around explore/participate. 2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e Bring the likes back. Ditch the pins. 
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
 2012-02-13 19:13:43 -08:00
Maxwell Salzberg
5f4ebc94bb small typo [ci skip] 2012-02-13 17:06:55 -08:00
Maxwell Salzberg
ef40350bae fix authorizations page css to use media box 2012-02-13 17:06:18 -08:00
Maxwell Salzberg
7a565b051d added some methods to make it easier to figure out how many active users a pod has 2012-02-13 16:56:25 -08:00
Jakob Kramer
dfe30e1fe0 fix server-side markdownify to sanitize links 2012-02-11 22:23:06 +01:00
danielgrippi
44e072c330 DC DG; a participation is created in StatusMessageController 2012-02-10 16:42:21 -08:00
danielgrippi
ecdbd1bb26 remove joindiaspora specific home page from repo [ci skip] 2012-02-10 15:45:48 -08:00
danielgrippi
3c7ebe3200 forgot to save a template [ci skip] 2012-02-10 15:24:47 -08:00
danielgrippi
3e4d2fe7e8 adding custom landing page for heroku 2012-02-10 15:20:15 -08:00
danielgrippi
b866d9356a Merge branch 'master' of github.com:diaspora/diaspora 2012-02-10 15:18:49 -08:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
Maxwell Salzberg
232e620637 make posts have empty photos so reshared stop messing up 2012-02-10 13:45:41 -08:00
Dennis Collinson
04bd507025 federated generators take a user 2012-02-09 19:01:01 -08:00
Dennis Collinson
5e26a7e6bb Participate stream query uses participations 2012-02-09 19:01:01 -08:00
Dennis Collinson
14b9f5dc5b move user modules into user namespace. 2012-02-09 19:01:01 -08:00
Dennis Collinson
f3c1eff3e9 Refactor Relayable Creation 2012-02-09 19:01:00 -08:00
Dennis Collinson
9e1816dc12 Participations are a federated, relayable model :) 2012-02-09 19:01:00 -08:00
danielgrippi
2b15bc7938 fix syntax in comment.rb 2012-02-09 18:29:52 -08:00
danielgrippi
7a5838a363 allow comments to be 65535 chars long (as opposed to 2500) 2012-02-09 18:26:20 -08:00
danielgrippi
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
danielgrippi
398ca3d97b Participate / Explore have been upgraded to top-level status. 2012-02-09 14:29:01 -08:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +01:00
Diaspora Europe
8eda9aaf52 added user_is_following method, added 2 model specs 2012-02-09 14:17:43 +01:00
Diaspora Europe
47f7e10860 tags should be case insensitive 2012-02-09 14:17:43 +01:00
Dennis Collinson
74409d64b5 cleanup, yoq 2012-02-08 17:25:25 -08:00
Maxwell Salzberg
062204e963 Merge pull request #2848 from beardedninja/master 
#2847 Users can now toggle nsfw on and off
 2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323 Merge pull request #2839 from diasp/2036-fix-private-messages-navigation 
#2036 Fix private messages are sometimes displayed without navigation
 2012-02-08 16:59:50 -08:00
Dennis Collinson
94a7f5bb91 unsfw - sorry Kinky Joe! 2012-02-08 16:35:55 -08:00
Florian Staudacher
9fcc2a4ffa make previously added specs green 2012-02-09 01:01:28 +01:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Alex Harrison
0cbdf51e6a #2847 Users can now toggle nsfw on and off 2012-02-08 23:01:02 +01:00
Diaspora Europe
3c4b37dad7 PMs should always be displayed with the navigation. 2012-02-08 16:53:48 +01:00
danielgrippi
a819f38b99 touch interacted_at on Post#after_create 2012-02-07 21:32:10 -08:00
Dennis Collinson
8ae18bb393 nsfw's users posts are now nsfw 2012-02-07 19:14:44 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00