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

2348 commits

Author SHA1 Message Date
Jordi Mallach
a6f68fa670 Update Catalan translation to e4f4f06. 2012-01-13 20:51:28 +01:00
Sarah Mei
e4f4f06404 Terminology clean up - remove references to Diaspora Handle, make capitalization of Diaspora ID consistent. 2012-01-13 11:24:27 -08:00
Jonne Haß
e96dd58cff Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-13 19:32:51 +01:00
Jonne Haß
e5663126d9 updated 80 locale files [ci skip] 2012-01-13 19:32:42 +01:00
Jordi Mallach
e898e2d03f Updated Catalan translation to c11fdb0. 2012-01-09 19:20:38 +01:00
Jordi Mallach
42dc12988a Updated Catalan translation to 1b8f78e. 2012-01-09 18:55:54 +01:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
d5a4f9eb98 use content_view for comments (markdown, tagging) 2012-01-07 20:19:47 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
danielgrippi
31fac53969 added blocks js model; load app.models.Post before any other model when loading assets 2012-01-07 14:23:27 -08:00
danielgrippi
5e88ca846a remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs 2012-01-07 14:23:27 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23:27 -08:00
danielgrippi
42276a73c8 remove old stream initialization from js pages; remove websocket js code 
from the layout; rename templates to have a .jst extension
(JavaScriptTemplate?)
 2012-01-07 14:23:26 -08:00
danielgrippi
02ca7a32f0 added reshare logic back (doesn't append it to the stream...) 2012-01-07 14:23:25 -08:00
danielgrippi
c95f4f30e7 add view.js to config/assets.yml 2012-01-07 14:23:24 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active; 
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
 2012-01-07 14:23:22 -08:00
danielgrippi
525fd3c4e4 make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function) 2012-01-07 14:23:22 -08:00
danielgrippi
f62b26fc73 put the frontend into its own folder; only use one routes file 2012-01-07 14:23:21 -08:00
danielgrippi
3f7d992a0b DH DG; added new routes for streams; fixed pagination 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Jonne Haß
a1c30ac096 updated 35 locale files [ci skip] 2012-01-07 00:00:30 +01:00
Maxwell Salzberg
fa55200e9c MS DC; as newrelic yml is always included, you need it in your bundle; also, make travis scripts noisy if they fail 2012-01-05 17:50:11 -08:00
Maxwell Salzberg
cc6596262c default newrelic to use ssl 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Jonne Haß
c0e4fa831a fix syntax error in production.rb 2012-01-05 20:17:30 +01:00
Maxwell Salzberg
0199949f3c move analytics to initializer, thx MrZYX 2012-01-05 10:55:29 -08:00
Maxwell Salzberg
5a0f948a85 better file requires in production.rb 2012-01-05 00:02:59 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
9cdfea02b0 add the GC profiling option for newrelic for 1.9.2; see: http://newrelic.com/docs/ruby/ruby-gc-instrumentation 2012-01-04 22:28:18 -08:00
Jonne Haß
4a260056c0 lets see if this fixes #1337 2012-01-04 15:33:41 +01:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Jonne Haß
296730de04 updated 12 locale files [ci skip] 2012-01-04 13:17:36 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Jonne Haß
a8136ed86b d'oh aka --amend 2012-01-02 21:11:47 +01:00
Jonne Haß
cc961d66e2 symbolize smtp_authentication setting to conform to rails docs 2012-01-02 21:08:57 +01:00
Jonne Haß
934175c49c updated 15 locale files [ci skip] 2012-01-01 12:55:03 +01:00
Jonne Haß
2268a992f7 make serve_static_assets setting configurable 2011-12-29 16:39:17 +01:00
Jonne Haß
4bfd03d6eb remove completly unused redis.yml 2011-12-29 15:53:27 +01:00
Jonne Haß
109c5b7a17 this should fix #2552 2011-12-26 23:21:04 +01:00
Jonne Haß
c766163422 pull in ka 2011-12-24 14:12:36 +01:00
Jonne Haß
f4b234088d updated 4 locale files [ci skip] 2011-12-24 14:10:23 +01:00
Jonne Haß
a8357388c9 updated 47 locale files [ci skip] 2011-12-24 00:59:36 +01:00
danielgrippi
5bbbad7c4f added missing pluralizations 2011-12-22 14:30:15 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
0866ebb962 remove unused GIT_INFO [ci skip] 2011-12-21 23:19:22 +01:00
Jonne Hass
a23a79f5b5 updated 148 locale files [ci skip] 2011-12-21 13:13:42 +01:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Jonne Hass
bbfb47b6a3 added fil, ms, te 2011-12-18 15:37:27 +01:00
Jonne Hass
54781aa71c updated 148 locale files [ci skip] 2011-12-18 14:53:08 +01:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
Jonne Hass
e6f614b21c improve pod_url docs [ci skip] 2011-12-15 16:39:54 +01:00
Jonne Hass
56f0457c03 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-15 14:01:53 +01:00
Jonne Hass
af66bfe840 updated 18 locale files [ci skip] 2011-12-15 14:01:32 +01:00
Jordi Mallach
3bfaf7ef8b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-12-12 13:48:03 +01:00
Jordi Mallach
38f06ae258 Update Catalan translation to 12d0eee. 2011-12-12 13:47:46 +01:00
Jordi Mallach
450d0de753 Update Catalan translation to e38cb41. 2011-12-12 13:27:31 +01:00
Jonne Hass
94aaa46a12 slight speed improvement by tweaking devise in the test env 2011-12-11 13:12:40 +01:00
Jonne Hass
dbdee43cc6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-11 05:11:21 +01:00
Jonne Hass
4e8d991487 updated 56 locale files [ci skip] 2011-12-11 05:11:12 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
Jonne Hass
0c00a90793 added readme to locales directory [ci skip] 2011-12-08 20:10:07 +01:00
Jordi Mallach
cf61b5d334 Fix error in Catalan translation. 2011-12-07 13:08:39 +01:00
Jonne Hass
4fad432a30 don't break expected update behaviour for now (disable mhtml creation of jammit) 2011-12-06 17:29:02 +01:00
Jonne Hass
4a996493bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-06 13:13:38 +01:00
Jonne Hass
38cdfa4ab7 updated 55 locale files [ci skip] 2011-12-06 13:13:28 +01:00
Jonne Hass
7a474e8199 small corrections to locale_settings.yml 2011-12-06 11:33:07 +01:00
Jordi Mallach
da6ff549e1 Update Catalan translation to 548c225. 2011-12-05 15:24:15 +01:00
Pistos
548c225102 Can haz idiomatic English? 2011-12-04 21:47:37 -05:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
Daniel Grippi
c27d0b8780 Merge pull request #2281 from justindthomas/backup-postgres 
backup task handles postgresql dumps
 2011-11-29 14:09:51 -08:00
