Jonne Haß
097a8b409d
updated 20 locale files [ci skip]
2012-02-18 02:34:50 +01: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
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
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
Jonne Haß
21b420ca1e
updated 100 locale files [ci skip]
2012-02-15 14:13:47 +01:00
Jonne Haß
d9fd978f9d
Merge pull request #2892 from Gallaecio/master
...
Updated Galician (gl) translation
2012-02-14 16:04:32 -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
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
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
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
Maxwell Salzberg
3d569cc4bc
fix for some crazy lack-of-stubbing on some http requests...
2012-02-09 16:20:22 -08:00
danielgrippi
398ca3d97b
Participate / Explore have been upgraded to top-level status.
2012-02-09 14:29:01 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
Dennis Collinson
558ceec92a
a user can mark themselves as nsfw
2012-02-07 19:03:20 -08:00
Dennis Collinson
efd99344eb
git status
2012-02-07 18:29:51 -08:00
Maxwell Salzberg
cb23b2d5b7
make jasmine happy, by just refrencing the template package we already create
2012-02-07 15:35:42 -08:00
Ricardo
b4c0c0e679
Fix #1308 : publisher submits w/o pasted text
...
Text can be input not only with the keyboard but also with a right-click
paste or a middle mouse button paste in X. The publisher now listens to
the 'textchange' event instead of ignoring anything but a 'keyup'.
2012-02-07 22:40:56 +08:00
Jonne Haß
7638619c7f
Merge pull request #2821 from gandaro/missing-translation-invitations
...
add previously missing translation in the invitation-lightbox
2012-02-06 04:38:42 -08:00
Adrián Chaves Fernández (Gallaecio)
db10d8ec58
Some progress on Galician translation review.
2012-02-06 08:33:30 +01:00
danielgrippi
7d60d96132
set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip]
2012-02-05 21:18:34 -08:00
Daniel Grippi
fc8a9a7b58
Merge pull request #2826 from nolith/capistrano
...
fixed and improved capistrano recipe [ci skip]
2012-02-05 20:29:42 -08:00
danielgrippi
39ff47150b
allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.
2012-02-04 15:50:36 -08:00
Alessio Caiazza
67e2ca44fc
capistrano deploy: fixed multiple thin detection
2012-02-04 18:11:34 +01:00
Alessio Caiazza
8632c8c40b
capistrano deploy: let the user choose if running svc and svstat with sudo
...
Set svc_sudo to true in deploy_config.yml to use sudo.
The default value will be false, so that if the parameter is missing capistrano will behave exactly as before.
2012-02-04 17:59:30 +01:00
Jakob Kramer
d8183d3973
add missing translation in the invitation-lightbox [ci skip]
2012-02-04 14:17:19 +01:00
Alessio Caiazza
23212e4146
capistrano deploy: sass should be executed under bundle exec
2012-02-04 12:12:10 +01:00
Alessio Caiazza
3b0bf89335
capistrano deploy: avoid installing heroku gemset group
2012-02-04 12:07:26 +01:00
danielgrippi
4f7dda6012
bang! kill redis cache.
2012-02-02 12:45:43 -08:00
Hrishi
f65fa90591
My first contribution to Diaspora , thank you Rekado
2012-02-02 12:59:45 +05:30
danielgrippi
310a0679f1
particpate stream, yo!
2012-02-01 16:05:16 -08:00
Maxwell Salzberg
9abbf151a0
changed some keys by accident
2012-02-01 13:39:02 -08:00
Maxwell Salzberg
d06ccb9ba9
first pass at strickly user level rename from like => pin. still need to update assets
2012-02-01 12:57:07 -08:00
Jonne Haß
e5fe6a2280
fix typo, sorry [ci skip]
2012-02-01 20:06:44 +01:00
Jonne Haß
de4c9a1289
add warning about common setup error manifesting in uninitialized constant Oink
2012-01-31 21:56:01 +01:00
Jonne Haß
f1de7f9be1
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2012-01-31 18:43:15 +01:00
Jonne Haß
52d4db36a8
updated 38 locale files [ci skip]
2012-01-31 18:43:09 +01:00
Jordi Mallach
c47108080e
Update Catalan translation to 44ff6ae.
2012-01-31 01:32:35 +01:00
