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 488e064e119377dd30f4d06ccb9ba9
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
Pistos
44e6084a29
Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up.
...
Conflicts:
lib/postzord/receiver/public.rb
2012-02-10 23:30:59 -05:00
Maxwell Salzberg
f3d790a4c2
fix css of new comment box [ci skip]
2012-02-10 16:48:55 -08:00
danielgrippi
44e072c330
DC DG; a participation is created in StatusMessageController
2012-02-10 16:42:21 -08:00
Maxwell Salzberg
427a1694db
typo in my js SRY [ci skip]
2012-02-10 15:53:25 -08:00
danielgrippi
ecdbd1bb26
remove joindiaspora specific home page from repo [ci skip]
2012-02-10 15:45:48 -08:00
danielgrippi
5ecb3e8a50
remove a task that doesnt seem to work
2012-02-10 15:31:46 -08:00
danielgrippi
3c7ebe3200
forgot to save a template [ci skip]
2012-02-10 15:24:47 -08:00
danielgrippi
33fb1222f1
change rake assets:compile_s3 to rake assets:deploy [ci skip]
2012-02-10 15:21:59 -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
Maxwell Salzberg
6bc44f6f5a
add more images to use handlebars imageUrl helper
2012-02-10 13:44:45 -08:00