Jonne Hass
2f3876ec64 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-29 21:02:55 +01:00
Jonne Hass
759015a309 updated 51 locale files [ci skip] 2011-11-29 21:02:43 +01:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
e16e28a7eb better english 2011-11-29 08:36:48 +01:00
Daniel Grippi
908d0b99a7 Merge pull request #2404 from torrancew/capistrano_colorized 
Capistrano colorized
 2011-11-28 09:11:10 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Jordi Mallach
963fe2cf76 Remove extra # in Catalan translation. 2011-11-27 22:30:45 +01:00
Jordi Mallach
c17d9973aa Update Catalan translation to 64a8083. 2011-11-27 05:16:30 +01:00
David Morley
64a8083744 add pp and toc for translation 2011-11-26 13:30:40 -08:00
Jonne Hass
8d6f1552e3 updated 11 locale files [ci skip] 2011-11-26 21:15:00 +01:00
Vittorio Cuculo
df45a628c5 Fix typo 2011-11-24 09:17:13 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Jonne Hass
bb356f07cb updated 62 locale files [ci skip] 2011-11-19 12:26:07 +01:00
Jonne Hass
e60f287fc7 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-17 14:53:52 +01:00
Jonne Hass
0e10d28bb0 updated 64 locale files [ci skip] 2011-11-17 14:53:37 +01:00
Jordi Mallach
5a0b70f644 Update Catalan translation to 09bad3a. 2011-11-16 22:13:01 +01:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Tray Torrance
c46c07f648 Added color definition file at config/cap_colors.rb 2011-11-15 09:06:15 -08:00
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
Tray Torrance
bbc165137f Adds capistrano_colors gem; deprecates custom red method 
Also adjusts current_git_branch to use Capistrano's logger for printing to
STDOUT
 2011-11-15 01:41:41 -08:00
