Commit Graph

178 Commits

Author SHA1 Message Date
Antonin Delpeuch
a2dd6d97e4 Set version to 3.1-SNAPSHOT 2018-11-07 14:01:06 +00:00
Antonin Delpeuch
3ad7d9e19d Set version to 3.1-beta 2018-11-07 12:46:15 +00:00
Antonin Delpeuch
53aef139a3 Apply fixes to pom.xml files suggested by Eclipse 2018-11-05 17:27:17 +00:00
Mathieu Saby
6b9ada969c
Translated using Weblate (French)
Currently translated at 100.0% (45 of 45 strings)

Translation: OpenRefine/gdata
Translate-URL: https://hosted.weblate.org/projects/openrefine/gdata/fr/
2018-11-01 23:07:48 +01:00
Antonin Delpeuch
f094c7e23a Exclude redundant jars from database and gdata extensions 2018-09-22 18:04:02 +01:00
Antonin Delpeuch
0321e19fef Unify google library versions 2018-09-22 10:43:12 +01:00
Antonin Delpeuch
fc70852183 Update version to 3.1-SNAPSHOT 2018-09-21 12:28:13 +01:00
Antonin Delpeuch
c812b6118c Cleanup most Eclipse config files 2018-09-18 14:51:27 +01:00
Antonin Delpeuch
782ae4e788 Revert "Revert "Migrate to Maven""
This reverts commit c20918b73d.
2018-09-16 15:34:47 +01:00
Jacky
c20918b73d
Revert "Migrate to Maven" 2018-09-16 10:16:50 -04:00
Antonin Delpeuch
9b659c618c Cleanup classpath generation in Maven config files 2018-09-11 15:18:03 +01:00
Antonin Delpeuch
df53cf9117 Exclude javax.servlet in Gdata extension, conflicts with existing version 2018-09-11 11:30:18 +01:00
Antonin Delpeuch
6c42a2aba9 Cleanup copied libs along with class files 2018-09-11 11:14:15 +01:00
Antonin Delpeuch
c12502aaae Use dependency plugin to copy runtime lib to MOD-INF dirs 2018-09-11 10:55:29 +01:00
Antonin Delpeuch
1c20242d40 Replace version and groupId by variables in submodules 2018-09-10 15:33:30 +01:00
Antonin Delpeuch
e589697171 Remove Ant configuration files 2018-09-10 15:13:26 +01:00
Antonin Delpeuch
9b54ac2bd2 Remove jars of dependencies 2018-09-10 15:11:21 +01:00
Antonin Delpeuch
aa5088d7bf Disable tests for pc-axis and gdata extensions 2018-09-10 13:48:52 +01:00
Antonin Delpeuch
f14bd18a7b Add Maven configuration for gdata extension 2018-09-07 11:27:28 +01:00
Isao Matsunami
6dbb51679c
Translated using Weblate (Japanese)
Currently translated at 100.0% (45 of 45 strings)

Translation: OpenRefine/gdata
Translate-URL: https://hosted.weblate.org/projects/openrefine/gdata/ja/
2018-08-29 12:39:48 +02:00
Isao Matsunami
ccfa51cee3
Translated using Weblate (Japanese)
Currently translated at 100.0% (45 of 45 strings)

Translation: OpenRefine/gdata
Translate-URL: https://hosted.weblate.org/projects/openrefine/gdata/ja/
2018-08-28 11:38:25 +02:00
Jacky
5a6c9d72f0 fix the template load issue and package typo 2018-06-16 15:43:29 -04:00
Jacky
9a469fce17 add timeout support 2018-05-28 23:21:44 -04:00
Isao Matsunami
21c31d5c50
updated a file for Japanese 2018-05-19 02:05:10 +09:00
Jacky
cf573f37de fix the NPE when there is no fusion table exists 2018-03-06 18:16:29 -05:00
Jacky
ac57eb813e changes based on code review 2018-03-06 18:10:54 -05:00
Jacky
6af7e6545c adjust timeout to 3 min 2018-03-01 22:48:14 -05:00
Jacky
77aad7eb05 changes based on the code review 2018-03-01 22:45:14 -05:00
Jacky
c758a6b635 exclude test-out 2018-02-25 12:00:40 -05:00
Jacky
a9a41c074a upgrade the google api client 2018-02-02 13:08:29 -05:00
Jacky
efcbe4b718 upgrade the google api services 2018-02-02 13:04:27 -05: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
Isao Matsunami
c75f97b40d
Update translation-jp.json 2017-12-28 17:08:07 +09:00
Isao Matsunami
a72d365b2b
Create translation-jp.json
Added Japanese translation file for Google Data extension
2017-12-28 16:52:11 +09:00
Antonin Delpeuch
c9cc4fb262 Update Jackson to 2.9.1
Closes #1262
2017-10-09 17:38:09 +01:00
Antonin Delpeuch
bcdd04d062 Merge branch 'master' of https://github.com/noamoss/OpenRefine into noamoss
Conflicts:
	extensions/freebase/module/langs/translation-he.json
	main/webapp/modules/core/langs/translation-en.json
