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

10841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxwell Salzberg
e95b0d92e4 Merge pull request #2903 from diasporg/2898-public-profile 
fix 2898 - public profile unauthed user [ci skip]
 2012-02-18 15:59:44 -08:00
David Morley
dcac17855e fix 2898 - public profile unauthed user 2012-02-18 12:30:01 -06:00
Jonne Haß
097a8b409d updated 20 locale files [ci skip] 2012-02-18 02:34:50 +01:00
Maxwell Salzberg
3caebb7743 Merge branch 'federation_logger' 2012-02-17 15:01:43 -08: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
20c79f1bb2 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-16 17:37:13 -08:00
Maxwell Salzberg
dcc2bcd233 remove pending spec, which was pending because we dont use that feature anymore 2012-02-16 17:37:13 -08:00
Maxwell Salzberg
bc9e4ca196 Merge pull request #2853 from Raven24/publisher-images 
fix shifted image button in firefox [ci skip]
 2012-02-16 17:25:06 -08:00
Jonne Haß
4e93d087bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-02-17 01:33:08 +01:00
Jonne Haß
a4a79db86b updated 108 locale files [ci skip] 2012-02-17 01:33:02 +01:00
Jordi Mallach
4a9d2ff9e9 Update Catalan translation to e16a20e. 2012-02-17 00:27:24 +01:00
Jonne Haß
7a1f491008 updated 19 locale files [ci skip] 2012-02-16 23:10:18 +01:00
Maxwell Salzberg
063912287c use the user presenter, luke 2012-02-16 13:19:14 -08:00
Maxwell Salzberg
40413a6bc3 make the step pending so travis doesnt say we are failing :/ 2012-02-16 13:17:37 -08:00
danielgrippi
5acc7dc458 correctly reference intergration servers in application.yml.example [ci skip] 2012-02-16 13:01:17 -08:00
danielgrippi
62c0ad13b7 DG MS; move logic out of layout into LayoutsHelper. 2012-02-15 18:38:36 -08:00
danielgrippi
5f83abe418 DG MS; don't initialize a stream on post pages. 2012-02-15 15:07:28 -08:00
Jonne Haß
21b420ca1e updated 100 locale files [ci skip] 2012-02-15 14:13:47 +01:00
Maxwell Salzberg
326103adb6 remove multi server spec files 2012-02-14 16:40:11 -08:00
Jonne Haß
d9fd978f9d Merge pull request #2892 from Gallaecio/master 
Updated Galician (gl) translation
 2012-02-14 16:04:32 -08:00
danielgrippi
a5debd795d fix notifications controller. yay. 2012-02-14 15:59:51 -08:00
danielgrippi
52c8540091 Revert "attempt to make travis happy" [ci skip] 
This reverts commit 8507dc864f.
 2012-02-14 15:05:28 -08:00
danielgrippi
8507dc864f attempt to make travis happy 2012-02-14 15:00:59 -08:00
Adrián Chaves Fernández (Gallaecio)
4088af9159 Galician translation is now completely up-to-date. 2012-02-14 23:38:48 +01:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
Adrián Chaves Fernández (Gallaecio)
098a9e3484 Merge remote-tracking branch 'upstream/master' 2012-02-14 22:55:19 +01:00
Adrián Chaves Fernández (Gallaecio)
39f39b12fd Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’. 2012-02-14 22:47:29 +01:00
Adrián Chaves Fernández (Gallaecio)
0c8b0189d1 Updated Galician translation of the ‘diaspora’ file. 2012-02-14 22:28:09 +01:00
danielgrippi
7f550d2d92 aliasing in routes.js [ci skip] 2012-02-14 12:59:19 -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
e24873353b remove old multi-server-spec-procfile [ci skip] 2012-02-14 11:15:15 -08:00
Maxwell Salzberg
b4c526556f Merge branch 'federation_procfile' 2012-02-14 10:59:22 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Maxwell Salzberg
8307514439 remove console.log [ci skip] 2012-02-14 10:39:42 -08:00
Maxwell Salzberg
b2e9e47b38 fix for federating profile pictures [ci skip] 2012-02-14 10:39:41 -08:00
Daniel Grippi
fc65d0fea2 Merge pull request #2889 from Raven24/bookmarklet-stuff 
bookmarklet fixes
 2012-02-14 10:07:52 -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
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
Jonne Haß
ab29a58f93 updated 97 locale files [ci skip] 2012-02-13 13:04:23 +01:00
Daniel Grippi
3b87345365 Merge pull request #2863 from Pistos/diasporainc-discard-unrecognized-relays 
Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up.
 2012-02-11 08:50:00 -08:00