Tray Torrance
76d31f3110 Hooks current_git_branch to before deploy:update 
Also refactors after deploy:symlink hooks
 2011-11-15 01:41:41 -08:00
Tray Torrance
0775f9032e Refactors require statements 2011-11-15 01:41:41 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Jonne Hass
ae8acdbfe1 typo [ci skip] 2011-11-14 22:10:18 +01:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
0e08c59827 do not disable resque web by default in production 2011-11-14 16:11:26 +01:00
Jonne Hass
6526e2f305 fix #2392 2011-11-13 22:37:18 +01:00
Jonne Hass
4013335be9 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-12 22:14:13 +01:00
Jonne Hass
1cf1c5ce3b updated 9 locale files [ci skip] 2011-11-12 22:13:59 +01:00
Jonne Hass
5437b6fbd0 okay that didn't work, lets try it this way 2011-11-12 11:36:16 +01:00
Jonne Hass
3c980b7201 added fix for using sendmail with exim, the default -t argument behaves different so lets take it out 2011-11-12 11:24:49 +01:00
Jordi Mallach
2dbf467490 Update Catalan devise translation to f2123d9. 2011-11-12 03:59:27 +01:00
Jordi Mallach
e4f91ddf93 Fix typo. 2011-11-12 03:59:10 +01:00
Jordi Mallach
0aaa262de1 Remove trailing tab character. 2011-11-12 03:58:29 +01:00
Jonne Hass
36a68f5272 specify protocol for url helpers in action mailer 2011-11-11 22:49:18 +01:00
Jonne Hass
27996e9bb2 updated 54 locale files [ci skip] 2011-11-11 21:39:20 +01:00
Jonne Hass
907887b839 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-10 14:25:15 +01:00
Jonne Hass
67b8881198 updated 15 locale files [ci skip] 2011-11-10 14:24:49 +01:00
Jordi Mallach
5730aea142 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-11-10 03:16:30 +01:00
Jordi Mallach
bfbb8e5f8f Update Catalan translation to eb6fc5f. 2011-11-10 03:15:56 +01:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00
Lennart Prelle
b9c57111f8 deleted german #newhere translation 2011-11-09 20:40:10 +01:00
Lennart Prelle
f2997f5146 change #newhere to translation 2011-11-09 20:38:06 +01:00
Jonne Hass
253f948841 updated 135 locale files [ci skip] 2011-11-09 18:34:07 +01:00
Jonne Hass
59b99fe917 pluralization for show more comments, fix #2350 2011-11-09 11:07:35 +01:00
Maxwell Salzberg
d9cbd32d88 not all tags are happy tags 2011-11-08 18:03:28 -08:00
Daniel Grippi
e2dda130d9 redis cache requires redis 2.4 or later (re: sorted sets) [ci skip] 2011-11-08 16:02:23 -08:00
Jonne Hass
747539bd9a added note about redis version [ci: skip] 2011-11-09 00:53:19 +01:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -08:00
Jonne Hass
a7bed99411 updated 18 locale files [ci skip] 2011-11-08 17:27:17 +01:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
Jonne Hass
56ab1991c2 updated 55 locale files [ci skip] 2011-11-07 12:35:43 +01:00
Jonne Hass
78e03056e8 little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set 2011-11-06 23:03:20 +01:00
Raphael Sofaer
eb4c588476 Merge pull request #2336 from dmorley/patch-3 
blacklist example admin username
 2011-11-06 09:11:03 -08:00
David Morley
d848537df8 blacklist example admin username 2011-11-06 09:07:13 -08:00
Jonne Hass
50baa4ba92 also link to the translated tag 2011-11-06 18:06:26 +01:00
Jonne Hass
a1eee6e90f made help tags translatable so that local communities can take care of the new users, also fixed #2327 2011-11-06 16:43:13 +01:00
Jonne Hass
80cdcd4edd supress resque retries 2011-11-06 16:05:23 +01:00
Jonne Hass
ff590d1080 improved UX for ca_file setting [ci:skip] 2011-11-06 02:39:31 +01:00
Jonne Hass
2b5963437f updated 54 locale files [ci skip] 2011-11-05 23:44:12 +01:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
Ilya Zhitomirskiy
f3183a11e1 message explaining that we're populating things in the background 2011-11-04 16:20:51 -07:00
Pistos
db94689dfa Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5 Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." 
This reverts commit 5c8ddc3ea6.
 2011-11-03 23:54:23 -04:00
