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

10939 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
d54ff5f341 MS; DG added test for unauthenticated post viewing 2012-02-21 15:23:08 -08:00
Maxwell Salzberg
aa3ffbea7f log to the logger, not to the rails module 2012-02-21 13:27:17 -08:00
Maxwell Salzberg
d0162e05f2 add super slow worker [ci skip] 2012-02-21 12:40:26 -08:00
Jonne Haß
14d7348a0d updates locales and fixed needed empty timeago translations 2012-02-20 14:24:30 +01:00
Jonne Haß
fd085c6653 updated 129 locale files [ci skip] 2012-02-20 01:26:16 +01:00
Maxwell Salzberg
0a49cfd866 Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3 
Go to root page if deleting post from the show page
 2012-02-18 17:14:42 -08: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
Joe Bivins
76c11b8d37 Add test case for when a user removes their own post from the show page. 
Adjust redirection logic.
 2012-02-18 19:47:25 -05:00
Maxwell Salzberg
4d634cae24 added a failing feature for dmorleys fix 2012-02-18 16:28:05 -08:00
David Morley
b5bb66c66d fix 2898 - public profile unauthed user 2012-02-18 16:28:05 -08:00
Jonne Haß
c1463c63a4 updated 20 locale files [ci skip] 2012-02-18 16:28:05 -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
1e170291e5 add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing 2012-02-18 16:28:04 -08:00
Maxwell Salzberg
adcd47ab27 remove pending spec, which was pending because we dont use that feature anymore 2012-02-18 16:28:04 -08:00
Jonne Haß
22d5222db0 updated 108 locale files [ci skip] 2012-02-18 16:28:04 -08:00
Jordi Mallach
0e747b96a8 Update Catalan translation to e16a20e. 2012-02-18 16:28:03 -08:00
Jonne Haß
738c856b10 updated 19 locale files [ci skip] 2012-02-18 16:28:03 -08:00
Maxwell Salzberg
d7f56e556b use the user presenter, luke 2012-02-18 16:28:03 -08:00
Maxwell Salzberg
d1301dc267 make the step pending so travis doesnt say we are failing :/ 2012-02-18 16:28:03 -08:00
danielgrippi
5d2084869a correctly reference intergration servers in application.yml.example [ci skip] 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
danielgrippi
7ca423b3f2 DG MS; don't initialize a stream on post pages. 2012-02-18 16:28:02 -08:00
Jonne Haß
fa0e92f396 updated 100 locale files [ci skip] 2012-02-18 16:26:18 -08:00
Maxwell Salzberg
1e2b912bd6 remove multi server spec files 2012-02-18 16:26:18 -08:00
danielgrippi
a0e8f161f5 fix notifications controller. yay. 2012-02-18 16:26:18 -08:00
danielgrippi
ceb8497e49 Revert "attempt to make travis happy" [ci skip] 
This reverts commit 8507dc864f.
 2012-02-18 16:26:17 -08:00
danielgrippi
5fd0ab7951 attempt to make travis happy 2012-02-18 16:26:17 -08:00
Adrián Chaves Fernández (Gallaecio)
4e014d8ab6 Galician translation is now completely up-to-date. 2012-02-18 16:26:17 -08:00
Dennis Collinson
32d58e8a9b toggle all nsfw posts 2012-02-18 16:26:17 -08:00
Adrián Chaves Fernández (Gallaecio)
e7c1903765 Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’. 2012-02-18 16:26:17 -08:00
Adrián Chaves Fernández (Gallaecio)
b41b7f3bd3 Updated Galician translation of the ‘diaspora’ file. 2012-02-18 16:26:17 -08:00
danielgrippi
34cc358345 aliasing in routes.js [ci skip] 2012-02-18 16:26:17 -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
dd00d082dc remove old multi-server-spec-procfile [ci skip] 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
10a059e8f8 remove console.log [ci skip] 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
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