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

2307 commits

Author SHA1 Message Date
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 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
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
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
Jordi Mallach
67e907eef0 Merge branch 'master' of git://github.com/diaspora/diaspora 2012-01-31 01:13:56 +01:00
danielgrippi
bcbabc5fd2 Switch boilerplate for bootstrap 2 on mobile. [ci skip] 2012-01-29 11:51:47 -08:00
Lennart Prelle
9cf168cef2 readd paypal button id 2012-01-29 18:45:17 +01:00
Jakob Kramer
44ff6ae8d8 fixed a link titled 'RSS' linking to an atom feed 2012-01-29 15:20:34 +01:00
Jonne Haß
03f119ede7 fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip] 2012-01-29 13:09:03 +01:00
danielgrippi
60ff88c1e7 Use Resque.inline instead of custom code [ci skip] 2012-01-28 19:23:03 -08:00
Jordi Mallach
01712dd00a Update Catalan translation to 5bd929b. 2012-01-29 02:26:22 +01:00
Maxwell Salzberg
3be247f8ca remove unicorn intializer as we now do it in config.ru 2012-01-27 13:16:34 -08:00
danielgrippi
95b7e30e00 preload_app in unicorn 2012-01-27 11:42:51 -08:00
danielgrippi
5a78796ec0 Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders 2012-01-26 19:52:27 -08:00
Maxwell Salzberg
48941fbae1 DG MS; add rack-rewrite to handle forwarding old urls [ci skip] 2012-01-26 16:32:46 -08:00
danielgrippi
da9e57b2c9 added oink in dev mode 2012-01-26 13:18:58 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Maxwell Salzberg
53304df740 I can't test this at this momement. I will put it back in once i have a 
chance to test it first Revert "finally found a way to disable airbrake [ci skip]"

This reverts commit 8aafd56482.
 2012-01-24 15:42:39 -08:00
Maxwell Salzberg
335172c411 move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data 2012-01-24 15:42:25 -08:00
Jonne Haß
8aafd56482 finally found a way to disable airbrake [ci skip] 2012-01-25 00:28:28 +01:00
Maxwell Salzberg
a1aae2c3dc add airbrake back to resque 2012-01-24 14:58:36 -08:00
Maxwell Salzberg
ba010833c7 move newrelic and airbrake out of any group, as it is not loading at all 
if it is in any bundler group #confused
 2012-01-24 14:58:36 -08:00