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

2168 commits

Author SHA1 Message Date
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
Jordi Mallach
7a228b166e It's 2011: replace <3 with ♥. Go UTF-8‽ ☺ 
The ♥ symbol was introduced in Unicode 1.1 and should be available on
fonts of all modern, UTF-8-aware operating systems.
 2011-10-26 15:07:55 +02:00
danielgrippi
dc742845c9 fix spelling on getting started [ci skip] 2011-10-25 17:50:09 -07:00
Gonzalo Rodriguez
a642a129ac Tweak newhere locale. Not necessarily people like topics they follow. 2011-10-25 01:55:36 -02:00
danielgrippi
5d54fc6c28 removed community spotlight stream link from right side 2011-10-24 20:14:28 -07:00
Maxwell Salzberg
d5e3033308 make a setting to check out the new getting started 2011-10-24 17:10:36 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Maxwell Salzberg
08bbce90a9 increase timeout on jobs to see if that helps 2011-10-24 16:01:13 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
d97d524a7b attempting to tell excon about certs f cent-os 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Jordi Mallach
f12d9b56a7 Avoid using “has just” constructs, as discussed in ddd152505e. 
Fix grammar for plurals for mentions and reshares, too.
 2011-10-23 20:35:28 +02:00
Jordi Mallach
84bd00577d Update Catalan translation of devise to fe78a69. 2011-10-23 20:18:01 +02:00
Jordi Mallach
89f5f6e727 Update Catalan translation to ddd1525. 2011-10-23 20:10:26 +02:00
Jordi Mallach
bfae64d805 Fix grammar for the singular case. 2011-10-23 20:08:11 +02:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
Gonzalo Rodriguez
ddd152505e Fix like notification message grammar. Fixes #2222. 2011-10-23 05:17:33 -02:00
Justin Thomas
f18846bf92 communtiy is community 2011-10-22 19:17:00 -07:00
danielgrippi
7577ad4e81 deprication support for featured_users key in application.yml. 2011-10-21 17:45:06 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
98ef5212f3 Merge branch 'tag_stream_api' 2011-10-16 15:47:20 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
58d496e146 MS SM WIP 2011-10-15 22:11:23 -07:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
4e17df17fc Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-15 15:06:11 +02:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Jordi Mallach
01aecabfae Update Catalan translation to 01d7b95. 2011-10-15 13:44:50 +02:00
danielgrippi
ce309ebad3 update application.yml.example to reflect redis cache changes 2011-10-14 15:49:06 -07:00
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo
12ddf00e16 Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text 
Issue 2136 wrong aspect button text
 2011-10-12 18:47:27 -07:00
Ilya Zhitomirskiy
d5d4b9d555 Merge pull request #2145 from bagilevi/fix-omniauth-rack-bug-1824 
Fixes omniauth & rack-1.2 bug #1824
 2011-10-12 16:13:51 -07:00
Daniel Grippi
238e106267 Merge pull request #2012 from Flink/deploy-resque-assets-fixed 
Added task to capistrano to copy assets of resque-web (fixed)
 2011-10-12 16:10:30 -07:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Pistos
cc1fea92e6 Whitespace cleanup. 2011-10-11 23:44:28 -04:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
Jonne Hass
8bc67f983c Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-11 14:07:31 +02:00
Jonne Hass
6ff2bdd300 updated locales and added sq, uk and en_1337 2011-10-11 13:03:11 +02:00
Dan Hansen
71681d1bc7 load mail jobs in an initializer so Resque::Helper.constantize doesn't throw UninitializedConstant 
when resque tried to get the constant "Mail" from the "Jobs" module it got the inherited constant "Mail" (ruby gem) instead of Jobs::Mail
 2011-10-09 23:39:56 -05:00
Levente Bagi
6e60d932c0 Fixes omniauth & rack-1.2 bug #1824 
Rack 1.2's request.url method is buggy, as it gets the host part from
HTTP_X_FORWARDED_HOST, but the port from SERVER_PORT (which should be
used in conjuction with SERVER_ADDR).

This way, if the app is run behind a reverse proxy, it will create a
URL with <public_host>:<private port>, and pass this to Facebook,
so Facebook will redirect back to the URL with the wrong port.

Upgrading Rack requires upgrade to Rails 3.1.

This temporary solution configures OmniAuth using a copy of the newer
version of Rack::Request.
 2011-10-09 01:03:22 +01:00
Gonzalo Rodriguez
7994c4d43f 1 new notifications must be 1 new notification 2011-10-08 21:36:58 -02:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Your Name
b8984e7eaf didn't like my language 2011-10-06 15:52:30 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
fa58fbe272 Typo on english locale 2011-10-06 00:42:56 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Jordi Mallach
3a62b10384 Updated Catalan translation to ad9dcd8. 2011-10-04 13:19:46 +02:00
Sarah Mei
ec1ae8c07e Aaaand now we need to install firefox too 2011-10-03 22:19:25 -05:00
Sarah Mei
f76aeb1b39 Apparently they forgot to install xvfb as well. 2011-10-03 22:06:23 -05:00
Sarah Mei
911d9094d8 Go back to copying in the /etc/init.d/xvfb script since the Travis workers apparently don't have it anymore. 2011-10-03 21:58:00 -05:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00