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
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