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

1631 commits

Author SHA1 Message Date
Richard
1b83b6942b Merge branch 'develop' into feature/4509-image-upload-response-errors 2013-11-28 21:46:01 +11:00
Richard
3671f09b1d checking file upload response error and giving an error alert if there is one. 2013-11-28 12:26:30 +11:00
Jonne Haß
05fa086caa replace ugly 'followed by' grammar assumption at tags#show with proper version 2013-11-20 23:47:50 +01:00
flaburgan
1833edfd67 Add actions to contacts/index.html page 2013-11-12 19:10:00 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
Jonne Haß
1da6664712 updated 44 locale files [ci skip] 2013-09-24 13:46:59 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Jonne Haß
d4504589c9 add translation for connect to wordpress 2013-09-20 18:54:13 +02:00
Jonne Haß
a2b6740fed pluralize admins.user_search.you_currently 2013-09-20 13:21:33 +02:00
flaburgan
0c8adb2070 Add link to the faq in the right panel 2013-09-18 15:53:04 -07:00
Fabian Rodriguez
1dbf9642c8 Merge pull request #4515 from fubik/develop 
Disables submit button in sign up form after submission to avoid email already exists error
 2013-09-12 14:32:55 -07:00
Jonne Haß
f65671b29e updated 73 locale files [ci skip] 2013-09-12 22:52:23 +02:00
Titouan Lorieul
26a3f56c22 Disables submit button in sign up form after submission to avoid email already exists error 2013-09-11 20:49:23 +02:00
sjain1107
5223a2d906 Adding ignore user icon 
Adding ignore user icon

Added jquery

Changed profile.js
 2013-09-04 14:47:23 +02:00
Nils Vogels
a3f3bcf6ef Adjusting the description of the 404 message, in order to avoid having 
to specify why users got a 404, and possibly leaking information while doing this

See discussion in #3717 for rationale on not implementing specific HTTP codes
This solves around #3717 and #3728

Adjusting travis breakage
 2013-08-30 14:42:19 +02:00
Jonne Haß
38f01b9cd5 remove extra is in help section [ci skip] 2013-08-27 09:42:34 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
748b38434f update plural rules and make bosnian available 2013-08-26 13:16:51 +02:00
Jonne Haß
5238004eff updated 58 locale files [ci skip] 2013-08-26 11:06:29 +02:00
Jonne Haß
348a7b6c5b update branding 2013-08-25 18:21:14 +02:00
Jonne Haß
0d1bf85931 drop outdated hints from right sections 2013-08-25 18:21:14 +02:00
Steffen van Bergerem
0cf50838e1 Add 'no comments' message to SPV 2013-08-23 01:36:58 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
Jonne Haß
eea3818c45 streamline new profile sidebar elements 
* titlecase "Photos"
* Pull "See all" to the left (to match up with  "View all")
* Replace "See all" with "View all"
 2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
Dennis Schubert
051cceaf34 Merge pull request #4371 from MrZYX/bump_devise 
Update devise
 2013-08-16 14:13:13 -07:00
Sean Tilley
7eb4707606 Merge pull request #4382 from goobertron/develop 
Update javascript.en_1337.yml
 2013-08-10 00:41:26 -07:00
