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

2790 commits

Author SHA1 Message Date
Jonne Haß
1f0f9dabc1 last minute updates to french locale 2013-02-17 14:52:25 +01:00
Jonne Haß
20f6034bbb fix missing quote in javascript.ca.yml 2013-02-17 14:10:37 +01:00
Jonne Haß
3111c805de Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca into develop 2013-02-17 14:08:39 +01:00
Jonne Haß
bfc811d912 updated 112 locale files [ci skip] 2013-02-17 14:08:36 +01:00
Jonne Haß
150f03489a remove obsolete thin.yml 2013-02-17 14:02:33 +01:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework 
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
 2013-02-17 13:40:10 +01:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop 
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
 2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 
From a quick look at the for us available databases this was not actually used in the wild.
 2013-02-01 22:20:31 +01:00
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Jonne Haß
cba76060bf ensure our locales are at the bottom of the load path, fixes #2614 2013-01-31 16:41:09 +01:00
fhsdi2
931e4c4f41 Fix uncapitalization of a word 2013-01-26 16:09:34 -02:00
Jonne Haß
b654fb2d02 one unicorn worker should be enough for development 2013-01-26 13:28:40 +01:00
Ruxton
40fdf3819b Added DailyMotion & Twitter oEmbeds 2013-01-25 22:31:44 +08:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Jordi Mallach
d795ed2e3e Update Catalan translation to 597ab20. 2013-01-09 01:31:58 +01:00
Jordi Mallach
56357ce0bd Updated Catalan translation to 2d3df3e. 2013-01-09 01:22:25 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor. 
Removed hack, replaced with a proper solution.
 2012-12-30 13:08:16 +01:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Yury Bulka
d8dae23bc2 Fix typos, small improvements to Ukrainian translation 2012-12-09 13:55:26 +02:00
Yury Bulka
ae55f5ab9d Fixed and improved Ukrainian translation 2012-12-09 13:24:02 +02:00
Jonne Haß
2fcf729f64 don't use a rails method in a pre-rails environment 2012-12-08 00:50:30 +01:00
Jonne Haß
459df9b735 Merge pull request #3791 from movilla/suggest_member 
Translation "suggest member" of Community Spotlight
 2012-12-06 09:34:01 -08:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
movilla
65376a604b Allow translation of "suggest member" of Community Spotlight 2012-12-06 13:15:34 +01:00
Jonne Haß
bf27cca03a Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead. 2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99 * made number of unicorn worker processes configurable 
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
 2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f Remove REEs garbage collection [ci skip] 
We are not using REE anymore, so...
 2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971 use file? instead of exists? to check for correct ca bundle path 2012-11-27 21:14:44 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
60aa1ffe2e post release version bump [ci skip] 2012-11-20 22:02:54 +01:00
Florian Staudacher
eea59b0918 Merge branch 'release/0.0.2.0' 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-11-20 19:11:48 +01:00
Jonne Haß
1af49a0477 updated 78 locale files [ci skip] 2012-11-20 18:54:27 +01:00
Jonne Haß
e9bccb8afe get rid of string concat of translatable strings in getting started 2012-11-18 17:24:43 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Besnik
1d3493909d updating sq locale 2012-11-06 19:46:51 +01:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
f91ca7d650 added short description to the server section [ci skip] 2012-10-27 11:45:26 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Florian Staudacher
e0d50c8522 bump version to 0.0.1.2 2012-10-24 19:54:37 +02:00
Florian Staudacher
f0eacc801b Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks 
rake tasks cleanup
 2012-10-21 06:33:46 -07:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
811ef66b1c No need for Gentoo having its own certificate_authorities example 2012-10-13 18:53:42 +03:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Jonne Haß
e6ec41930b Merge branch 'hotfix/0.0.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-10-09 22:37:53 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Jonne Haß
8493dfe86d post release version bump [ci skip] 2012-10-08 13:22:43 +02:00
Jonne Haß
1f9f0c2932 Changing release mode to true, hopefully the last commit ever violating the branching model. DO NOT BACKPORT THIS COMMIT TO DEVELOP 2012-10-07 15:08:21 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
bd9b4543dc updated 15 locale files [ci skip] 2012-10-07 14:19:48 +02:00
Jonne Haß
5b73176d07 make diaspora.yml.example a bit clearer about sections [ci skip] 
thanks to @hfase01 for pointing that out
 2012-10-01 15:43:21 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
