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

11053 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
431a04b0a8 made nsfw shield nicer and more condensed [ci skip] 2012-02-18 16:26:14 -08:00
Jonne Haß
ad42398c51 updated 97 locale files [ci skip] 2012-02-18 16:26:14 -08:00
Pistos
376bc4184f Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up. 
Conflicts:

	lib/postzord/receiver/public.rb
 2012-02-18 16:26:14 -08:00
Maxwell Salzberg
6f3fb6ee67 fix css of new comment box [ci skip] 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
Maxwell Salzberg
819e8b1f48 typo in my js SRY [ci skip] 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
8a504f2eb8 remove a task that doesnt seem to work 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
61ab84d6e8 change rake assets:compile_s3 to rake assets:deploy [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
Maxwell Salzberg
5ea6648550 add more images to use handlebars imageUrl helper 2012-02-18 16:26:12 -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
Maxwell Salzberg
7bdff9e505 return to diaspora after oauth cukes to prevent failures [ci skip] 2012-02-18 16:26:12 -08:00
danielgrippi
6573559faf fix weird search bar shadow issue in chrome [ci skip] 2012-02-18 16:26:11 -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
a1df9fe8db fix jasmine 2012-02-18 16:26:11 -08:00
danielgrippi
89938bac6e fix cuke 2012-02-18 16:26:11 -08:00
Maxwell Salzberg
36cb22ce1a allow localhost in cukes 2012-02-18 16:26:11 -08:00
Maxwell Salzberg
10bdf52ef7 mock out slow things that our tests dont need for speed 2012-02-18 16:26:10 -08:00
Maxwell Salzberg
ebeff6c8e6 fix for some crazy lack-of-stubbing on some http requests... 2012-02-18 16:26:10 -08:00
danielgrippi
29ea9c05e3 fix reshare tempalte; reorder header 2012-02-18 16:26:10 -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
Maxwell Salzberg
083aae1a25 update participate path in cuke 2012-02-18 16:26:10 -08:00
Florian Staudacher
2d29f93e42 fix shifted image button in firefox 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
Florian Staudacher
0222e4b2ee added intentionally failing specs, because dirty input breaks bookmarklet 
see also #2741 #2751 #2800
 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
84f5561c77 Some progress on Galician translation review. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
d812502ee4 Additional progress on the Galician translation. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
9b7e3e8f2d Some progress on the Galician translation review. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
550ffec091 Updated devise.gl.yml Galician translation file. 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