2017-08-12 09:45:23 +01:00
Antonin Delpeuch
dbb071da30 Merge branch 'default-to-english' of https://github.com/RBGKew/OpenRefine into RBGKew-default-to-english 2017-08-09 14:07:22 +01:00
Fadi Maali
0e21c0e594 correct classpath references and java version
- updated classpath references to existing versions of the libraries.
- Java version upgraded to 7 as some Java 7 specific features are used.
- corrected references to old project name (grefine-all) in the launch script
2017-07-18 22:15:46 +01:00
Tom Morris
508fa6efc3 Fix character set for GData docs - fixes #1003 2015-05-15 15:54:09 -04:00
Tom Morris
28eafe7a5b Update Google client libs to current versions. Fix Spreadsheet #996 2015-05-14 20:41:03 -04:00
Daniel Berthereau
d1dbaa6f77 Translated into French. 2015-04-06 00:00:00 +02:00
Matthew Blissett
5cdc6d7b5a Fallback to English language to avoid need to maintain 'default' translation files. 2015-02-10 12:33:08 +00:00
Ram Ezrach
4a822d2957 Update translation-he.json 2014-12-22 20:27:39 +02:00
Tom Morris
dd32f37ab6 Improve error message via @annolangen in PR #853 2014-12-21 14:54:25 -05:00
Tom Morris
80b85dd6df Remove unused code 2014-12-21 13:15:26 -05:00
Tom Morris
c3d401d479 Fix CSV quote escaping via @annolangen from PR #853 2014-12-21 13:09:50 -05:00
Tom Morris
c4b6f824f0 Fix ClassCastException via @annolangen from PR #853 2014-12-21 13:04:56 -05:00
Tom Morris
0155a9bbee Add .gitignore files 2014-12-21 13:03:49 -05:00
Tom Morris
09f55fb436 Merge pull request #920 from opendatatrentino/fixEclipseDeps
Update deps in Eclipse projects and some jar sources
2014-12-21 12:39:43 -05:00
noamoss
68e20730da translate "gdata-import" into Hebrew 2014-12-14 21:58:16 +02:00
David Leoni
bf60360b26 fixes language context in browser calls 2014-12-03 14:52:06 +01:00
David Leoni
ffad78c542 updated deps in Eclipse project and some jar sources 2014-12-01 16:17:25 +01:00
Pablo Moyano
a1cd605968 fixing bug #799 2013-12-25 13:12:13 -03:00
Tom Morris
0abe663ec0 Fix some deprecated uses of attr(). Backward compatible to jQuery 1.6 2013-09-18 15:38:12 -04:00
Tom Morris
819b577644 Switch from dashes to underscores to keep Javascript happy - fixes #802
(also matches the style of all the other IDs)
2013-09-03 12:05:06 -04:00
Tom Morris
fcb41d7f5f Fix copy/paste error in text setup for signout button - fixes #801 2013-09-02 18:56:55 -04:00
Tom Morris
29eb95cba2 Exclude lib-src JARs - #792 2013-08-26 15:36:53 -04:00
Tom Morris
e98d6037cf Delete obsolete Guava JARS - #792 2013-08-26 15:34:18 -04:00
Tom Morris
eeb082b763 Merge remote-tracking branch 'origin/master' into fusiontables-migration
Conflicts:
	extensions/freebase/module/langs/translation-default.json
	extensions/freebase/module/langs/translation-en.json
	extensions/freebase/module/langs/translation-it.json
	extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java
	extensions/gdata/module/MOD-INF/controller.js
	extensions/gdata/module/langs/translation-default.json
	extensions/gdata/module/langs/translation-en.json
	extensions/gdata/module/langs/translation-it.json
	extensions/gdata/src/com/google/refine/extension/gdata/commands/LoadLanguageCommand.java
	main/src/com/google/refine/commands/lang/LoadLanguageCommand.java
	main/src/com/google/refine/commands/lang/SetLanguageCommand.java
	main/webapp/modules/core/langs/translation-default.json
	main/webapp/modules/core/langs/translation-en.json
	main/webapp/modules/core/langs/translation-it.json
	main/webapp/modules/core/scripts/index/lang-settings-ui.js