Jonne Haß
f42c4799ac updated plural rules [ci skip] 2012-09-28 16:07:48 +02:00
Jonne Haß
468982f3cc updated 28 locale files [ci skip] 2012-09-28 16:07:37 +02:00
Jonne Haß
d04d6faab7 correct dumb typo in diaspora.yml.example 2012-09-28 14:54:45 +02:00
Jonne Haß
a0d60e7333 Remove unused rake tasks, make cumber rake file the vanilla one 2012-09-27 17:07:33 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
ce728f6b7b add possibility to embed a resque worker into the unicorn process 2012-09-26 20:19:38 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup 
traslation popup ignore user => /stream
 2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
24c1c908f7 remove routes to removed controller 2012-09-22 14:16:28 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization 
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
 2012-09-15 18:23:22 +02:00
Jonne Haß
3e935e1104 use present to check if redis_url is empty 2012-09-12 22:30:08 +02:00
Jonne Haß
70a9218ea5 add thread_safe true to redis initialization because resque does it too now 2012-09-12 22:17:14 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
51bde9bf66 updated 8 locale files [ci skip] 2012-09-11 18:40:54 +02:00
Jonne Haß
a9ebe42b9f turn mailer on in test env so the stubs can take action 2012-09-07 22:12:07 +02:00
Jonne Haß
d27408d8a9 set perform_deliveries, this should fix #3524 2012-09-07 21:46:13 +02:00
Jonne Haß
3ae76cd5eb updated 14 locale files [ci skip] 2012-09-06 15:47:32 +02:00
Jonne Haß
b1173950e4 updated 26 locale files, made Sinhala and Interlingua available [ci skip] 2012-08-31 21:01:37 +02:00
Jonne Haß
984db998d3 Merge pull request #3517 from ruby-ve/locale-es_VE 
new translation
 2012-08-28 17:10:07 -07:00
Jonne Haß
b7c18be1e7 updated 19 locale files [ci skip] 2012-08-29 00:12:38 +02:00
Johan
3e3701f325 adding devise.es-VE.yml es-VE.yml javascript.es-VE.yml 2012-08-28 02:50:04 -04:30
Maxwell Salzberg
61f40fc6bf Revert "rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985" 
This reverts commit b70165b97f.
 2012-08-28 00:19:35 -07:00
Maxwell Salzberg
b70165b97f rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985 2012-08-28 00:07:52 -07:00
Jonne Haß
e12ea34ed0 updated 17 locale files [ci skip] 2012-08-13 01:00:50 +02:00
Jonne Haß
311e20bf20 updated 12 locale files [ci skip] 2012-08-05 12:53:47 +02:00
Adrián Chaves Fernández (Gallaecio)
950ad57a49 Updated the Galician (gl) translation. 2012-08-05 08:25:10 +02:00
Jonne Haß
42b8e8f1ea if you have a : in a translatable string and no %{} you already know you're doing it wrong [ci skip] 2012-08-04 19:46:29 +02:00
Jonne Haß
87a091ced1 updated 25 locale files [ci skip] 2012-07-24 22:10:39 +02:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Jonne Haß
ec7ae5c2c9 fix gl locale 2012-07-12 13:18:12 +02:00
Jonne Haß
98d70d3be3 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-07-12 13:11:28 +02:00
Jonne Haß
6f5929c50f updated 6 locale files [ci skip] 2012-07-12 13:11:21 +02:00
Jordi Mallach
049c5e602e Catalan translation updated to 8c8ff1f. 2012-07-12 13:05:03 +02:00
Jordi Mallach
05eccde08e Update Catalan translation to 8c8ff1f. 2012-07-12 12:54:34 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
Adrián Chaves Fernández (Gallaecio)
17c4370894 Updated the Galician (gl) translation. 2012-07-08 14:58:58 +02:00
Jonne Haß
24f406073c updated 16 locale files [ci skip] 2012-07-08 01:53:03 +02:00
Lawrence Leonard "Larry" Gilbert
37b6045c04 Clarify warning shown when single_process_mode used in production 2012-07-04 18:02:40 -07:00
Jonne Haß
827bb82e5b make serbian translation available 2012-07-02 16:44:46 +02:00
Jonne Haß
168c0ee228 updated 41 locale files [ci skip] 2012-07-02 16:40:22 +02:00
Jonne Haß
8c8ff1f8b8 there's no need anymore to specify all possible pluralization keys unless there are other keys alongside them 2012-06-24 12:43:15 +02:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Jonne Haß
7955600533 updated 13 locale files [ci skip] 2012-06-21 16:18:12 +02:00
Maxwell Salzberg
51661091d5 Merge pull request #3385 from Raven24/federation-colors 
Federation logger stuff[ci skip]
 2012-06-15 11:55:25 -07:00