Pistos
5c8ddc3ea6 Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:44:46 -04:00
Jonne Hass
b4e974161b updated 135 locale files [ci skip] 2011-11-03 23:10:07 +01:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
danielgrippi
07f713f46c change 'mute' to 'ignore' for now; fix specs; repopulate cache upon 
contact removal
 2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself 2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Raphael Sofaer
609894fb70 Fix personalized, closing #2308. Thanks Pistos. 2011-11-03 15:20:58 -04:00
Jonne Hass
d0d31a6f78 updated 98 locale files [ci skip] 2011-11-02 23:07:52 +01:00
Daniel Grippi
ed029b2fbd Merge pull request #2251 from manuels/retry_federations 
Retry federation if remote pod is down
 2011-11-02 14:09:30 -07:00
Justin Thomas
e50f0cfdb2 removed dependency on /tmp, improved retention period compliance, maintain legacy commands 2011-11-01 15:24:04 -07:00
Dan Hansen & Maxwell Salzberg
697ad1e84f add new here to right section 2011-11-01 17:19:05 -05:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
Maxwell Salzberg
24545743e2 document how to include message bus api key 2011-10-31 16:21:00 -07:00
Ilya Zhitomirskiy
d6824dcc49 Revert "remove custom logging, added hoptoad backend directly" 
This reverts commit ea72b1ae57.
 2011-10-31 15:12:08 -07:00
Ilya Zhitomirskiy
d868b79937 Revert "require false, in gemfile and require it in the app if configured" 
This reverts commit 6fb213a961.
 2011-10-31 15:11:49 -07:00
Dennis Schubert
60c4e13435 Merge pull request #2279 from lprelle/language_select_for_invitations 
Language select for invitations
 2011-10-31 14:35:38 -07:00
Ilya Zhitomirskiy
6fb213a961 require false, in gemfile and require it in the app if configured 2011-10-31 14:24:29 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
ea72b1ae57 remove custom logging, added hoptoad backend directly 2011-10-31 12:38:00 -07:00
Ilya Zhitomirskiy
82fabbadd1 Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)" 
This reverts commit 95aac2f352.
 2011-10-31 12:38:00 -07:00
Jonne Hass
419e4cd41a added vi and de_formal; updated locales 2011-10-31 20:18:18 +01:00
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Daniel Grippi
d6b68d2f9b Merge pull request #2273 from Pistos/donate-optional 
Make the donation form (right sidebar) optional.
 2011-10-29 21:00:46 -07:00
Sarah Mei
7564089db8 Update tag following flash messages 2011-10-29 08:20:02 -07:00
Sarah Mei
5a1d1386d5 Let's see if the GC settings on ree are helping or hurting. 2011-10-29 08:10:33 -07:00
Pistos
d643f7e893 Make the donation form (right sidebar) optional. Show or hide via application.yml . 2011-10-29 00:42:09 -04:00
Jonne Hass
4b2b2b53b6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-28 12:47:01 +02:00
Jonne Hass
b0d6139bed updated 84 locale files [ci skip] 2011-10-28 12:46:57 +02:00
Jonne Hass
da06a950b6 looks like travis has Firefox and Xvfb available again, so no need for installing it 2011-10-28 10:04:16 +02:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)" 
This reverts commit 3d8f971ca9.
 2011-10-27 23:53:55 -07:00
danielgrippi
a01138672e Revert "remove contact-edit from assets" [ci skip] 
This reverts commit efdf597c0d.
 2011-10-27 23:53:33 -07:00
Dan Hansen
efdf597c0d remove contact-edit from assets 2011-10-27 22:21:34 -05:00
danielgrippi
f7afcd96b4 that good, huh? 2011-10-27 20:16:42 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
danielgrippi
0b18e47b82 connect_to_comment text for federated users 2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99 fix oembed spec; prevent people from commenting on posts that wont federate 2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Maxwell Salzberg
7e73865147 mangle oembed stuff to prevent content warnings, only support services that work when you mangle them; please let us know if your favorite service works when you gsub out all of the https links 2011-10-26 15:11:31 -07:00