2013-08-16 17:56:56 -04:00
Tom Morris
f3b18da0ea Line endings 2013-08-16 16:25:27 -04:00
Tom Morris
f4ff227340 Clean up localization - fixes #760, modifies pull request #755
- make all file loading relative to module base
- move core language files into appropriate place
- eliminate all SetLanguage commands and use SetPreference instead
- eliminate all LoadLanguage commands except for core's
- fix duplicate keys in JSON language files
- remove BOM from JSON language files

OPEN - task 760: Translations not being loaded from built kit 
http://github.com/OpenRefine/OpenRefine/issues/issue/760
2013-07-31 00:31:31 -04:00
Tom Morris
9450d483ce Fix up line endings 2013-07-29 15:49:20 -04:00
Tom Morris
00dd7f2bdd Merge branch 'master' into fusiontables-migration
Conflicts:
	.classpath
	extensions/gdata/module/MOD-INF/controller.js
	extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java
2013-07-25 16:13:04 -04:00
Tom Morris
1e5f89e84c Centralize handling of import job config object & synchronize to allow
multiple accessors
2013-07-25 15:41:08 -04:00
Blakko
6e90bc41f6 Merge remote-tracking branch 'origin/master' into internationalization
Conflicts:
	extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html
	main/webapp/modules/core/index.vt
	main/webapp/modules/core/project.vt
	main/webapp/modules/core/scripts/project/browsing-engine.js
	main/webapp/modules/core/scripts/project/history-panel.html