Florian Staudacher
0fb0bf00af be more specific in config, point to more info [ci skip] 2012-06-15 20:14:51 +02:00
Florian Staudacher
0ce411c11c fix startup error for integration envs 2012-06-15 15:30:49 +02:00
Jonne Haß
aa3a6f9439 updated 37 locale files [ci skip] 2012-06-14 15:53:18 +02:00
Florian Staudacher
acc62e7380 forgot to put new css file in precompile list [ci skip] 2012-06-12 13:19:05 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Adrián Chaves Fernández (Gallaecio)
994ece57f5 Updated Galician (gl) translation. 2012-06-10 12:57:09 +02:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Florian Staudacher
09cf60f794 use File.join when it's already there 2012-06-07 21:19:41 +02:00
Jonne Haß
46a01664bb fix minor typo: eliminate double spaces [ci skip] 2012-06-05 19:07:44 +02:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
64bf4a1f48 adding the ability to customize your open graph namespace 2012-06-01 17:31:34 -07:00
Jonne Haß
2773694ba3 minor spelling fix [ci skip] 2012-06-01 23:02:56 +02:00
Jonne Haß
0592eb025e updated 14 locale files [ci skip] 2012-05-31 17:22:58 +02:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577 add a podname app config var, and use it throughout the app 2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56 Merge pull request #3302 from movilla/new_login 
Translation new make something /stream [ci skip]
 2012-05-29 11:45:24 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
fechterjm
4011ac4ba4 ## their stream and get news about Diaspora, but if you don't want 
## your server to contact joindiaspora.com, set this to false:

should be

## their stream and get news about Diaspora, but if you want
## your server to contact joindiaspora.com, set this to false:
 2012-05-27 13:01:15 -03:00
Jonne Haß
2d39788ba3 updated 34 locale files [ci skip] 2012-05-25 23:34:31 +02:00
Hans Fase
5f38486ab8 Reverted "NewHere" camel-case. Looks like someone awesome fixed the problem. ;) 2012-05-24 23:54:04 -03:00
Maxwell Salzberg
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -07:00
movilla
a7f967c2c5 Translation new make something /stream 2012-05-23 00:43:45 +02:00
Jonne Haß
0030788a2c make pt-PT available [ci skip] 2012-05-22 17:57:25 +02:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Hans Fase
04c3187f4f Changed NewHere to lowercase. Otherwise posts will not show up in stream! > https://github.com/diaspora/diaspora/issues/3237 2012-05-21 03:13:46 -03:00
Jonne Haß
ccf3bc36f2 updated 20 locale files [ci skip] 2012-05-20 00:36:31 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
20a63e3497 make the jquery can default to false in development and test so test can run offline [ci skip] 2012-05-17 18:50:51 -07:00
Maxwell Salzberg
a6758c0832 Merge pull request #3264 from movilla/share_amparito 
Translation invitation Share this link /stream [ci skip]
 2012-05-16 17:48:14 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00