Commit Graph

1587 Commits

Author SHA1 Message Date
Owen Stephens
a8b5052b00 Add "Blank out cells (empty string)" to common transformations menu 2018-02-18 23:35:00 +00:00
Owen Stephens
0cff8a5c6c Make explict that 'Blank out cells' option sets cells to null 2018-02-18 23:26:50 +00:00
Owen Stephens
d2687cc58a Treat null and empty string as different values when doing transforms 2018-02-18 23:19:28 +00:00
Owen Stephens
566f2b792b Use white-space: pre-wrap style to ensure whitespace in cells, facets and transformation previews shows exactly as in the underlying data 2018-02-17 15:08:44 +00:00
Owen Stephens
8dec08aad3 Changed label of 'blank out cells' to 'set cells to null' where English label is used 2018-02-16 23:40:44 +00:00
Joanne
e0d87c3d94 Update tests to match updated range function 2018-02-16 15:13:37 +00:00
Joanne
41e8c0beee Update range function to return Integer arrays 2018-02-16 15:13:37 +00:00
Joanne
01d8e458f4 Update tests to match updated range function 2018-02-16 15:13:37 +00:00
Joanne
35c991d9c2 Update range function to follow Python's range function 2018-02-16 15:13:37 +00:00
Joanne
e2793daf54 Update tests for improved range function 2018-02-16 15:13:37 +00:00
Joanne
03d80598aa Update range function to include step ability 2018-02-16 15:13:37 +00:00
Joanne
d95f5985b9 Add tests for range function 2018-02-16 15:13:37 +00:00
Joanne
bd2c4348fe Implement main logic for range function 2018-02-16 15:13:37 +00:00
Joanne
41f2a27a66 Register range function 2018-02-16 15:13:37 +00:00
Joanne
6cc2a1d353 Implement main logic behind range function 2018-02-16 15:13:37 +00:00
Isao Matsunami
95d50fb010 Translated using Weblate (Japanese)
Currently translated at 100.0% (676 of 676 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2018-02-12 13:27:20 +00:00
Flavio Pompermaier
45de36901e Translated using Weblate (Italian)
Currently translated at 97.6% (660 of 676 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/it/
2018-02-12 13:27:20 +00:00
John Carl Saducas
5c16248a81 Translated using Weblate (Filipino)
Currently translated at 100.0% (676 of 676 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fil/
2018-02-12 13:27:20 +00:00
John Carl Saducas
0615066140 Translated using Weblate (Filipino)
Currently translated at 0.1% (1 of 676 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fil/
2018-02-12 13:27:20 +00:00
Martin Magdinier
9b453eb504 Added translation using Weblate (Filipino) 2018-02-12 13:27:20 +00:00
Isao Matsunami
cef32365be Translated using Weblate (Japanese)
Currently translated at 100.0% (676 of 676 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2018-02-12 13:27:20 +00:00
Antonin Delpeuch
2e96a54fa2 Translated using Weblate (French)
Currently translated at 97.6% (659 of 675 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2018-02-12 13:27:20 +00:00
Thad Guidry
d5b589fb1b
Merge pull request #1454 from joanneong/update-logo
Update OpenRefine logo
2018-02-09 09:29:28 -06:00
isaomatsunami
91c6c6c791 fix layout 2018-02-09 03:53:11 +09:00
Joanne
b02404d308 Delete old logos and rename new logos 2018-02-08 13:04:35 +08:00
Joanne
56a455b6be Rename new OpenRefine logo files 2018-02-08 11:23:03 +08:00
Joanne
8acca669ce Update OpenRefine logos for UI 2018-02-08 11:22:20 +08:00
Joanne
712aa37499 Delete unwanted new logos 2018-02-08 11:08:59 +08:00
Owen Stephens
0d04a25cf1
Merge pull request #1450 from OpenRefine/issue1448
Make Wikitext importer more robust
2018-02-07 17:41:23 +00:00
Joanne
653ea60dbc Update favicon for OpenRefine 2018-02-06 19:56:25 +08:00
Joanne
ee96bf62ff Add new favicon image 2018-02-06 19:56:11 +08:00
Joanne
8a89cb6dfc Add new logo images to OpenRefine 2018-02-06 19:52:06 +08:00
Joanne
3e27182090 Update logo for error page 2018-02-06 19:51:51 +08:00
Joanne
6ea582eb9b Update logo for preferences 2018-02-06 19:51:33 +08:00
Joanne
0cdd101ca0 Update logo for about page 2018-02-06 19:48:07 +08:00
Joanne
a46f28b596 Update logo for project page 2018-02-06 19:45:16 +08:00
Joanne
5b65b0927f Update logo for sidebar 2018-02-06 19:42:10 +08:00
Joanne
591a7db416 Update logos on index page 2018-02-06 19:18:47 +08:00
Antonin Delpeuch
f5ff5565ff Cleanup for Codacy and better parsing of quote character 2018-02-03 16:37:15 +00:00
Antonin Delpeuch
a89bbcbbe2 Add missing method removed during merge 2018-02-03 14:29:24 +00:00
Thad Guidry
a191d13b14
adding missing StringUtils import 2018-02-03 07:26:47 -06:00
Thad Guidry
c83dbe3b23
Merge branch 'master' into stundzig-develop/1086-quotecharacter 2018-02-03 07:20:45 -06:00
Antonin Delpeuch
86be1c12e8 Expose quote character setting in UI 2018-02-03 09:01:07 +00:00
Antonin Delpeuch
dc4815ba7b Fix initial options for the quote character 2018-02-03 09:00:53 +00:00
Antonin Delpeuch
c9395d564c Merge branch 'develop/1086-quotecharacter' of https://github.com/stundzig/OpenRefine into stundzig-develop/1086-quotecharacter 2018-02-03 07:56:30 +00:00
Isao Matsunami
adf015c9ed Translated using Weblate (Japanese)
Currently translated at 100.0% (675 of 675 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2018-02-02 15:24:40 +01:00
Jacky
c4b0ff6bea data package metadata (#1398)
* fix the appbundle issue #1209

* fix #1162

allow the JRE 9

* fix the package declarations

* remove the _ from the method name

* use the explicit scoping

* remote extra ;

* fix issued from codacy

* fix issued from codacy

* add preferences link to the index page

* handle the empty user metadata

* fix 'last modified' sorting issue #1307

* prevent overflow of the table. issue #1306

* add isoDateParser to sort the date

* prevent overflow of the project index

* remove sorter arrow for action columns

* disable editing the internal metadata

* adjust the width of the table

* change MetaData to Metadata

* change the filed name from rowNumber to rowCount

* put back the incidently deleted gitignore

* add double quote to prevent word splitting

* UI improvement on metadata view and project list view

* remove the date field in metadata

* message notification of the free RAM. Issue #1295

* UI tuning for metadata view

* shorten the ISO date to locale date format

* Added translation using Weblate (Portuguese (Brazil))

* remove the rename link

* Ignore empty language files introduced by Weblate

* Add UI for Invert text filter

* Backend support for Inverting Text search facets

* Fix reset on text search facet

* More succinct return statements

* add tests for SetProjectMetadataCommand

* Tidying up for Codacy

* Added Tests for TextSearchFilter

* Corrections for Codacy

* More code tidy up

* let the browser auto fit the table cell when resizing/zooming

* fix import multiple excel with mulitple sheets issue #1328

* check if the project has the userMetadata

* fix the unit test
support multi files with multi tables for open office

* prevent the same key for user metadata

* replace _ with variable for exception

* fix the no-undef issue

* to adjust the width of transform dialog. issue #1332

* fix the row count refresh issue

* extract method

* move the log message

* cosmatic changes for codacy

* fix typo

* bump to version 2.8

* .gitignore is now working

* preview stage won't have the metadata populated, so protect NPE

* Update README.md

No more direct link to the last version tag, which will avoid having to think of updating the readme

* refacotring the ProjectMetadata class

* introduce the IMetadata interface

* create submodule of dataschema

* add back

* setup lib for dataschema; upgrade the apache lang to lang3

* replace escape* functions from apache lang3

* replace the ProjectMetadata with IMetadata interface

* add missing jars

* set the IMetadata a field of Project

* remove PreferenceStore out of Project model

* fix test SetProjectMetadataCommandTests by casting

* introdcue the AbstractMetadata

* introdcue the AbstractMetadata

* reorganize the metadata package

* allow have mulitiple metadata for a project

* support for mulitple metadata format

* remove jdk7 since 'table schema' java implmentation only support jdk8+

* set execute permission for script

* fix the Unit Test after Metadata refactoring

* restore the apache lang2.5 since jetty 6.1.22 depend on it

* add commons lang 2.5 jar

* git submodule add  https://github.com/frictionlessdata/datapackage-java

* remove the metadata parameter from the ProjectManager.registerProject method

* remove hashmap _projectsMetadata field from the ProjectManager and FileProjectManager

* init the Project.metadataMap

* fix Unit Test

* restore the ProjectMetaData map to ProjectManager

* put the ProjectMetaDta in place for ProjectManager and Project object

* check null of singleton instead of create a constructor just for test

* load the data package metadata

* importing data package

* importing data package

* encapsulate the Package class into DataPackageMetadata

* user _ to indicate the class fields

* introduce base URL in order to download the data files

* import data package UI and draft backend

* import data package UI

* fix typo

* download the data set pointed from metadata resource

* save and load the data package metadata

* avoid magic string

* package cleanup

* set the java_version to 1.8

* set the min jdk to 1.8

* add the 3rd party src in the build.xml

* skip the file selection page if only 1 DATA file

* add files structure for json editor

* seperate out the metadata file from the retrival file list

* rename the OKF_METADATA to DATAPACKAGE_METADATA

* clean up

* implement GetMetadateCommand class

* display the metadata in json format

* git submodule update --remote --merge

* adjust the setting after pulling from datapackage origin

* fix the failed UT DateExtensionTests.testFetchCounts due to new json jar json-20160810.jar will complain: JSONObject["float"] not a string.

* clean up the weird loop array syntax get complained

* remove the unused constant

* export in data package format

* interface cleanup

* fix UT

* edit the metadata

* add UT for SetMetadataCommand

* fix UT for SetMetadataCommand

* display the data package metadata link on the project index page

* update submodule

* log the exceptions

* Ajv does not work properly, use the back end validation instead

* enable the validation for jsoneditor

* first draft of the data validation

* create a map to hold the constraint and its handler

* rename

* support for minLength and maxLength from spec

* add validate command

* test the opeation instead of validate command

* rename the UT

* format the error message and push to the report

* fix row number

* add resource bundle for validator

* inject the code of the constrains

* make the StrSubstitutor works

* extract the type and format information

* add the customizedFormat to interface to allow format properly

* get rid of magic string

* take care of missing parts of the data package

* implement RequiredConstraint

* patch for number type

* add max/min constraints

* get the constrains directly from field

* implement the PatternConstraint

* suppress warning

* fix the broken UT when expecting 2 digits fraction

* handle the cast and type properly

* fix the missing resource files for data package when run from command line

* use the copy instead of copydir

* add script for appveyor

* update script for appveyor

* do recursive clone

* correct the git url

* fix clone path

* clone folder option does not work

* will put another PR for this. delete for now

* revert the interface method name

* lazy loading the project data

* disable the validate menu for now

* add UT

* assert UTs

* add UT

* fix #1386

* remove import

* test the thread

* Revert "test the thread"

This reverts commit 779214160055afe3ccdcc18c57b0c7c72e87c824.

* fix the URLCachingTest UT

* define the template data package

* tidy up the metadata interface

* check the http response code

* fix the package

* display user friendly message when URL path is not reachable

* populate the data package schema

* Delete hs_err_pid15194.log

* populate data package info

* add username  preference and it will be pulled as the creator of the metadata

* undo the project.updateColumnChange() and start to introduce the fields into the existing core model

* tightly integrate the data package metadata

* tightly integrate the data package metadata for project level

* remove the submodule

* move the edit botton

* clean up build

* load the new property

* load the project metadata

* fix issues from codacy

* remove unused fields and annotation

* check the http response code firstly

* import zipped data package

* allow without keywords

* process the zip data package from url

* merge the tags

* check store firstly

* remove the table schema src

* move the json schema files to schema dir

* add comment

* add comment

* remove git moduels

* add incidently deleted file

* fix typo

* remove SetMetadataCommand

* revert change

* merge from master
2018-02-02 13:24:19 +00:00
Antonin Delpeuch
47f44b06c4 Make Codacy happy 2018-02-02 11:57:20 +00:00
Antonin Delpeuch
1f87a26f4c Include image file names like templates in Wikitable importer 2018-02-02 11:22:15 +00:00
Antonin Delpeuch
843641ca74 Parse headers just like other cells in Wikitable importer
This makes the column names a bit less meaningful,
but this is necessary to handle cases where headers
are inserted anywhere in the table.
2018-02-02 10:48:31 +00:00
Owen Stephens
cd58557424
Merge pull request #1428 from OpenRefine/issue1351
Fix overflow issue in data extension dialog
2018-01-31 13:17:51 +00:00
Antonin Delpeuch
0426704938 Add helper createProjectWithColumns 2018-01-27 13:58:06 +00:00
Antonin Delpeuch
feae25a5ff Migrate more tests to the createCSVProject helper 2018-01-27 13:45:44 +00:00
Antonin Delpeuch
8f9fc61046 Migrate TextSearchFacetTests.java to use the helpers 2018-01-27 13:45:44 +00:00
Antonin Delpeuch
5278e929a2 Refactor CrossFunctionTests' project creating logic into RefineTest 2018-01-27 13:45:44 +00:00
Isao Matsunami
b6521e91e5 Translated using Weblate (Japanese)
Currently translated at 100.0% (671 of 671 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2018-01-26 19:45:51 +01:00
Owen Stephens
c0fda7de8c Removed h3 tag and related styling 2018-01-17 09:56:11 +00:00
Owen Stephens
af3aa44e6c Tidy up for codacy 2018-01-16 18:27:13 +00:00
Owen Stephens
9cf379e625 Add show/hide toggle and some style adjustments 2018-01-16 17:43:55 +00:00
Owen Stephens
a9be18d9df Remove div no longer needed 2018-01-16 17:43:55 +00:00
Owen Stephens
91edc810a7 Removed unused code 2018-01-16 17:43:55 +00:00
Owen Stephens
f1d23f9e3b Add/update text strings 2018-01-16 17:43:55 +00:00
Owen Stephens
4320ef8c10 Resolved merge conflict 2018-01-16 17:41:56 +00:00
Owen Stephens
5acdb1429c Fix tests - Include new httpHeaders JSON array when creating new ColumnAdditionByFetchingURLsOperation 2018-01-16 17:22:48 +00:00
Owen Stephens
7464e83766 Get and set any http headers submitted when using Add Column by Fetching URLs 2018-01-16 16:54:11 +00:00
Owen Stephens
4fb1867980 Option to add http headers in Add column by fetching URLs - support adding list of headers in backend, and exposing these in UI for user to edit and use 2018-01-16 16:54:11 +00:00
Owen Stephens
34e83fa98c Initial work to add option to set http headers in Add column by fetching URLs 2018-01-16 16:54:11 +00:00
Jacky
9ab897cb72 remove copyright and put more clear description 2018-01-15 20:27:25 -05:00
Jacky
3c25647f05 add find function. issue 1296 2018-01-14 22:04:26 -05:00
José Hisse
ee6edeaf2b Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.6% (660 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/pt_BR/
2018-01-13 14:39:19 +01:00
Antonin Delpeuch
6f895b9873 Fix overflow issue in data extension dialog.
Closes #1351.
2018-01-12 09:38:45 +00:00
Thad Guidry
ca35d0d657
Merge pull request #1426 from olleolleolle/fix/spelling-in-test-data-nobel-prize-winners
Nobel prize winners CSV data typos
2018-01-07 14:38:39 -06:00
Olle Jonsson
76fa942490 Nobel prize winners CSV data typos 2018-01-07 21:28:07 +01:00
Olle Jonsson
5e075b09a4 Reconciliation panel: spelling of JS property 2018-01-07 21:16:33 +01:00
José Hisse
9bdbb60e27 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.1% (663 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/pt_BR/
2018-01-07 10:55:43 +01:00
Weblate
6a63bdb235 Merge remote-tracking branch 'origin/master' 2018-01-07 01:50:11 +01:00
José Hisse
0199e1a93c Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.1% (663 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/pt_BR/
2018-01-07 01:50:10 +01:00
Olle Jonsson
6e45ee4af1
about page: closing LI tags 2018-01-07 00:21:32 +01:00
José Hisse
be312e3457 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.7% (667 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/pt_BR/
2018-01-05 18:16:05 +01:00
José Hisse
669159cae2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (669 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/pt_BR/
2018-01-05 16:47:34 +01:00
Jacky
9cbbbc6ca1
Merge pull request #1415 from OpenRefine/issue1381
Fix URI encoding of flyout parameters
2018-01-03 20:18:50 -05:00
Antonin Delpeuch
7459a00171 Fix js warning in data extension 2018-01-04 01:40:24 +01:00
Antonin Delpeuch
45ccd0e1c0 Change HTTP error detection in URL fetching test 2018-01-03 22:44:32 +01:00
Antonin Delpeuch
c9c9ee7509 Fix URI encoding of flyout parameters
Closes #1381
2018-01-03 21:36:19 +01:00
Antonin Delpeuch
dae4ac1ce4 Simpler way to pass the test when there are 503 errors 2018-01-03 19:03:26 +01:00
Antonin Delpeuch
32b7d2fa74 Looser check for 403 and 503 errors in URL caching test 2018-01-03 18:57:34 +01:00
Antonin Delpeuch
f14543bfca Fix URL caching test on Appveyor 2018-01-03 18:52:12 +01:00
Isao Matsunami
a056b1c750 Translated using Weblate (Japanese)
Currently translated at 100.0% (669 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2017-12-27 20:23:47 +01:00
anonymous
f864964ecb Translated using Weblate (Japanese)
Currently translated at 100.0% (669 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2017-12-27 09:54:09 +01:00
Isao Matsunami
eaf1b34361 Translated using Weblate (Japanese)
Currently translated at 100.0% (669 of 669 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ja/
2017-12-27 09:52:08 +01:00
Antonin Delpeuch
61f18c20cd
Merge pull request #1399 from isaomatsunami/patch-1
Update translation-jp.json for 2.8
2017-12-27 09:44:35 +01:00
Antonin Delpeuch
94b9d57528
Merge pull request #1397 from tiagofernandez/save-import-options
Revert 278f24c1 and adapt 0001d9f7 (ref. PR #1387)
2017-12-27 09:44:19 +01:00
Isao Matsunami
7ee97083d1
Update translation-jp.json
Reconcileを「照合」に統一。一部で英語を併記。
2017-12-26 20:50:46 +09:00
Isao Matsunami
8d118d7027
Update translation-jp.json
Reconcileの訳語を「照合」に統一
2017-12-26 19:43:32 +09:00
Isao Matsunami
33e107d4eb
Update translation-jp.json
Some items are added for 2.8. Some are changed not to break the original layout.
The following 2 pages are hard-coded in English?
1) import from Google Data
2) parse type for PC-AXIS text files
2017-12-26 14:00:32 +09:00
Tiago Fernandez
00faf2a179 Revert 278f24c1 and adapt 0001d9f7 (ref. PR #1387) 2017-12-24 12:48:23 +01:00
Jacky
e5709efd46 fix issue #1341 2017-12-24 00:04:16 -05:00
Jacky
fb3620b3d9
Merge pull request #1388 from jackyq2015/issue/1386
Fix Issue #1386
2017-12-21 08:26:29 -05:00
Jacky
6c06424183
Merge pull request #1390 from jackyq2015/issue/1389
fix Issue #1389
2017-12-21 08:26:09 -05:00
Jacky
9107a0eb91 remove commented code 2017-12-21 08:24:29 -05:00
Jacky
add2eb936c Merge branch 'issue/1386' of https://github.com/jackyq2015/openrefine into issue/1386 2017-12-21 08:23:01 -05:00
Jacky
e1a494aabd remove the print 2017-12-21 08:22:44 -05:00
Jacky
e891c44e26 revert unecessary changes 2017-12-20 18:55:34 -05:00
Jacky
cd770aed25 revert unecessary changes 2017-12-20 18:52:53 -05:00
jackyq2015
8b203a094d add the braces 2017-12-20 13:30:38 -05:00
Jacky
2f050322b5 use join not sleep 2017-12-20 08:35:31 -05:00
Tiago Fernandez
0001d9f7b2 Test ImportingUtilities.createProjectMetadata() 2017-12-20 11:07:36 +01:00
Jacky
834b6c493c check isDone 2017-12-19 22:20:11 -05:00
Jacky
3fa994739a check isDone 2017-12-19 22:09:52 -05:00
Jacky
cce3ab6240 fix issue #1389 2017-12-19 21:00:03 -05:00
jackyq2015
136eba52df add missing import 2017-12-19 15:28:34 -05:00
jackyq2015
cb55b68449 add missing import 2017-12-19 15:23:39 -05:00
jackyq2015
ad293a1419 add missing import 2017-12-19 15:00:21 -05:00
jackyq2015
81043e58e2 fix #1386 2017-12-19 12:54:26 -05:00
Tiago Fernandez
278f24c147 Append options metadata while creating project 2017-12-18 11:38:07 +01:00
Jacky
a55e0dab1c resolve the conflict 2017-12-15 22:07:07 -05:00
Jacky
d207c74f62 merge from master 2017-12-15 22:06:30 -05:00
Jacky
659f7bc27a fix for codacy 2017-12-15 21:46:09 -05:00
Antonin Delpeuch
3c5a9b0754
Merge pull request #1357 from xseris/master
Tag system
2017-12-16 01:55:46 +00:00
Jacky
93f60c848b fix a typo 2017-12-15 19:50:27 -05:00
Jacky
31a613f914 Revert "don't refresh row number each time"
This reverts commit 880620b538.
2017-12-15 17:38:34 -05:00
Jacky
2afdcbf546 fix issue https://github.com/jackyq2015/OpenRefine/issues/2 2017-12-15 16:37:38 -05:00
Jacky
0258dc1787 fix issue #1383. use the localDateTime for project info 2017-12-15 15:24:09 -05:00
Jacky
880620b538 don't refresh row number each time 2017-12-14 22:17:51 -05:00
xseris
7be3eacce8 Aligned tags to left 2017-12-08 01:04:48 +01:00
xseris
ee8ed8f563 Refresh tag cell 2017-12-08 00:46:59 +01:00
xseris
b16941777e Modified tags in metadata dialog and moved column right to name 2017-12-07 23:45:36 +01:00
Michal Čihař
2833c53302 Translated using Weblate (German)
Currently translated at 13.5% (90 of 665 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/de/
2017-12-06 14:13:42 +01:00
Antonin Delpeuch
b9f63752a0 Translated using Weblate (French)
Currently translated at 100.0% (665 of 665 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-12-05 18:37:54 +01:00
Owen Stephens
06919f5f04 Update lang files for re-organisation of Reconcile facets menu 2017-12-04 09:46:31 +00:00
Owen Stephens
9a4cf5ca0a Re-organise reconcile menu, removing qaResult 2017-12-04 09:45:50 +00:00
Owen Stephens
cc71f7f64f Remove qaResult option from backend 2017-12-04 09:45:24 +00:00
xseris
f21230804b Fixed Mockito tests 2017-12-01 17:00:45 +01:00
Owen Stephens
02f864121d Removed unused variable 2017-11-29 11:01:43 +00:00
Owen Stephens
0c97ad1b69 Use string instead of string buffer 2017-11-29 09:47:31 +00:00
Owen Stephens
93431daecf Remove unused variable 2017-11-29 09:47:03 +00:00
Owen Stephens
316da5e917 Removed comment no longer needed 2017-11-29 01:00:19 +00:00
Owen Stephens
0b433fc5ec Updated copyright statement 2017-11-29 00:59:49 +00:00
Owen Stephens
1d1f3e67cd Added break statement for default case 2017-11-29 00:58:51 +00:00
Owen Stephens
21741ad09e Pass user friendly error message to UI on invalid regular expression 2017-11-28 16:22:17 +00:00
Owen Stephens
d64dee71dd Extended tests and code for user friendly regular expression syntax errors 2017-11-28 16:20:24 +00:00
xseris
d2648d8db8 Fix tests 2017-11-28 00:16:08 +01:00
xseris
cecbfb486b Remove delete all projects option 2017-11-24 20:29:09 +01:00
xseris
a3132eeeb3 implemented tag system 2017-11-24 20:19:49 +01:00
Owen Stephens
441d9f7f10 Initial tests and code for user friendly regular expression syntax errors 2017-11-24 18:24:16 +00:00
xseris
4f67c632d0 delete all projects 2017-11-23 17:36:46 +01:00
Qi Cui
ffbc6879ce preview stage won't have the metadata populated, so protect NPE 2017-11-18 23:02:06 -05:00
Qi Cui
ae9e0af8b9 bump to version 2.8 2017-11-18 14:15:10 -05:00
Thad Guidry
daca1836e9
Merge pull request #1342 from jackyq2015/feature/metadata
fix the row count refresh issue.  We'll work on adding a Delete Metadata option in the next milestone.
2017-11-18 08:30:32 -06:00
Jacky
4e79c0d410 fix typo 2017-11-17 22:55:16 -05:00
Thad Guidry
8837f3df73
Merge pull request #1339 from jackyq2015/issue/1332
to adjust the width of transform dialog. issue #1332
2017-11-17 21:29:25 -06:00
Jacky
b83961d2c6 cosmatic changes for codacy 2017-11-17 17:14:19 -05:00
Jacky
428d944e4d move the log message 2017-11-17 16:58:30 -05:00
Jacky
c32f6329d2 extract method 2017-11-17 16:52:26 -05:00
Jacky
8187799f85 fix the row count refresh issue 2017-11-17 14:38:02 -05:00
Jacky
bd07fe0e1a to adjust the width of transform dialog. issue #1332 2017-11-17 08:56:30 -05:00
Thad Guidry
34f38ccaf8
Merge pull request #1336 from ostephens/multi-cell-join-tests
Add tests for JoinMultiValuedCells
2017-11-16 22:49:03 -06:00
Thad Guidry
43b6cb8001
Merge pull request #1333 from jackyq2015/feature/metadata
check if the project has the userMetadata
2017-11-16 22:17:14 -06:00
Jacky
8d2c8b521b
Merge pull request #1334 from jackyq2015/issue/1328
fix import multiple excel with mulitple sheets issue #1328
2017-11-16 21:30:24 -05:00
Jacky
b3cb7d4bf3 fix the no-undef issue 2017-11-16 16:24:31 -05:00
Jacky
e07b1859db replace _ with variable for exception 2017-11-16 15:55:14 -05:00
Jacky
46318a9bc4 prevent the same key for user metadata 2017-11-16 15:17:51 -05:00
Jacky
1d2998f374 fix the unit test
support multi files with multi tables for open office
2017-11-16 10:29:16 -05:00
Owen Stephens
df920777ac Moved variable to local scope 2017-11-16 12:47:05 +00:00
Antonin Delpeuch
78b7f01be5
Merge pull request #1327 from ostephens/invert-filter
Invert text search facet/text filter
2017-11-16 08:05:31 +00:00
Jacky
1ad40bcd83 check if the project has the userMetadata 2017-11-15 23:20:44 -05:00
Jacky
6f42df95e2 fix import multiple excel with mulitple sheets issue #1328 2017-11-15 22:58:47 -05:00
Thad Guidry
ffeb30c847
Merge pull request #1331 from jackyq2015/feature/metadata
let the browser auto fit the table cell when resizing/zooming
2017-11-15 21:42:01 -06:00
jackyq2015
c2db998b93 let the browser auto fit the table cell when resizing/zooming 2017-11-15 16:17:57 -05:00
Owen Stephens
742b42ade1 More code tidy up 2017-11-15 19:01:52 +00:00
Owen Stephens
2d0f48e93f Corrections for Codacy 2017-11-15 18:51:58 +00:00
Owen Stephens
3a31e69c2b Added Tests for TextSearchFilter 2017-11-15 18:31:55 +00:00
Owen Stephens
319b6bcca5 Tidying up for Codacy 2017-11-15 18:31:41 +00:00
Thad Guidry
b496b0b374
Merge pull request #1329 from jackyq2015/feature/metadata
add tests for SetProjectMetadataCommand
2017-11-15 08:58:49 -06:00
Qi Cui
6bdba6948e add tests for SetProjectMetadataCommand 2017-11-14 15:54:22 -05:00
Owen Stephens
7ba110e31a More succinct return statements 2017-11-14 17:40:07 +00:00
Owen Stephens
25dd347123 Fix reset on text search facet 2017-11-14 14:37:16 +00:00
Owen Stephens
135052d033 Backend support for Inverting Text search facets 2017-11-14 14:24:50 +00:00
Owen Stephens
ae6e8bed86 Add UI for Invert text filter 2017-11-14 13:51:42 +00:00
Jacky
850b861acb
Merge pull request #1324 from jackyq2015/feature/metadata
remove the rename link
2017-11-14 08:08:18 -05:00
Antonin Delpeuch
690ba49f53 Ignore empty language files introduced by Weblate 2017-11-14 09:40:20 +00:00
Jacky
e65a8c1d9a remove the rename link 2017-11-13 15:28:44 -05:00
José Vitor Hisse
62be866a9f Added translation using Weblate (Portuguese (Brazil)) 2017-11-12 20:28:59 +01:00
Jacky
cd94d4baad shorten the ISO date to locale date format 2017-11-11 21:15:44 -05:00
Jacky
d1e9ab9135 UI tuning for metadata view 2017-11-11 09:43:21 -05:00
Jacky
a53467f2cb remove the date field in metadata 2017-11-09 22:29:08 -05:00
Jacky
e8f133887e UI improvement on metadata view and project list view 2017-11-09 16:23:29 -05:00
Jacky
428f7dabf8 change the filed name from rowNumber to rowCount 2017-11-08 20:40:22 -05:00
Jacky
31943f6c9f change MetaData to Metadata 2017-11-08 20:30:01 -05:00
Jacky
fc2f81046f adjust the width of the table 2017-11-08 17:49:49 -05:00
Jacky
e958dfc4c2 disable editing the internal metadata 2017-11-05 10:41:17 -05:00
Jacky
facffdca37 remove sorter arrow for action columns 2017-11-05 10:20:15 -05:00
Jacky
9a93ab091d prevent overflow of the project index 2017-11-05 10:01:44 -05:00
Jacky
c08b0f589a add isoDateParser to sort the date 2017-11-05 09:49:58 -05:00
Jacky
a39ee108ac prevent overflow of the table. issue #1306 2017-11-04 23:57:29 -04:00
Jacky
d086b8356a fix 'last modified' sorting issue #1307 2017-11-04 22:53:32 -04:00
Jacky
51691fc06d handle the empty user metadata 2017-11-04 19:07:09 -04:00
Jacky
cbc9929b92 add preferences link to the index page 2017-11-04 17:09:04 -04:00
Jacky
d9995ba259 fix issued from codacy 2017-11-03 20:12:57 -04:00
Jacky
a204809f3d fix issued from codacy 2017-11-03 19:46:07 -04:00
Jacky
acf6460ea2 remote extra ; 2017-11-03 17:48:28 -04:00
Jacky
12c5839600 use the explicit scoping 2017-11-03 17:47:18 -04:00
Jacky
986881b10f remove the _ from the method name 2017-11-03 17:39:49 -04:00
Jacky
75b82106b4 fix the package declarations 2017-11-03 17:11:31 -04:00
Jacky
3a3083a1de Merge branch 'master' of https://github.com/OpenRefine/OpenRefine 2017-11-03 17:04:48 -04:00
Jacky
c472cd0c1b add tablesorter to sort the project index 2017-11-03 17:00:18 -04:00
Jacky
edc3df1ad1 populate the row number.\n sort the project index 2017-11-03 16:59:03 -04:00
Jacky
68bf4f962c adjust the width 2017-10-29 14:14:39 -04:00
Jacky
1777a6ecf3 edit the user metadata 2017-10-29 13:46:37 -04:00
Jacky
88f6e1b8d1
Merge pull request #1293 from ostephens/fix-regex-filter-error
Fix regex filter error
2017-10-27 19:22:47 -04:00
Jacky
384e69aa5f add i18n for metadata edit dialog 2017-10-27 17:04:39 -04:00
Jacky
7c83746ee7 deal with empty string properly 2017-10-27 16:59:55 -04:00
Owen Stephens
98f37905d7 More minor syntax changes to make Codacy a little happier 2017-10-27 12:22:01 +01:00
Owen Stephens
f5e4420af9 Minor syntax change for Codacy 2017-10-27 11:47:59 +01:00
Owen Stephens
e4bdca9c95 Catch and display errors on compute-facet 2017-10-27 10:59:03 +01:00
Owen Stephens
178e4e5bca On invalid regular expression, keep all current rows displayed in data-table view 2017-10-27 10:55:32 +01:00
Owen Stephens
e4db4d7633 Catch error from server when invalid Regular Expression used in Text Filter 2017-10-27 10:53:27 +01:00
Thad Guidry
d72a2de348 Revert "Extend cross() function to support multiple-value-cell-input" 2017-10-26 17:37:10 -05:00
Jacky
6a47482ea4 support metadata edit 2017-10-26 15:47:24 -04:00
Jacky
249fa4d8d5 support metadata edit 2017-10-26 15:45:58 -04:00
Thad Guidry
3d0e96a0ce Merge pull request #1290 from claussni/cross-func-split
Extend cross() function to support multiple-value-cell-input
2017-10-26 14:23:23 -05:00
Ralf Claussnitzer
0b107ec5e9 Add optional 4th parameter to cross() function
The cross function now accepts a 4th parameter defining a regular
expression separator for splitting multi-value field values when joining
projects.

See https://github.com/OpenRefine/OpenRefine/issues/1204#issuecomment-326320954
2017-10-26 19:50:02 +02:00
Ralf Claussnitzer
9aa168633f Allow comma separated multi-value source in cross() function
Implements support for comma separated multiple-value keys for joining
another project using the cross() function.

See https://github.com/OpenRefine/OpenRefine/issues/1204#issuecomment-326320954
2017-10-26 19:50:02 +02:00
Jacky
cf3cf5d681 Merge pull request #909 from fluf1024/post-scripts
Allow longer expressions by sendig them as POST
2017-10-25 11:18:42 -04:00
Owen Stephens
c10f72437f Add tests for JoinMultiValuedCells 2017-10-25 11:15:59 +01:00
Antonin Delpeuch
88b10a2917 Merge pull request #1278 from ostephens/cell-split-regex
Cell split regex
2017-10-25 11:04:33 +01:00
Owen Stephens
300edcca74 Minor fix to comment in code 2017-10-24 08:58:32 +01:00
Owen Stephens
219e747147 Removed unused dependency 2017-10-24 08:54:58 +01:00
Owen Stephens
209500bf3a Add tests for SplitMulitValuedCells 2017-10-24 08:29:00 +01:00
Owen Stephens
224210625d Remove automatic trim of split values 2017-10-24 08:28:37 +01:00
Owen Stephens
bb6b3d6c29 Re-locate operations tests in correct folder 2017-10-23 18:54:59 +01:00
Antonin Delpeuch
233cc9650b Merge pull request #1283 from remram44/remove-old-jquery
Remove jQuery 1.9.1, unused
2017-10-23 19:30:58 +02:00
Remi Rampin
fd971077bf Remove jquery 1.9.1, unused 2017-10-23 13:07:46 -04:00
Remi Rampin
f489701737 Add license header for i18n library 2017-10-23 12:58:51 -04:00
Antonin Delpeuch
e5a831b18c Merge branch 'master' of https://github.com/OpenRefine/OpenRefine 2017-10-23 17:12:23 +02:00
Antonin Delpeuch
6a67f63c82 Remove empty translation (as it generates exceptions in OpenRefine) 2017-10-23 17:11:26 +02:00
Remi Rampin
6a9694d622 Fix some French translations 2017-10-23 10:51:07 -04:00
Owen Stephens
b378dea417 Minor syntax fix 2017-10-23 08:54:26 +01:00
Owen Stephens
47520d4a71 Minor fixes to syntax 2017-10-23 08:36:08 +01:00
Owen Stephens
46c3ec100e Remove unused local variables and imports 2017-10-23 08:36:08 +01:00
Antonin Delpeuch
23b643426a Fix Codacy warnings in MultiValuedCellSplitOperation 2017-10-23 08:41:14 +02:00
Owen Stephens
cccf1e55c9 Update split multi-valued cells to support split by regex and split by lengths 2017-10-22 23:54:18 +01:00
Owen Stephens
6fb7f1f476 Add UI for split multi-valued cells by sep/regex/length 2017-10-22 23:53:18 +01:00
Jacky
63c1714d0a add fields for metadata 2017-10-22 00:37:59 -04:00
Jacky
f1ab6b8cd6 Merge branch 'master' of https://github.com/OpenRefine/OpenRefine 2017-10-21 23:49:58 -04:00
Jacky
818e139b43 add the import options to metadata 2017-10-21 23:41:11 -04:00
Antonin Delpeuch
e5fdf48680 Fix french translation 2017-10-21 01:51:37 +01:00
Antonin Delpeuch
21f4d62474 Merge pull request #1275 from OpenRefine/wikitext-url-fix
Forbid pipe characters in URL references to ease parsing.
2017-10-20 16:41:00 +02:00
Antonin Delpeuch
686e635c93 Merge branch 'master' into topic-item 2017-10-20 15:38:47 +01:00
Antonin Delpeuch
e2a22a6994 Forbid pipe characters in URL references to ease parsing.
This is a temporary fix before we do full Wikitext parsing inside references
(this needs a change upstream). See https://github.com/sweble/sweble-wikitext/issues/67 .
2017-10-20 15:32:58 +01:00
Weblate
0cdb47a050 Merge remote-tracking branch 'origin/master' 2017-10-19 18:59:07 +02:00
Antonin Delpeuch
f36eb1558c Translated using Weblate (French)
Currently translated at 100.0% (648 of 648 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-10-19 18:59:07 +02:00
Antonin Delpeuch
4e2241de5b Fix duplicate item in Reconcile > Actions menu. Closes #1272. 2017-10-19 16:43:55 +01:00
Allan Nordhøy
641ff716a9 Added translation using Weblate (Norwegian Bokmål) 2017-10-19 12:15:15 +02:00
Antonin Delpeuch
54acf10edf Change "topic" to "item" in the UI 2017-10-18 12:39:40 +01:00
Mathieu Saby
c7b3a5ffe4 Translated using Weblate (French)
Currently translated at 100.0% (648 of 648 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-10-17 22:45:56 +02:00
Matthias Findeisen
724428aebf Translated using Weblate (German)
Currently translated at 14.0% (91 of 648 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/de/
2017-10-15 18:46:53 +02:00
Antonin Delpeuch
473b1b135d Merge pull request #1264 from OpenRefine/issue1262
Update Jackson to 2.9.1
2017-10-09 20:09:49 +02:00
Antonin Delpeuch
c9cc4fb262 Update Jackson to 2.9.1
Closes #1262
2017-10-09 17:38:09 +01:00
Owen Stephens
bb6b8378d3 Ensure _max is never less than _min 2017-10-09 17:13:43 +01:00
Antonin Delpeuch
4036f3ff91 Merge pull request #1257 from OpenRefine/issue1256
Perform ASCII normalization earlier in FingerprintKeyer.
2017-09-27 17:54:43 +02:00
Owen Stephens
4f6284032f Code tidy + set link to new version to open in new browser tab 2017-09-27 12:22:59 +01:00
Owen Stephens
b88263bd74 Fixes as per PR comments 2017-09-27 11:47:07 +01:00
Owen Stephens
e482878596 Alert user if more recent version available from github 2017-09-27 11:00:47 +01:00
Antonin Delpeuch
1da3c00cb1 Perform ASCII normalization earlier in FingerprintKeyer.
This closes #1256.
2017-09-27 09:23:40 +01:00
Antonin Delpeuch
8e9b224730 Translated using Weblate (French)
Currently translated at 100.0% (648 of 648 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-09-24 10:25:23 +02:00
Antonin Delpeuch
5d387b1df8 Small tweaks to the wiki importer 2017-09-24 09:14:13 +01:00
Antonin Delpeuch
cfc0b95cd1 Fix string comparison in Wikitext exporter 2017-09-23 23:13:18 +01:00
Antonin Delpeuch
a1b2c9b683 Add support for references in Wikitable importer.
Closes #1243.
2017-09-23 22:54:43 +01:00
Antonin Delpeuch
9f62905be4 Merge pull request #1251 from OpenRefine/issue1106
Fix overflow of history items outside the window.
2017-09-20 15:22:55 +02:00
Antonin Delpeuch
2058081ffb Fix overflow of history items outside the window. Closes #1106. 2017-09-20 10:08:03 +01:00
Antonin Delpeuch
49564e8905 Fix bug when an extra column starts in the middle of the table 2017-09-19 13:54:27 +01:00
Emelyanov Michael
94fc4caba6 Translated using Weblate (Russian)
Currently translated at 100.0% (647 of 647 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ru/
2017-09-02 15:48:51 +02:00
Antonin Delpeuch
8bc73dc886 Translated using Weblate (English)
Currently translated at 100.0% (647 of 647 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/en/
2017-09-01 19:06:11 +02:00
Emelyanov Michael
3188140700 Translated using Weblate (Russian)
Currently translated at 100.0% (647 of 647 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ru/
2017-08-29 10:45:07 +02:00
Antonin Delpeuch
a72f5ab3fe Translated using Weblate (French)
Currently translated at 100.0% (647 of 647 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-08-28 18:20:13 +02:00
Antonin Delpeuch
249d8f9fa5 Merge branch 'master' of ssh://github.com/OpenRefine/OpenRefine 2017-08-28 16:29:21 +01:00
Antonin Delpeuch
00f8e4fc6b Merge pull request #1237.
Conflicts:
	.classpath
	main/webapp/modules/core/langs/translation-en.json
	main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js

Closes #363 and #56.
2017-08-28 16:25:50 +01:00
Antonin Delpeuch
c66e609b1d Cleanup wikitext PR for Codacy 2017-08-26 21:50:02 +01:00
Emelyanov Michael
b69cfe84cd Translated using Weblate (Russian)
Currently translated at 100.0% (643 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ru/
2017-08-26 11:25:45 +02:00
Antonin Delpeuch
0a00fd9318 Add option to include raw templates as cells 2017-08-25 14:28:30 +01:00
Emelyanov Michael
86ca5d2d71 Translated using Weblate (Russian)
Currently translated at 65.6% (422 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ru/
2017-08-24 15:19:00 +02:00
Antonin Delpeuch
554b75fa7b Fix parsing of newlines in cells 2017-08-17 19:18:50 +01:00
Antonin Delpeuch
2a3c158696 swc-parser-lazy: Add source JAR and mention the dependencies in LICENSE.txt 2017-08-17 16:37:04 +01:00
Antonin Delpeuch
7989aacc58 Cleanup for Codacy 2017-08-17 12:40:56 +01:00
Antonin Delpeuch
637e69db9d Better error reporting and testing for Wikitext import 2017-08-16 10:30:51 +01:00
Antonin Delpeuch
e47fb3f2a6 Preview table: display reconciled cells instead of blanking them 2017-08-16 09:01:16 +01:00
Antonin Delpeuch
3dcda5a42c Add reconciliation config in wikitext import. 2017-08-16 00:05:40 +01:00
Weblate
2ce71a2742 Merge remote-tracking branch 'origin/master' 2017-08-15 23:11:20 +02:00
alexey medvetsky
7fc17f1914 Translated using Weblate (Russian)
Currently translated at 15.5% (100 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/ru/
2017-08-15 23:11:20 +02:00
Andrea
34b5d39192 Translated using Weblate (Italian)
Currently translated at 99.8% (642 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/it/
2017-08-15 23:11:17 +02:00
Thad Guidry
0347075120 Translated using Weblate (Chinese)
Currently translated at 100.0% (643 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/zh/
2017-08-15 23:11:16 +02:00
Antonin Delpeuch
5390aa248c Fix DataExtensionTests (Tajikistan has only one currency, not two) 2017-08-15 22:11:00 +01:00
Antonin Delpeuch
d01de6ea85 Update tests 2017-08-15 22:09:45 +01:00
Antonin Delpeuch
86dc240335 Support reconciliation via sitelinks.
Wikilinks are automatically reconciled at import time.

Related to #56.
2017-08-15 20:17:34 +01:00
Antonin Delpeuch
aa4517ba58 Add support for colspan and rowspan in Wikitext 2017-08-15 11:28:43 +01:00
Antonin Delpeuch
73f7fdc036 Update TextFormatGuesser to support wikitext 2017-08-14 15:58:27 +01:00
Thad Guidry
d152f0792c Translated using Weblate (Chinese)
Currently translated at 100.0% (643 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/zh/
2017-08-14 03:58:14 +02:00
Antonin Delpeuch
7b116c0388 Translated using Weblate (French)
Currently translated at 100.0% (643 of 643 strings)

Translation: OpenRefine/Translations
Translate-URL: https://hosted.weblate.org/projects/openrefine/translations/fr/
2017-08-13 21:22:45 +02:00
Antonin Delpeuch
18b1942169 Merge branch 'extend-data-fixes'
Conflicts:
	main/webapp/modules/core/langs/translation-en.json
2017-08-13 20:17:18 +01:00