2013-07-25 11:07:59 +02:00
Blakko
e6e6c8c002 Added a "Language Settings" menu at index
Now the language manually set has priority over the browser lang
Update translations
2013-07-12 11:12:33 +02:00
Tom Morris
a371a9cb5d Specify target Java version for bundled extensions - addresses part
of #754
2013-07-10 15:45:25 -04:00
Blakko
0adadb55dd Fix for gdata extension 2013-07-04 11:49:59 +02:00
Blakko
6048ef29f4 Added default translation file
Fixed a wrong field
2013-06-28 14:31:24 +02:00
Blakko
696eccc872 gdata-extension internationalization 2013-06-27 17:25:53 +02:00
Tom Morris
22a9acd04b Merge branch master 2013-04-13 19:02:20 -04:00
Tom Morris
567da6aa9f Normalize line endings
Add .gitattributes & do one-time normalization of line endings
2013-03-23 18:46:20 -04:00
Tom Morris
7fb95ebbad First pass implementation of new Fusion Tables API - fixes #539 2013-02-11 16:33:51 -05:00
Tom Morris
2464421014 Update to rev 17 of Fusion Tables JARs 2013-02-11 12:36:45 -05:00
Tom Morris
092acf082a Update URLs for new Fusion Table encrypted ID format 2013-02-10 15:03:43 -05:00
Tom Morris
bf2f775c0b Migrate to OAuth2
- implement OAuth2 for both Spreadsheets & Fusion Tables
- switch cookie name from authsub_token to oauth2_token so there's no
confusion
- implementation is otherwise unchanged - in particular still uses old
Fusion Tables SQL API
2013-02-10 14:17:28 -05:00
Tom Morris
d7081415d4 Restore deprecated Fusion Tables authorization domain
- just for now until we've implemented the new support
2013-02-09 15:41:06 -05:00
Tom Morris
0c6e065ac6 Refactor GData support to separate FusionTables 2013-02-09 13:41:02 -05:00
Tom Morris
c43e106abb Add JARs for new FusionTables API and dependencies 2013-02-09 13:23:13 -05:00
Tom Morris
0bd2104a16 Issue 630: Change branding from Google Refine to OpenRefine
** The first native Github commit (ie not one converted from SVN **
Change Google Refine to OpenRefine or just Refine.  
Change icon filenames and add some placeholder icons
2012-10-18 19:40:31 -04:00
Tom Morris
03d997be8e FIXED - task 576: Use relative paths so works under a Java server named context - patch supplied by sergio@wikier.org
http://code.google.com/p/google-refine/issues/detail?id=576

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2584 7d457c2a-affb-35e4-300a-418c747d4874
2012-10-13 17:47:08 +00:00
Tom Morris
1bcf2899a8 FIXED - task 620: Update gdata client libs to 1.47.1
http://code.google.com/p/google-refine/issues/detail?id=620

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2577 7d457c2a-affb-35e4-300a-418c747d4874
2012-10-12 19:42:45 +00:00
Tom Morris
9347d38e5e FIXED - task 608: remove unused jar
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2546 7d457c2a-affb-35e4-300a-418c747d4874
2012-09-13 18:05:56 +00:00
Tom Morris
c406876b51 Fix resource leak
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2522 7d457c2a-affb-35e4-300a-418c747d4874
2012-08-04 00:26:33 +00:00
David Huynh
4fbfd17ddf Fixed typo "cancelImportinJob".
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2440 7d457c2a-affb-35e4-300a-418c747d4874
2012-01-29 08:01:05 +00:00
David Huynh
aef95e7c30 When failed to access a spreadsheet with login credentials, try to access it without.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2378 7d457c2a-affb-35e4-300a-418c747d4874
2011-11-17 18:52:14 +00:00
David Huynh
39c6ae1b80 Consolidated the two different forms for public URLs together into one. Made sure we could still import public docs while signed in.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2377 7d457c2a-affb-35e4-300a-418c747d4874
2011-11-17 01:32:28 +00:00
Tom Morris
c07046f542 Issue 461 - Add support for public Google Spreadsheets and ability to sign-out.
Kind of messy, but I don't think any of the previously existing functionality is broken.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2375 7d457c2a-affb-35e4-300a-418c747d4874
2011-11-16 07:34:41 +00:00
Tom Morris
b8cc1e6c5f Remove gData URL rewriters and wire about page back up
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2372 7d457c2a-affb-35e4-300a-418c747d4874
2011-11-12 23:16:21 +00:00
Tom Morris
d4ec9f3279 Make sure writer is closed so we don't leak file handles
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2319 7d457c2a-affb-35e4-300a-418c747d4874
2011-10-11 20:14:13 +00:00
Stefano Mazzocchi
df29c0b281 whitespace (no functional changes)
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2300 7d457c2a-affb-35e4-300a-418c747d4874
2011-10-07 19:33:28 +00:00
Stefano Mazzocchi
af5b49eab9 whitespace (no functional changes)
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2299 7d457c2a-affb-35e4-300a-418c747d4874
2011-10-07 19:25:15 +00:00
David Huynh
765fb4ea8e Use chrome frame to support IE. Also rewired gdata authentication process to support IE.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2270 7d457c2a-affb-35e4-300a-418c747d4874
2011-10-05 04:39:42 +00:00
Tom Morris
2deae9d785 Issue 450 - Double escape our double escape so that single quotes in data don't cause uploads to fail
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2265 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-29 21:26:53 +00:00
Tom Morris
0210329e8f Issue 450 - Alert user when upload fails
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2264 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-29 21:25:27 +00:00
David Huynh
0e6c37ce35 Fixed Issue 433: Usability: use HTML <label> (e.g., for checkboxes) (for index page)
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2260 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-29 05:58:02 +00:00
David Huynh
4c5b2514fd Support uploading directly to a new Google Fusion table.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2244 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-16 20:59:58 +00:00
David Huynh
5c446d28d0 Support uploading directly to a new Google spreadsheet.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2243 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-16 18:04:55 +00:00
David Huynh
b585140c34 Sort FT tables to the bottom since we don't have any metadata for them.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2242 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-16 00:34:00 +00:00
David Huynh
02c58e2c56 Periodically clean up stale importing jobs to free up disk space.
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2240 7d457c2a-affb-35e4-300a-418c747d4874
2011-09-15 23:52:05 +00:00