Commit Graph

1754 Commits

Author SHA1 Message Date
Jesus M. Castagnetto
0795bd8422 resolved .gitignore conflict 2013-06-19 12:10:32 -05:00
Jesus M. Castagnetto
b6e8875cd7 resolved merge conflict 2013-06-19 11:23:11 -05:00
Jesus M. Castagnetto
b09bb4463e fix error in index caught by thadguidry 2013-06-19 11:21:26 -05:00
Tom Morris
349c35e1cd Merge remote-tracking branch 'upstream/master' 2013-06-17 15:52:31 -04:00
Tom Morris
b91fc8a2b1 Use CollationKeys when sorting text. Fixes issue 738 2013-06-17 15:51:29 -04:00
Tom Morris
5525d89ed2 Add Travis CI build status and clean up text 2013-06-12 18:12:34 -03:00
Tom Morris
678375915a Add Markdown version of README 2013-06-12 14:24:35 -04:00
Tom Morris
54a8848bc6 Merge branch 'master' of github.com:tfmorris/OpenRefine 2013-06-11 19:46:30 -04:00
Tom Morris
e1bea25c72 Clean up server tests
- move from shell script to Ant
- update TestNG and Mockito to latest versions
2013-06-11 19:44:58 -04:00
Tom Morris
67fc97ba6c Change product ID to use new domain 2013-06-11 15:53:45 -04:00
Tom Morris
1445984113 Merge branch 'master' of https://github.com/tfmorris/OpenRefine 2013-06-11 15:31:23 -04:00
Jesus M. Castagnetto
4e4ebd8942 restore Xor.java content, removed in a botched commit 2013-06-04 15:52:41 -05:00
Tom Morris
067fcacec7 Clean up to pass tests:
- don't include TAB in control characters which get stripped so we can
use it for splitting
- remove trailing space from normalize strings
2013-05-31 17:06:03 -04:00
Tom Morris
1907bcd8dc Disable tests for character decomposition 2013-05-31 17:04:09 -04:00
Tom Morris
7e975f878b Fix YAML so it parses 2013-05-26 11:16:14 -04:00
Tom Morris
34615dd020 Add Travis-CI YAML file - #722 2013-05-26 11:11:04 -04:00
Tom Morris
000c0a38a8 Compute delay from request issue, not response return. Fixes #721 2013-05-26 10:13:16 -04:00
Tom Morris
4a5d3d4662 Convert dates to ISO 8601 for reconciliation. Fixes #688. 2013-05-26 10:08:55 -04:00
Tom Morris
7615db97cf Add Javadoc clean up variable naming. No functional change. 2013-05-26 10:07:37 -04:00
Tom Morris
fff8991603 Add TODO 2013-05-26 08:02:12 -04:00
Tom Morris
bf837e82ba Add TODO 2013-05-26 08:01:38 -04:00
Tom Morris
36dd95c263 Add TODO for record mode operation 2013-05-26 07:54:33 -04:00
Tom Morris
3bc36a997e Reapply patch to pass "type" parameter through to Search 2013-05-26 07:48:51 -04:00
Tom Morris
02b0816cc9 Update to Suggest 4.2 2013-05-26 07:47:14 -04:00
Tom Morris
33046cff25 Merge branch 'master' of https://github.com/tfmorris/OpenRefine 2013-05-12 14:04:59 -04:00
Tom Morris
d1b2dc3fe9 Add type to text input field - fixes #706
Even though type="text" is the default, the find won't work without it
explicitly included
2013-04-13 17:04:03 -04:00
Tom Morris
0d2881dac6 Update link to help
Switch from Google Code to Github
2013-04-13 16:50:56 -04:00
Tom Morris
d1ce12301d Quote problematic characters in help text - fixes #463 2013-04-10 18:54:38 -04:00
Tom Morris
c0fb6be9fe Disable headless mode again since it only effects virtualbox (hopefully) 2013-03-26 18:07:38 -04:00
Tom Morris
3b379ef4ed Run headless on Mac to work around Java Virtualbox crash 2013-03-26 17:25:57 -04:00
Tom Morris
ae30c19f6b Switch to appbundler & specify target Java version on build 2013-03-26 17:05:17 -04:00
Tom Morris
7813439dc8 Merge remote-tracking branch 'upstream/master' 2013-03-26 12:53:32 -04:00
Tom Morris
0bdd3a2d83 Switch to Oracle appbundler for Mac build 2013-03-26 12:52:55 -04:00
Tom Morris
4770772fe6 Update name & ID for Mac OS build 2013-03-26 10:56:54 -04:00
Tom Morris
21e18ed0e4 Increase delay for Mac DMG build to try & avoid busy on eject 2013-03-25 23:31:59 -04:00
Tom Morris
a3741b0a11 Restore Mac OS X Intel workaround for launch4j 2013-03-25 23:22:31 -04:00
Tom Morris
277c31c0d3 Switch revision handling to deal with git describe output 2013-03-25 16:28:18 -04:00
Tom Morris
f6d94ecf38 Fix up some missed google-refine references 2013-03-25 16:05:48 -04:00
Tom Morris
eab9c73a46 Fix variable name collision & fall back to old version of launch4j 2013-03-25 14:50:23 -04:00
Tom Morris
6abd648752 Fix typo in Launch4J URL 2013-03-25 13:34:13 -04:00
Tom Morris
a4575aa13e Fix revision for native git instead of git svn 2013-03-25 13:25:50 -04:00
Tom Morris
5155ddfc3f Update all tool versions & fix test results display for Linux 2013-03-25 13:24:30 -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
6a91b5d75b Use InputStream instead of Reader for JSON import - fixes #698 2013-03-23 18:36:05 -04:00
Tom Morris
6b3592982e Remove O(n^2) issue in tree importers - fixes #699
- Add sparse/based list implementation for ImportRecord
2013-03-23 12:02:51 -04:00
Tom Morris
f78dfadcf3 Clean up tree import utilities for #699
- lazy allocate objects
- conditionalize logging to prevent calls to StringBuilder & toString()

These are secondary issues, but still worth cleaning up.
2013-03-23 11:56:58 -04:00
Tom Morris
0a2ba1b1ae Switch from LinkedList to ArrayList
Just a simple list.  No need for extra overhead..
2013-03-23 08:16:23 -04:00
Tom Morris
56389588e3 Update to Jackson 1.9.12 2013-03-23 08:15:08 -04:00
Tom Morris
bfa7c34d17 Merge pull request #659 - closes #659 2013-03-18 21:24:01 -04:00
Tom Morris
31cffa1181 Merge remote-tracking branch 'upstream/master' 2013-03-18 21:16:55 -04:00