goobertron
00a63d381a Update javascript.en_1337.yml 
Corrected a couple of spelling mistakes (don't ask me what I was doing looking in the 1337 file...!)
 2013-08-10 00:45:59 +01:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02:00
Jonne Haß
54311cb226 Merge pull request #4359 from goobertron/4357-locator-typo 
Correct grammar error in Locator feature - fix 4357
 2013-08-07 00:23:42 -07:00
goobertron
005e12c3f7 My first attempt at a commit. Simply correcting a grammatical error in the Locator feature - 'Near from' becomes 'Posted from'. 
I hope I have done this correctly. Please forgive me if not.
 2013-08-06 20:13:48 +01:00
Oliver Azevedo Barnes
55a58713a5 Issue #4124 Check write access before authorizing Twitter 2013-08-05 13:52:19 -05:00
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948 
Show the user if a contact is sharing with them when viewing their profile page
 2013-06-29 10:16:41 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Jonne Haß
0bc1cb7177 make wolof and western frisian available 2013-06-28 16:10:35 +02:00
Jonne Haß
464cc34177 updated 37 locale files [ci skip] 2013-06-28 16:10:35 +02:00
Adrián Chaves Fernández (Gallaecio)
42bccb2bfc Updated the Galician (gl) translation 2013-06-27 06:45:26 +02:00
Florian Staudacher
44fbb6472f Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin 2013-06-23 13:38:48 +02:00
David Thompson
f7cceecb52 Add PeopleHelper#sharing_message method and english localized message text. 2013-06-19 22:03:37 -04:00
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Jonne Haß
1c61172b14 updated 186 locale files [ci skip] 2013-05-19 04:49:24 +02:00
Marco Gallardo
4aab8762fa Locator feature 
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
 2013-05-02 17:31:53 -05:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop 
Conflicts:
	Changelog.md
 2013-04-10 18:24:47 +02:00
Diaspora Europe
783d98745a added to admin section: which users are under the age of 13 #1283 2013-04-08 16:50:33 +02:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
embs
4ef37c64be Add explanation to services index page. Closes #3064 2013-04-04 15:51:11 -03:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Florian Staudacher
472649f0d7 Merge pull request #4050 from Flaburgan/patch-2 
Update en.yml
 2013-03-16 04:29:38 -07:00
Antoine D
fa1d0ce68e Update en.yml 
Only one sentence was not in future.
 2013-03-14 20:42:04 +01:00
Adrián Chaves Fernández (Gallaecio)
3d84467532 Updated the Galician (gl) translation. 2013-03-03 21:15:07 +01:00
movilla
76b1e9b0dc Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
Jonne Haß
f3093ca8ae Merge pull request #3864 from Raven24/aspect_memberships 
[WIP] aspect membership dropdown Backbone.js rework
 2013-02-17 05:54:12 -08:00
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
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
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
fhsdi2
931e4c4f41 Fix uncapitalization of a word 2013-01-26 16:09:34 -02: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
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
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +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
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ß
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ß
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ß
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
Besnik
1d3493909d updating sq locale 2012-11-06 19:46:51 +01:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -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ß
bd9b4543dc updated 15 locale files [ci skip] 2012-10-07 14:19:48 +02: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ß
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ß
51bde9bf66 updated 8 locale files [ci skip] 2012-09-11 18:40:54 +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
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
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
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
Jonne Haß
aa3a6f9439 updated 37 locale files [ci skip] 2012-06-14 15:53:18 +02: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
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
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
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
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
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
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
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
movilla
d394272e5d Translation invitation Share this link /stream 2012-05-16 00:56:34 +02:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Jonne Haß
9950342599 updated locales [ci skip] 2012-05-15 17:09:13 +02:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Benjamin Neff
5db6604d79 remove old invite_code_url from locales 2012-05-13 03:21:56 +02:00
Benjamin Neff
9abfb6a266 make invite url clickable 2012-05-13 03:17:16 +02:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
Jonne Haß
d444a1dc56 updated 47 locale files [ci skip] 2012-05-08 12:21:45 +02:00
Maxwell Salzberg
2f618f6dde Merge pull request #3230 from movilla/close-amparito 
Translation "[X] Close" photo-post [ci skip]
 2012-05-06 10:09:04 -07:00
movilla
bca5d3ffa7 Translation "[X] Close" photo-post 2012-05-05 14:39:58 +02:00
Adrián Chaves Fernández (Gallaecio)
52964ec7c9 Updated the Galician translation. 2012-05-05 13:21:48 +02:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
Liam Nicholson
01c51d26f5 Fix 'go' Admin Translation 2012-05-03 20:24:25 +01:00
Jonne Haß
5b7342bb8e updated 34 locale files [ci skip] 2012-05-03 12:12:12 +02:00
movilla
4d3ba4f274 Little traslation "HOME" /post 2012-05-01 17:43:51 +02:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
Florian Staudacher
462959fbcd Merge pull request #3190 from diaspora/reshare-flash 
use flash message instead of just appending reshares to the current stream
 2012-04-28 10:04:40 -07:00
Sean Tilley
f2bbbec49e Merge pull request #3192 from ktkaushik/patch-1 
Updated readme. [ci skip]
 2012-04-27 11:07:16 -07:00
Jonne Haß
560da5ce98 Merge pull request #3193 from ktkaushik/better_pirate_translation 
Modified Pirate Translation making it better.
 2012-04-27 09:48:54 -07:00
Kaushik Thirthappa
1dae3d9f47 Modified Pirate Translation making it better. 2012-04-27 21:51:13 +05:30
Kaushik
9ab6bf1af5 Updated readme. 2012-04-27 16:28:24 +05:30
Florian Staudacher
0dee8aae36 [reshares] display flash message instead of just appending it to the stream (fixes #2094) 2012-04-27 00:57:20 +02:00
Jonne Haß
8cea8715eb updated 6 locale files [ci skip] 2012-04-26 15:43:09 +02:00
Jonne Haß
eb2eaa8ea1 updated 50 locale files [ci skip] 2012-04-25 22:49:40 +02:00
Maxwell Salzberg
7fb3e8e901 for now; Revert "updated 50 locale files [ci skip]" 
This reverts commit a9dd997f23.
 2012-04-24 12:20:58 -07:00
Jonne Haß
a9dd997f23 updated 50 locale files [ci skip] 2012-04-24 18:14:01 +02:00
movilla
cc329594c5 Add translation app/views/admins/user_search.html.haml - Admin Panel 2012-04-24 02:05:13 +02:00
Jonne Haß
25f6df230d Merge pull request #3150 from Gallaecio/l10n-gl 
Updated the Galician translation.
 2012-04-17 13:59:43 -07:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02:00
Jonne Haß
959523aae8 updated 22 locale files [ci skip] 2012-04-16 23:58:57 +02:00
Jordi Mallach
00e42b11f2 Fix typo in Catalan translation (thanks to David Bas@JD). 2012-04-15 21:54:08 +02:00
Jordi Mallach
c9fff4a435 Update Catalan translation to 4d92653. 2012-04-15 19:09:01 +02:00
Jordi Mallach
4d92653874 Fix typo in key name: seperated → separated. 2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d Fix typo in key name: autorize → authorize. 2012-04-15 19:05:03 +02:00
Jordi Mallach
7b73c62a0b Update Catalan translation to cac2b1e. 2012-04-15 18:56:55 +02:00
Adrián Chaves Fernández (Gallaecio)
0956fbbdb6 Improved the Galician translation and fixed a quoting error. 2012-04-14 22:44:13 +02:00
Adrián Chaves Fernández (Gallaecio)
c659b8f393 Updated the Galician translation. 2012-04-14 22:29:52 +02:00
Jonne Haß
d20af894a4 whoops, dashes and symbols, ya know, I'm sorry [ci skip] 2012-04-12 20:23:16 +02:00
Jonne Haß
16f201fea5 art_nvi -> art-nvi [ci skip] 2012-04-12 18:27:16 +02:00
Jonne Haß
400bfd19d8 updated 55 locale files [ci skip] 2012-04-11 22:14:27 +02:00
Jonne Haß
cac2b1e10b lets just avoid no and yes as keys in YAML, too many issues. Thanks! [ci skip] 2012-04-11 22:06:33 +02:00
Jonne Haß
de3e157698 Revert "updated 14 locale files [ci skip]" 
This reverts commit a0a804e88b.
 2012-04-11 22:01:28 +02:00
Jonne Haß
a0a804e88b updated 14 locale files [ci skip] 2012-04-11 21:56:42 +02:00
Maxwell Salzberg
0eb946497f Merge pull request #3101 from despora/fallback_for_donation 
added fallback for donation
 2012-04-09 10:24:20 -07:00
Jonne Haß
b59c54c131 apparently a plain no in YAML evaluates as false, even as key 2012-04-09 15:47:32 +02:00
Jonne Haß
f6cb204699 updated 14 locale files, added estonian [ci skip] 2012-04-09 15:13:00 +02:00
Jonne Haß
bc983ee7d2 remove copy-pasta fail by me 
Uh I'm sorry about that, why did nobody every complain about this? oO
 2012-04-09 14:28:53 +02:00
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master 
email-invitation translation error in subject and body
 2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3 
Add translation /authorizations fix image
 2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Besnik
62c4469a9c using other quotes throughout the file 2012-04-06 23:21:40 +03:00
Besnik
44f48f7ae1 using other quotes throughout the file 2012-04-06 23:21:00 +03:00
Besnik
866524aff2 update-for-sq-locale - adding javascript.sq.yml 2012-04-06 20:13:30 +03:00
Besnik
65c698b448 update-for-sq-locale - adding devise.sq.yml 2012-04-06 20:13:30 +03:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip] 
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
 2012-04-05 15:55:00 +02:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile 
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
 2012-03-29 12:14:35 -07:00
movilla
2d1393b0c5 Add translation: via mobile 2012-03-29 17:33:51 +03:00
Jonne Haß
67a2f29e84 updated 12 locale files [ci skip] 2012-03-27 13:07:04 +02:00
Jonne Haß
37d4f97764 updated 22 locale files [ci skip] 2012-03-23 13:26:16 +01:00
movilla
3b2725f133 Comprobación para el castellano para app/views/admins/correlations.haml 2012-03-22 21:57:29 +01:00
movilla
1c14f4bdf3 Update en.yml for translation app/views/admins/correlations.haml 2012-03-22 21:51:21 +01:00
movilla
c8c708930f Añadida comprobación en castellano 2012-03-22 17:02:51 +01:00
movilla
708c61bc2f Upload en.yml for translation /app/views/admins/_admin_bar.haml 2012-03-22 17:01:12 +01:00
movilla
2d32595db6 Añadida traducción en castellano para comprobar 2012-03-21 15:41:53 +01:00
movilla
965c30f406 Update config/locales/diaspora/en.yml 2012-03-21 15:37:54 +01:00