Jason Robinson
69c3566958
Maintenance feature to remove old users
...
Add Sidetiq webview to the Sidekiq monitoring panel
Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq
Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.
Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
2014-10-16 22:53:08 +03:00
Jonne Haß
720ec1c64a
make nds and en_valspeak available
2014-10-12 15:20:20 +02:00
Jonne Haß
061dfab00b
updated 83 locale files [ci skip]
2014-10-12 15:20:20 +02:00
Sandip Trivedi
d7e8e2ce2c
Replaced jquery.textchange.js vendored asset with a bower package #5194
2014-10-06 18:54:50 -04:00
Florian Staudacher
4f87a47d0a
Merge pull request #4657 from svbergerem/bootstrap-people-view
...
Redesign profile page and port to Bootstrap
2014-10-06 15:09:08 +02:00
Jonne Haß
eac3f042a4
Reset dynamic configuration after each example in the testsuite
2014-10-04 00:59:03 +02:00
Brandon
805e476c34
Fixed typo
...
From "Seams" to "Seems"
2014-10-01 06:41:25 -04:00
Steffen van Bergerem
976ff0fcda
Redesign profile page and port to Bootstrap
2014-10-01 12:28:56 +02:00
Florian Staudacher
c7b4b77ce8
Merge pull request #5209 from jhass/federation_improvements
...
Federation improvements
2014-09-27 16:18:37 +02:00
Jonne Haß
2d2217b677
Monkey patch Sidekiq logger
...
Sidekiq 3.0 initialized the logger early before we had a chance
to set the logfile. Then we set a new logfile causing the old
logger to be closed. Since the default logger points to stdout,
it got closed causing all kinds of issues.
2014-09-20 03:01:43 +02:00
Florian Staudacher
1f724dd123
* add a (hash)tag helper for handlebars
...
* re-add stream on profile page
* more controller refactoring
2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc
* refactored text direction detector into helper (also for handlebars)
...
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483
* create a handlebars view for the profile header
...
* unblock the user via ajax
2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61
* cleanup people_controller#show, add people_controller#stream for json
...
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
2014-09-15 01:37:23 +02:00
Jonne Haß
9c88fde821
Switch Faraday adapter to typhoeus
...
It uses curl which has less problems connecting
to a missconfigured IPv6 host (falls back to v4)
2014-09-07 10:47:47 +02:00
Jonne Haß
aa09f0cbb1
Merge branch 'release/0.4.1.0' into develop
2014-09-03 23:38:27 +02:00
Jonne Haß
e03f7f738b
make es-CO available
2014-09-03 23:38:20 +02:00
Jonne Haß
b424b94660
updated 45 locale files [ci skip]
2014-09-03 23:14:23 +02:00
Jonne Haß
5bbf8cd341
Merge branch 'release/0.4.1.0' into develop
2014-09-02 14:27:07 +02:00
Steffen van Bergerem
a627f65ef9
Correct default rails environment
2014-09-02 14:25:51 +02:00
Steffen van Bergerem
854dcf04db
Display new conversation form on conversations/index
2014-08-31 18:02:37 +02:00
Jonne Haß
f1ab434b18
Merge pull request #5153 from svbergerem/redesign-contacts-page
...
Redesign contacts page
2014-08-27 10:01:41 +02:00
Steffen van Bergerem
ff84ee0485
Small style changes, add tests
2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09
Add contacts search and port aspect membership save/destroy to backbone
2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883
Display all contacts in the contact list
2014-08-26 21:41:02 +02:00
jaideng123
1de67281f4
Simplified range check
2014-08-26 14:04:28 -05:00
jaideng123
f53001577e
Increase max length of simple_captcha to 12
2014-08-26 13:24:00 -05:00
Jonne Haß
541d5580e0
Fix loading issues in rails_admin
...
Properly declare Admin module and explicitly list models to be
display in rails_admin
2014-08-26 02:57:47 +02:00
Jonne Haß
cb6c79a885
Merge pull request #5151 from khall/issue_5090
...
Fix for issue 5090
2014-08-26 01:14:45 +02:00
Jonne Haß
8de29bc28d
bump faraday and faraday_middleware. closes #4950
2014-08-25 19:16:55 +02:00
khall
a9fd16db3e
Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.
2014-08-24 13:28:57 -07:00
Jonne Haß
2619beb157
Merge pull request #4481 from diaspora/rails4
...
Port to Rails 4
2014-08-24 13:42:31 +02:00
Jonne Haß
a1e547f8d7
Merge pull request #5105 from goobertron/jquery_default
...
Change default for jQuery CDN to false
2014-08-24 13:36:57 +02:00
Jonne Haß
5c60f10022
start new development cycle
2014-08-24 13:28:02 +02:00
Jonne Haß
527fb559e5
Bump version to 0.4.1.0
2014-08-24 13:17:29 +02:00
Jonne Haß
d6d65cd0fd
apply rails 4 todos and fix specs after rebase
2014-08-23 16:47:57 +02:00
Jonne Haß
397606bc44
turn parameter wrapping for AR::B#to_json back on
2014-08-23 16:38:57 +02:00
Jonne Haß
d75632401b
make everything boot again
2014-08-23 16:34:00 +02:00
Jonne Haß
59d60ff947
remove strong_parameters initializer
2014-08-23 16:34:00 +02:00
Jonne Haß
ec877e3784
Merge pull request #4978 from jhass/bump_acts_as_taggable_on
...
Bump acts-as-taggable-on
2014-08-18 12:20:19 +02:00
Jonne Haß
ae24495c7d
Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts
...
Remove ignored peoples posts without refresh (II)
2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613
Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter
...
Added Mark all in filter as read feature
2014-08-18 11:30:18 +02:00
jaideng123
406397988b
Made wording more clear, refactored read_all
2014-08-17 11:16:30 -05:00
jaideng123
6456a441fe
Modified behavior of mark all as read button
2014-08-17 10:12:23 -05:00
Jason Robinson
e58f0b2ad4
Terms of service and privacy policy feature.
...
If enabled, terms of service link will be shown in sign up page.
2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056
refactor global event broker and user blocking from stream posts
2014-08-17 14:05:56 +02:00
Steffen van Bergerem
022bc1007d
Remove unused code
2014-08-16 11:47:31 +02:00
op48
66fcfcfcbc
Ignoring validation for last poll answer input
...
last input field is only deleted if there are more than three input fields and the last one is empty
poll is validated only if the last input is empty, and the first three have been filled
Removed duplicate remove last answer.
Dont need to check that the last value is populated as we are ignoring last value
Fixing poll step
Placeholder text edited
Fixed translations for poll answer placeholder text
Removed numbers on publisher option
Removed numbers in placeholder for poll answers
2014-08-13 13:40:14 +01:00
goobertron
93a2b36405
Change default for jQuery CDN to false.
2014-08-05 23:32:45 +01:00
Jonne Haß
3f21593111
Merge pull request #5088 from goobertron/defaults
...
Clarify explanations and defaults in diaspora.yml.example
2014-08-05 21:52:09 +02:00
Faldrian
d52737664b
removed non-english translations
2014-08-03 12:55:43 +02:00
Faldrian
6be6d6d504
corrected english translation
2014-08-02 00:34:02 +02:00
Faldrian
a2a37742e4
added keyboard shortcut help topic
2014-08-01 22:13:55 +02:00
MrFrety
686a8776a5
Minor edit: Plural s
2014-08-01 17:13:38 +02:00
goobertron
18a9e15022
Revert so defaults are now placed in commented out settings
2014-07-31 12:05:06 +01:00
goobertron
a4140499c1
Removed stats hub address, other minor tweaks
2014-07-31 11:53:35 +01:00
goobertron
49be5b82fe
Clarify explanations and defaults in diaspora.yml.example
2014-07-31 11:42:18 +01:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5
Updated the Galician (gl) translation
2014-07-27 09:33:50 +02:00
theatre-x
d348f59d5d
Fixed a typo
...
From "gurantee" to "guarantee".
2014-07-20 03:40:54 -04:00
arlogn
2394c3df39
flexible font-size for sign_in podname huge text
2014-07-06 19:18:21 +02:00
Florian Staudacher
13b716a449
allow admins to close user accounts from the backend
...
* thanks to @maxwell for the initial work on this
port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu
some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying
add changelog entry
2014-07-01 23:33:15 +02:00
Maxwell Salzberg
cc53e1762b
A podmin can now disable a spam account from the interface.
2014-07-01 17:51:39 +02:00
Pablo Cuadrado
45d04a44ea
added title_header key for the Help header, only for EN lang so far
2014-07-01 06:19:29 -03:00
Jason Robinson
c475a3985e
start new development cycle
2014-06-22 19:32:23 +03:00
Jason Robinson
51ecae1b77
bump to 0.4.0.0
2014-06-22 19:01:31 +03:00
Jonne Haß
d3ac1dbf90
updated 77 locale files [ci skip]
2014-06-22 15:08:40 +02:00
Jonne Haß
72d1ed8f7d
bump acts-as-taggable-on
2014-06-01 18:42:51 +02:00
Jason Robinson
ad0982f35e
Remove custom bookmarklet error message.
...
Flash error is shown on bookmarklet post error. On error, return post_something message to form
2014-06-01 15:37:54 +03:00
Jason Robinson
6fd4894997
Add error flash message to publisher on error from server
2014-06-01 13:21:45 +03:00
Jonne Haß
1e09814b13
Enable Rails autoloading in rake tasks
...
Then environment task disables, eager loading breaks with Devise
and requiring all needed files would be a mess
2014-05-26 23:58:31 +02:00
Jonne Haß
bdaa32e70d
updated 83 locale files [ci skip]
2014-05-17 11:52:31 +02:00
Lukas Matt
6d6ebd297e
Do not try to render posts/comments which are not present
...
refs diaspora/diaspora#4959
2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e
Added confirm-dialog to report-delete-button
...
* changed button description
* replaced links with buttons
2014-05-15 07:23:44 -04:00
Lukas Matt
1a0c9f5983
Make report-type translatable
2014-05-15 07:23:43 -04:00
Lukas Matt
26d0c81dae
Added the ability to disable report-email-notification
...
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
2014-05-15 07:23:43 -04:00
Lukas Matt
ed96ddac98
Display status when the user send a report
2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940
It is now possible to report comments
...
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec
refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
2014-05-15 07:23:43 -04:00
Oliver Azevedo Barnes
aec0c700b3
Add account_deleter.rb to load_libraries initializer
2014-05-07 14:36:18 -05:00
Florian Staudacher
0d51bba959
port bookmarklet to Backbone.js, use gon for params ( fixes #4931 )
2014-04-19 17:41:21 +02:00
Jason Robinson
356096a7eb
Merge pull request #4836 from MrZYX/message_renderer
...
Introduce message renderer
2014-04-13 15:00:46 +03:00
Jason Robinson
ee3a9f9be0
Merge pull request #4912 from goobertron/settings
...
Reorder items on settings page and improve wording
2014-04-12 21:37:52 +03:00
Jason Robinson
6947a1945c
Merge pull request #4883 from MrZYX/uuid
...
Use uuids for guid generation
2014-04-11 16:40:57 +03:00
goobertron
63abe9055b
Reorder items on settings page and improve wording
...
Update cukes to be text-independent
Update changelog
2014-04-08 00:28:25 +01:00
Hincu Petru
2d3933ccd8
Rewrite poll creation inputs
2014-04-06 15:01:18 +00:00
Mehmet Atif Ergun
a3fd746f15
Fix tr
...
The translation 'türk' is ethnicity / nationality. change to language, türkçe.
2014-04-03 20:31:00 -04:00
Jonne Haß
6ba6ecf3f2
updated 138 locale files [ci skip]
2014-04-03 20:12:30 +02:00
Jannik Streek
6f3844b73b
fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form
2014-03-31 18:14:08 +02:00
Jannik Streek
4174b88987
percentage result round + minor language fix
2014-03-31 18:14:08 +02:00
Jannik Streek
9c24365fde
changed poll result + some minor text improvements
2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9
finalized voting design + some design fixes + improved code
2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3
design for poll participation implemented, saving works as well
2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7
poll form completed
2014-03-31 18:14:06 +02:00
Jannik Streek
8a4f833d1d
added more tests for the poll federation + fixed broken rspec tests
2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046
Poll input fields and data model now available
...
question field of poll now in db
fixed merge issues
2014-03-31 18:14:06 +02:00
Jonne Haß
98057885ac
use uuids for guid generation
2014-03-30 15:38:18 +02:00
Sharif Olorin
fc394c3981
Patch grammar in admin interface
2014-03-25 02:36:10 +11:00
Steffen van Bergerem
4fc9c6416e
Port notifications to Bootstrap
2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11
Add filters to notifications controller
2014-03-19 17:54:22 +01:00
Jonne Haß
8280556a47
Introduce message renderer
...
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
flaburgan
027650e856
Add handle indication on search page, improve design
2014-03-13 23:01:42 +01:00
Steffen van Bergerem
0cc3b10b1f
port publisher and bookmarklet to bootstrap
2014-03-10 15:15:40 +01:00
flaburgan
67d71e2280
Fix drawer in some mobile browsers.
...
Remove the black background on menu badges.
Fix body content on screen width > 768px.
Start split of mobile css in different files in /mobile/
2014-02-24 23:30:57 +01:00
Fabian Rodriguez
4042e50289
Removes client_side_validations
...
Conflicts:
Gemfile
Gemfile.lock
2014-02-23 16:48:47 +01:00
Jonne Haß
e5465728d7
Merge pull request #4809 from Gallaecio/gl
...
Updated the Galician (gl) translation
2014-02-23 16:21:30 +01:00
Adrián Chaves Fernández (Gallaecio)
b37d008849
Updated the Galician (gl) translation
2014-02-23 16:06:33 +01:00
Jason Robinson
ea82a91085
Merge pull request #4799 from JannikStreek/feature/4778-comment_counters
...
Added count of comments to statistics
2014-02-21 21:49:25 +02:00
Jannik Streek
d603ff818c
added comment count to statistic to calculate posts/comments ratios
...
fixeds tests for comment count in statistics
added changelog entry and default entry
2014-02-21 12:25:23 +01:00
goobertron
3c2b0a44d4
Update English locales to diaspora* instead of Diaspora.
2014-02-20 17:48:17 +00:00
Jonne Haß
3ed4467155
Merge pull request #4765 from goobertron/jquery_source
...
Update JQuery source to jquery.com
Conflicts:
Changelog.md
2014-02-10 17:02:09 +01:00
Jonne Haß
3a616469f4
Merge pull request #4707 from goobertron/improved_new_password
...
New reset password form
Conflicts:
Changelog.md
2014-02-10 01:35:37 +01:00
Jonne Haß
90784b3b38
Merge pull request #4768 from MrZYX/manwithtwowatches-feature/4455-make-help-view-backbone-view
...
Make help pages a backbone view
2014-02-09 20:05:09 +01:00
goobertron
23e8bfa082
Update JQuery source to jquery.com
2014-02-09 17:36:35 +00:00
goobertron
2a145e67ab
Update design of forgot_password and change_password forms
...
Fix redirect to stream, make labels lower-case
Fix cuke
2014-02-09 15:48:06 +00:00
Jonne Haß
4a3869cda8
Merge pull request #4769 from Ruxton/feature/faster_stream_queries
...
Updating queries for the stream to be faster
2014-02-09 16:25:59 +01:00
Richard
1561690303
moved call to help backbone view init to separate file included only on faq view.
...
extending loaded js locales.
cleaned up unused routes. removed some comments. loading help locales only on help view.
removed afterRender from backbone views. extended load_javascript_locales method to take a section.
2014-02-09 16:00:15 +01:00
Richard
da6b037f24
highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
...
removed unused help haml templates.
put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.
using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9
Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
...
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.
deleted some unused views.
2014-02-09 16:00:15 +01:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
goobertron
c12efdf5e6
Changing text messages -> conversations
2014-02-09 15:44:10 +01:00
Jonne Haß
ecd8a8200b
Merge pull request #4754 from svbergerem/small-improvements-spv
...
SPV small improvements
2014-02-09 14:26:41 +01:00
Florian Staudacher
6c9cce7cda
Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https
2014-02-09 13:05:39 +01:00
Jonne Haß
d27c6a8305
updated 31 locale files [ci skip]
2014-02-09 12:31:00 +01:00
Ruxton
c8a0c81b6a
Updating queries for the stream to be faster
2014-02-07 14:23:19 +08:00
Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
arlogn
1563d088bc
embedding youtube videos over https
2014-01-30 18:01:27 +01:00
Steffen van Bergerem
655fbfcd79
Fix timeago on mobile devices. Fix missing space
2014-01-30 10:15:14 +01:00
Adrián Chaves Fernández (Gallaecio)
672686a72d
Fixed typo: ‘[…] your password, If it was […]’ → ‘[…] your password. If it was […]’.
2014-01-25 08:56:55 +01:00
Adrián Chaves Fernández (Gallaecio)
e9b5da1741
Updated the Galician (gl) translation.
2014-01-25 08:55:13 +01:00
Steffen van Bergerem
7519fcc255
Remove unused cubbies code
2014-01-24 08:58:47 +01:00
Jonne Haß
9ea6e9c166
Merge pull request #4517 from Zauberstuhl/report_post_feature
...
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
2014-01-20 10:03:45 +01:00
Jason Robinson
93b30dcda4
start new development cycle
2014-01-19 22:47:56 +02:00
Jason Robinson
edbed6c44a
bump to 0.3.0.0
2014-01-19 22:38:10 +02:00
Jonne Haß
18a2b6c0d3
updated 158 locale files [ci skip]
2014-01-19 19:18:14 +01:00
Jonne Haß
dae69f9558
Merge pull request #4662 from Raven24/update_underscore-backbone
...
update backbone.js and underscore.js
2014-01-17 03:24:46 -08:00
Florian Staudacher
1924c40d38
replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
...
- updates underscore to 1.5.2 and backbone to 1.1.0
backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
models
other changes:
- fix some events triggering multiple times in connection with deleting
a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
* no longer test the backbone router as part of our code
* jasmine factory already returns model instances, no need to wrap
that again
2014-01-16 23:23:30 +01:00
goobertron
0b0d0000fe
Remove alpha references to invites and buggy software
2014-01-16 18:51:39 +00:00
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01:00
Lukas Matt
5c9a3aaf3e
Added post report feature
...
You can report a single post by clicking the correct icon in the controler section
Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
goobertron
a1ac848d62
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
2014-01-12 20:02:33 +00:00
Jason Robinson
db71c9c50b
Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$
2014-01-06 22:00:53 +02:00
maruf
c17a474142
Simple captcha for signup page
2014-01-06 22:00:37 +02:00
flaburgan
6aced29bb6
Add expand the publisher test
2013-12-13 17:55:33 +01:00
flaburgan
923a4f2ab4
Add indication about markdown formatting in the publisher
2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091
Merge pull request #4612 from diaspora/drop_spv_old_code
...
Drop spv old code
2013-12-11 07:41:51 -08:00
Fabian Rodriguez
6c8c4fc99e
remove template picker functionality
2013-12-03 20:53:00 -02:00
Jason Robinson
2c83d0e846
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
2013-12-02 22:35:18 +02:00
Jonne Haß
1ce027eb2c
Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors
...
Feature/4509 image upload response errors
2013-12-02 00:10:25 +01:00
Jonne Haß
d3f41a97c5
Merge pull request #4548 from diaspora/remove_acts_as_taggable_on_from_admin_panel
...
Remove acts as taggable on from admin panel
2013-12-01 14:48:02 -08:00
Adrián Chaves Fernández (Gallaecio)
a590fbfc5f
Updated the Galician (gl) translation.
2013-12-01 12:16:26 +01:00
Jonne Haß
6c77df6ecb
Fix wrong pluralization key in en.yml
2013-11-30 15:44:43 +01:00