Project

General

Profile

Activity

From 09/10/2015 to 10/09/2015

10/09/2015

09:40 PM Revision 9c97664e (utis-core): tests with more detailed expectations
Andreas Kohlbecker
08:24 PM Revision b25fc9c9 (utis-core): using species-schema#validName to detect accepted taxa
Andreas Kohlbecker
07:50 PM Revision 070fd8df (utis-core): local TDB access problems solved
Andreas Kohlbecker
04:21 PM Revision d73a468e (utis-core): bugfix: starting transaction before executing describe
Andreas Kohlbecker
03:46 PM Revision b84bdb82 (utis-core): first working implementation of the EUNIS SPARQL client
Andreas Kohlbecker
03:42 PM Revision 3b668a07 (taxeditor): remove Ignore on saveNewTerm test
Andreas Müller
03:41 PM Revision bd10f42b (taxeditor): Cleanup DeleteOperation
Andreas Müller
03:33 PM Revision 9a84bed8 (taxeditor): Merge branch 'master' into develop
Cherian Mathew
02:38 PM Revision d8fe1030 (cdmlib): Merge branch 'ticket-5066' into develop
Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
...
Andreas Müller
02:29 PM Revision 45741193 (taxeditor): Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"
This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca. Cherian Mathew
02:17 PM Revision 51c5b735 (taxeditor): Add missing files to ignore on merge conflict
Cherian Mathew
02:15 PM Revision eb9a6442 (cdmlib): minor clean ups
Andreas Müller
02:07 PM Revision 9524fa39 (taxeditor): Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
Cherian Mathew
01:55 PM Revision 3cb0b24a (taxeditor): Add files to ignore on merge conflict if the 'ours' driver is configured
Cherian Mathew
10:30 AM Revision 2f9c6d26 (cdmlib): Cleanup SecurityTest
Andreas Müller
10:09 AM Revision 97ee0157 (cdmlib): Adapt listeners and tests to new pre-insert strategy #5066
Andreas Müller

10/08/2015

06:18 PM Revision 7bc01856 (taxeditor): Add test for editor / server cdmlib version check
Cherian Mathew
05:19 PM Revision d4d342a1 (taxeditor): #5302 Add cdm version and services version check
Cherian Mathew
05:02 PM Revision 09081d2b (cdmlib): Add cascade merge to members field
Cherian Mathew
04:54 PM Revision 36ae5e03 (taxeditor): Update transient services for new load method
Cherian Mathew
03:13 PM Revision ce18bb89 (taxeditor): #5309, #5310 Add load method to retrieve user entity after create and password change
Cherian Mathew
03:10 PM Revision c77f6466 (cdmlib): #5309, #5310 Switch on write transaction annotation for delete, Add load methof for updating session cache
Cherian Mathew
02:17 PM Revision da54d73f (cdmlib): Fix recursive merge call
Cherian Mathew
02:04 PM Revision 23d7bfe0 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
02:01 PM Revision 7f1e8a4d (taxeditor): last changes for #5114
Katja Luther
12:48 PM Revision 37d7ce64 (taxeditor): Add load capability for MergeResult objects
Cherian Mathew
12:48 PM Revision 6c95dd3d (taxeditor): Update root entity merge calls to use new merge method.
Cherian Mathew
12:47 PM Revision ce9bc492 (cdmlib): Add new merge method for root entitites which returns the newly created MergeResult object
Cherian Mathew
12:31 PM Revision ff7c8e43 (taxeditor): minor
Katja Luther
10:38 AM Revision c40ece3e (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
10:38 AM Revision 947bebd6 (taxeditor): #5114 fix
Katja Luther

10/07/2015

05:40 PM Revision b0792cd5 (taxeditor): Merge branch 'develop' into unify_derivative_views
Patrick Plitzner
05:38 PM Revision c1252729 (taxeditor): Implement filter for assigned specimens
- added drop down to select filter type
- implemented filtering of specimen list
Patrick Plitzner
05:33 PM Revision 8d922848 (taxeditor): Fix label
Patrick Plitzner
05:33 PM Revision 1c5d598c (taxeditor): Listen to taxon selection
Patrick Plitzner
05:32 PM Revision a6cf45ad (taxeditor): Fix potential class cast exception
Patrick Plitzner
05:32 PM Revision 8d8db03d (taxeditor): Fix potential NPE
Patrick Plitzner
05:30 PM Revision e3a07c8a (taxeditor): Use convenience method for associated taxa
Patrick Plitzner
05:26 PM Revision b6b6d586 (cdmlib): Add new service method for retrieving all associated taxa for a specimen
Patrick Plitzner
02:30 PM Revision 82e1ba17 (taxeditor): Fix typo
Patrick Plitzner
02:14 PM Revision 4231dc94 (taxeditor): new ErrorDialog for delete result messaging
Katja Luther
02:13 PM Revision 8336cf65 (taxeditor): improve messaging for deleteresults
Katja Luther
01:39 PM Revision 1fb394d6 (cdmlib): Merge branch 'develop' into ticket-5066
Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-persistence/src/main/java/...
Andreas Müller
01:16 PM Revision db434445 (taxeditor): Add initial OccurenceView to RCP plugin
Patrick Plitzner
12:34 PM Revision 1a363aeb (taxeditor): minor
Katja Luther
12:31 PM Revision bb08b867 (taxeditor): check for isdeletable before set delete button disabled
Katja Luther
11:08 AM Revision f19b5344 (taxeditor): Fix layout of derivative tree
Patrick Plitzner
11:03 AM Revision 63c806ca (taxeditor): Delete unused classes
Patrick Plitzner
09:20 AM Revision c25cef49 (taxeditor): Refresh hierarchy tree after searching
Patrick Plitzner
07:24 AM Revision 10041c67 (taxeditor): Add "Show View" entry for derivative editor
Patrick Plitzner
07:11 AM Revision 2fcd92b4 (taxeditor): Move derivative search view classes to taxeditor.editor
- adapted DerivateView Patrick Plitzner

10/06/2015

03:50 PM Revision 8aac42d2 (taxeditor): I18n of login and data source view
Patrick Plitzner
02:41 PM Revision 3137470a (taxeditor): Fix potential NPE
Patrick Plitzner
02:25 PM Revision 06c38222 (cdmlib): typos in documentation
Andreas Kohlbecker
02:10 PM Revision de30f355 (taxeditor): Fix named area filter for selection dialog (#2353)
Patrick Plitzner
01:26 PM Revision 4f494eae (cdmlib): Add commented code for copying properties
Cherian Mathew
11:53 AM Revision 619baf35 (taxeditor): create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons
Katja Luther
11:48 AM Revision d1fd5d18 (taxeditor): minor
Katja Luther
11:40 AM Revision ee0d8808 (taxeditor): minor in TaxonNodeDetailElement
Katja Luther
11:15 AM Revision 489f607b (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
11:15 AM Revision 5395d49a (taxeditor): merge branches
Katja Luther
11:09 AM Revision d17ecaf7 (taxeditor): merge branches
U-BGBM\k.luther
11:07 AM Revision bba3fcf8 (taxeditor): minor
U-BGBM\k.luther
11:05 AM Revision 958979c5 (taxeditor): Disable expanding of key section (#3461)
Patrick Plitzner
11:05 AM Revision e11c0cff (taxeditor): Trim code
Patrick Plitzner
10:58 AM Revision c860d200 (taxeditor): merge
U-BGBM\k.luther
10:47 AM Revision 04a79edb (taxeditor): minor
U-BGBM\k.luther
09:50 AM Revision d382265f (taxeditor): in a selection element an disabled element can't be deleted so the delete button should be disabled too
U-BGBM\k.luther
09:21 AM Revision 86c1f3a7 (taxeditor): Disable expanding of key section (#3461)
Patrick Plitzner
09:16 AM Revision e68d8e76 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther
09:16 AM Revision 369ac904 (taxeditor): improve messaging for deleteResult
U-BGBM\k.luther
08:53 AM Revision 803c3a9a (taxeditor): Trim code
Patrick Plitzner

10/05/2015

07:12 PM Revision b91fa795 (cdm-server): #5302 Add new jsp to provide general server info
Cherian Mathew
05:50 PM Revision 164eb9f0 (taxeditor): Change merge to standard call for new taxon node
Cherian Mathew
03:05 PM Revision 4fbac559 (taxeditor): Add check for remoting before setting new entity listener
Cherian Mathew
01:29 PM Revision 676a8bf4 (taxeditor): Add null check to handler (#5283)
Patrick Plitzner
01:27 PM Revision c0dba325 (taxeditor): Trim code
Patrick Plitzner
01:23 PM Revision 29e3f630 (taxeditor): Add null check to derivate label provider (#5271)
Patrick Plitzner
12:58 PM Revision fe515a88 (taxeditor): Disable search bar when not connected to CDM store (#3341)
Patrick Plitzner
12:46 PM Revision dc62592d (taxeditor): Allow using the search bar only if at least one letter is entered
(#3341) Patrick Plitzner
11:29 AM Revision dd7f77fb (taxeditor): Disable menu items when not connected to CDM store (#4901)
Patrick Plitzner
10:14 AM Revision e11fa59e (taxeditor): Enable DetailsView for SpecimenView selection
- Details view shows hierarchy details like in the data portal Patrick Plitzner
10:13 AM Revision d06b07d3 (taxeditor): Trim code
Patrick Plitzner
09:38 AM Revision b112fd08 (taxeditor): minor
U-BGBM\k.luther
09:02 AM Revision 9d69a13b (taxeditor): Adapt MediaSpecimen i18n
Patrick Plitzner
09:02 AM Revision e9bfec4a (taxeditor): Fix child hierarchy for DnaSamples
- Fixed adding and displaying of sub derived units like e.g. media Patrick Plitzner
09:02 AM Revision 5ce71816 (taxeditor): Fix null selection for existing media
Patrick Plitzner

10/02/2015

06:59 PM Revision cf412a22 (taxeditor): #5282 Integrate remoting in referencing objects view
Cherian Mathew
06:08 PM Revision ee35e38f (taxeditor): Documentation
Patrick Plitzner
04:59 PM Revision 72c118d0 (taxeditor): Merge branch 'hotfix/3.8.1'
jenkins
04:56 PM Revision f0d40971 (taxeditor): updating poms for branch'hotfix/3.8.1' with non-snapshot versions
jenkins
04:55 PM Revision 67b71ba5 (taxeditor): Revert project versions to 3.8.1-SNAPSHOT
jenkins
04:54 PM Revision db87bf1d (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.1 and cdmlib version :
jenkins
04:52 PM Revision ec23f5f4 (taxeditor): #5301 Fix null session issues, Add remoting session for feature tree editor
Cherian Mathew
04:49 PM Revision 4a6c88be (taxeditor): Use deproxy
Patrick Plitzner
04:49 PM Revision 7c291513 (taxeditor): Trim code
Patrick Plitzner
04:49 PM Revision 984a9f75 (taxeditor): Add double-click and context menu to specimen view
Patrick Plitzner
04:49 PM Revision f1884def (taxeditor): Trim code
Patrick Plitzner
04:49 PM Revision 2b6aa4fb (taxeditor): Initial implementation of SpecimenView
Patrick Plitzner
04:49 PM Revision 144f4aa3 (taxeditor): Trim code
Patrick Plitzner
04:49 PM Revision d44f2e81 (cdmlib): Set transient id for root merge object
Cherian Mathew
03:47 PM Revision dac7aeec (taxeditor): Adapt transient services
Patrick Plitzner
03:32 PM Revision ac48a1e8 (taxeditor): Add i18n files to build
Patrick Plitzner
03:19 PM Revision 6eccaa42 (cdmlib): Extend media gathering for taxon specimens
Patrick Plitzner
03:19 PM Revision 3b75292b (cdm-dataportal): Add /bin to .gitignore
Patrick Plitzner
03:18 PM Revision 43034365 (cdm-dataportal): Fix typo
Patrick Plitzner
01:55 PM Revision 5e395a46 (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.1-SNAPSHOT and cdmlib version :
jenkins
01:54 PM Revision 627378a3 (taxeditor): updating poms for 3.8.1 branch with snapshot versions
jenkins
01:38 PM Revision 1ec52766 (taxeditor): Change null session to singleton with no owner
Cherian Mathew
11:24 AM Revision a8911868 (taxeditor): Update transient services with new merge method
Cherian Mathew
11:10 AM Revision d29a0062 (cdmlib): Add merge method to return updated transient object for lists
Cherian Mathew
10:59 AM Revision fce7d237 (taxeditor): Add remoting checks for merge, Move to merge call which returns updated transient object
Cherian Mathew

10/01/2015

05:27 PM Revision a1a8b581 (taxeditor): #5300 Implement remoting in Alignment Editor
Cherian Mathew
05:23 PM Revision 5189077e (cdmlib): #5281 Make SingleReadAlignment.Shift serializable
Cherian Mathew
04:11 PM Revision 79136a9f (taxeditor): Correct derivative hierarchy context menu label
Patrick Plitzner
03:14 PM Revision c27ecf00 (taxeditor): #5299 Handle session caching of new entities
Cherian Mathew
03:11 PM Revision 27e202aa (cdmlib): #5299 Add new entity listener and event firing
Cherian Mathew
02:58 PM Revision 3331cc69 (taxeditor): #5256 Add workaround for description reference issue
Cherian Mathew
02:48 PM Revision 528e950d (cdmlib): #5256 Add test for description reference problem
Cherian Mathew
11:03 AM Revision 1e469223 (taxeditor): minor
U-BGBM\k.luther
11:00 AM Revision 557e4df8 (taxeditor): fixing problem of reusing name for creation of taxon
U-BGBM\k.luther
10:55 AM Revision 3915821a (taxeditor): Pre-select country as named area type for country selection for
specimens (#2353) Patrick Plitzner
10:54 AM Revision 033c0527 (taxeditor): Trim code
Patrick Plitzner

09/30/2015

06:57 PM Revision adb2a726 (taxeditor): Add check for remoting to decide whether to merge or save
Cherian Mathew
03:43 PM Revision 421666b4 (taxeditor): Fix i18n (#5155)
Patrick Plitzner
02:05 PM Revision 7d8050b3 (utis-core): moving checklist tests in own package
Andreas Kohlbecker
02:03 PM Revision c5e6fc74 (utis-core): separating query protocol implementation from checklist clients
Andreas Kohlbecker
01:01 PM Revision 79b22d9c (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther
01:00 PM Revision 4537c26d (taxeditor): move descriptions in a service call
U-BGBM\k.luther
12:55 PM Revision b2e3cca7 (taxeditor): Always search for FieldUnits in DerivativeSearchView
Patrick Plitzner
12:49 PM Revision a8933813 (taxeditor): Add check to ensure merge in editors is performed only in remoting
Cherian Mathew

09/29/2015

11:42 AM Revision ec120379 (cdm-dataportal): syntax typo
Andreas Kohlbecker
11:36 AM Revision 502f8712 (cdm-dataportal): #4411 hack to avoid regression reported in #5286
Andreas Kohlbecker
10:36 AM Revision 9aa8416d (taxeditor): #5291 Disable data change event firing in case of remoting
Cherian Mathew
10:15 AM Revision 054e8c86 (cdm-server): Merge branch 'hotfix/3.11.1'
jenkins
10:15 AM Revision 372e50a0 (cdm-server): Updating develop poms back to pre merge state
jenkins
10:15 AM Revision 7f3cc435 (cdm-server): Merge branch 'master' into develop
jenkins
10:15 AM Revision 6dd4339d (cdm-server): Updating develop poms to hotfix version to avoid merge conflicts
jenkins
10:14 AM Revision 8aa58655 (cdm-server): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
jenkins

09/28/2015

05:34 PM Revision b8712a66 (cdmlib): Updating develop poms back to pre merge state
Andreas Kohlbecker
05:34 PM Revision b1d3ac06 (cdmlib): Merge branch 'master' into develop
Andreas Kohlbecker
05:34 PM Revision 1e3df039 (cdmlib): Updating develop poms to hotfix version to avoid merge conflicts
Andreas Kohlbecker
05:34 PM Revision 5740535e (cdmlib): Merge branch 'hotfix/3.11.1'
Andreas Kohlbecker
04:28 PM Revision 6f564b84 (cdmlib): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
Andreas Kohlbecker
03:47 PM Revision 5408a4d5 (cdm-webapp): Merge branch 'hotfix/3.11.1'
Andreas Kohlbecker
03:47 PM Revision 5f91b1c4 (cdm-webapp): setting cdmlib dependency to 3.11.1
Andreas Kohlbecker
03:42 PM Revision b3984db7 (cdm-webapp): reverting broken hotfix release 3.11.1
Andreas Kohlbecker
03:27 PM Revision 857bc6ab (cdm-webapp): Merge branch 'hotfix/3.11.1'
jenkins
03:27 PM Revision 72202816 (cdm-webapp): Updating develop poms back to pre merge state
jenkins
03:27 PM Revision a8f8433e (cdm-webapp): Merge branch 'master' into develop
jenkins
03:27 PM Revision 89048116 (cdm-webapp): Updating develop poms to hotfix version to avoid merge conflicts
jenkins
03:27 PM Revision 44a7fe25 (cdm-webapp): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
jenkins
03:26 PM Revision 1f4ff0d0 (cdmlib): resolving conficts in project versions after hotfixrelease
Andreas Kohlbecker
03:23 PM Revision b779b385 (cdmlib): Merge branch 'hotfix/3.11.1'
Andreas Kohlbecker
02:23 PM Revision 353fbf79 (cdmlib): #5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
Andreas Kohlbecker
02:18 PM Revision 31ef9ed5 (cdm-server): updating poms for 3.11.1 branch with snapshot versions
jenkins
02:17 PM Revision 2745879b (cdm-webapp): updating poms for 3.11.1 branch with snapshot versions
jenkins
02:15 PM Revision 1e10c95b (cdmlib): updating poms for 3.11.1 branch with snapshot versions
jenkins
02:14 PM Revision 95a1e0a9 (cdmlib): Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods" since this commit needs to be in a hotfix release.
This reverts commit 2693f7105470815383cdf485355e7fc5ad81ed68. Andreas Kohlbecker
01:46 PM Revision 2693f710 (cdmlib): #5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
Andreas Kohlbecker
09:58 AM Revision d5486ffa (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther
09:57 AM Revision 2a56c01d (taxeditor): minor
U-BGBM\k.luther

09/25/2015

10:05 AM Revision 7fa1eea8 (cdm-dataportal): setting project name to CDM Dataportal
Andreas Kohlbecker

09/24/2015

11:58 AM Revision bf93de2d (taxeditor): Add missing properties file for tests
Cherian Mathew
11:05 AM Revision abebca79 (taxeditor): #5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
Cherian Mathew
11:05 AM Revision e7923b05 (taxeditor): #5247 Use updated entities
Cherian Mathew
11:05 AM Revision 3b89ce77 (taxeditor): #5250 Initial attempt at property paths
Cherian Mathew
11:02 AM Revision eeed5bb8 (cdmlib): Add a new merge method in the service base class which allows the option to return the transient object
Cherian Mathew

09/23/2015

02:29 PM Revision 8de05ed8 (taxeditor): merge with local branch
U-BGBM\k.luther
01:21 PM Revision 5354f693 (taxeditor): fix delete of taxon which is in two classifications and has children
U-BGBM\k.luther
12:26 PM Revision 9e671498 (taxeditor): Remove profile for clean goals to delete cdmlib jars
Cherian Mathew
11:51 AM Revision 5b647198 (cdmlib-apps): minor for Caryophyllales
Katja Luther
11:29 AM Revision dd12e4f8 (cdmlib): minor
Katja Luther
11:29 AM Revision 82a73743 (cdmlib): minor
Katja Luther
11:29 AM Revision ef39b9bb (cdmlib): adapt CacheUpdater to changes in ImportConfiguratorBase
minor changes in TcsXmlNameImport Katja Luther
11:26 AM Revision 8d43a8ed (cdmlib): minor
Katja Luther
11:26 AM Revision 49d85c28 (cdmlib): minor
Katja Luther
11:17 AM Revision 210c01fc (cdmlib): fixing merge conflict
Katja Luther

09/22/2015

06:44 PM Revision 28f75e33 (taxeditor): Merge branch 'remoting-4.0' into develop
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor...
Cherian Mathew
10:01 AM Revision 7f9465d2 (taxeditor): Sort classifications in dropdown of taxon node selection dialog (#5184)
Patrick Plitzner
10:01 AM Revision 0c6a1a43 (taxeditor): Pre-select current classification for taxon node selection dialog
(#3462) Patrick Plitzner
10:01 AM Revision 8393634c (taxeditor): Delete unused method
Patrick Plitzner
10:01 AM Revision 9f6b5e8b (taxeditor): Trim code
Patrick Plitzner
09:51 AM Revision 34469274 (taxeditor): Expand polytomous key section #3461
Patrick Plitzner
09:49 AM Revision 4da44861 (taxeditor): Trim code
Patrick Plitzner
09:49 AM Revision e4ab9116 (taxeditor): Add geoscopes and taxonomic scope as subsection to polytomous key detail
element Patrick Plitzner
08:21 AM Revision 0bae5e5a (taxeditor): Add selection listener to media detail element to allow showing
supplemental data (#3367) Patrick Plitzner
08:10 AM Revision 8b6a0f21 (taxeditor): Fix media view selection
Patrick Plitzner

09/21/2015

03:02 PM Revision a45e3c4a (taxeditor): Generalized UriWithLabelElement to use super class
Patrick Plitzner
02:40 PM Revision f8ee2720 (taxeditor): Add Lsid text field to taxonname details view
- added generic abstract class for URI text fields Patrick Plitzner
09:57 AM Revision 5a91da84 (taxeditor): Disable menu "New..." meun entries when no connection available (#4901)
Patrick Plitzner
09:44 AM Revision a4350d13 (taxeditor): Disable media view when synonym selected (#5195)
Patrick Plitzner
09:30 AM Revision 12ebf505 (taxeditor): I18n for specimen editor (#5155)
Patrick Plitzner

09/18/2015

04:16 PM Revision ddcc5e18 (cdmlib): minor
Andreas Müller
04:11 PM Revision b6301f68 (cdmlib): minor
Andreas Müller
03:56 PM Revision df1f5db8 (cdmlib): minor
Andreas Müller

09/17/2015

05:46 PM Revision 6abb0164 (cdm-dataportal): moving site folder to root and setting up the pom.xml, also updating the site content
Andreas Kohlbecker
05:03 PM Revision 65b1cba1 (cdm-dataportal): resolving conflicts that occured during relase-finish
Andreas Kohlbecker
05:00 PM Revision a2304745 (cdm-dataportal): updating develop poms to master versions to avoid merge conflicts
Andreas Kohlbecker
05:00 PM Revision 8598bb97 (cdm-dataportal): Merge branch 'release/3.9.0'
Andreas Kohlbecker
04:59 PM Revision 8f5f8f6c (cdm-dataportal): adding distributionmanagement and buid waggon connectors to the new pom.xml
Andreas Kohlbecker
04:58 PM Revision b5a14dab (cdm-dataportal): disabling old pom.xml used for site
Andreas Kohlbecker
04:49 PM Revision 9f03d709 (cdm-dataportal): updating poms for branch'release/3.9.0' with non-snapshot versions
Andreas Kohlbecker
04:49 PM Revision 7cf97d55 (cdm-dataportal): updating poms for 3.9.1-SNAPSHOT development
Andreas Kohlbecker
04:42 PM Revision 7226d02b (cdm-dataportal): initial pom.xml with jgitflow-maven-plugin
Andreas Kohlbecker
03:10 PM Revision f555e0ec (cdm-dataportal): whitespace
Andreas Kohlbecker

09/16/2015

09:24 PM Revision fbedcb23 (taxeditor): Fix merge
Cherian Mathew
07:51 PM Revision c106c48b (taxeditor): Fix versions
Cherian Mathew
07:49 PM Revision 3dce810f (cdm-server): Merge branch 'release/3.11.0'
jenkins
07:49 PM Revision 3bfd5b07 (cdm-server): Updating develop poms back to pre merge state
jenkins
07:49 PM Revision 2dc69ea6 (cdm-server): Merge branch 'master' into develop
jenkins
07:49 PM Revision 5b835142 (cdm-server): updating develop poms to master versions to avoid merge conflicts
jenkins
07:48 PM Revision 91cc5230 (cdm-server): updating poms for branch'release/3.11.0' with non-snapshot versions
jenkins
07:48 PM Revision dc450cf7 (cdm-webapp): Updating develop poms back to pre merge state
jenkins
07:48 PM Revision 40b5a9f7 (cdm-webapp): Merge branch 'master' into develop
jenkins
07:48 PM Revision b9959264 (cdm-webapp): updating develop poms to master versions to avoid merge conflicts
jenkins
07:48 PM Revision c7557d6e (cdm-webapp): Merge branch 'release/3.11.0'
jenkins
07:48 PM Revision d50a6ce5 (cdm-webapp): updating poms for branch'release/3.11.0' with non-snapshot versions
jenkins
07:48 PM Revision eb778035 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.11.0
jenkins
07:47 PM Revision 2222cdd3 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.11.0-SNAPSHOT
jenkins
07:47 PM Revision d5a76d18 (cdm-webapp): updating poms for 3.12.0-SNAPSHOT development
jenkins
07:47 PM Revision 6446d714 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.12.0-SNAPSHOT
jenkins
07:43 PM Revision e4c8fe2e (cdm-vaadin): Updating develop poms back to pre merge state
jenkins
07:43 PM Revision c2998d39 (cdm-vaadin): Merge branch 'master' into develop
jenkins
07:43 PM Revision 03abef78 (cdm-vaadin): Merge branch 'release/3.11.0'
jenkins
07:43 PM Revision d9284b9a (cdm-vaadin): updating develop poms to master versions to avoid merge conflicts
jenkins
07:42 PM Revision a52450e2 (taxeditor): Fix versions
Cherian Mathew
07:42 PM Revision ebd606e2 (cdm-vaadin): updating poms for branch'release/3.11.0' with non-snapshot versions
jenkins
07:41 PM Revision af701e3c (cdmlib): Updating develop poms back to pre merge state
jenkins
07:41 PM Revision c73eea93 (cdmlib): Merge branch 'master' into develop
jenkins
07:41 PM Revision ed8f34b1 (cdmlib): updating develop poms to master versions to avoid merge conflicts
jenkins
07:41 PM Revision 0ce6d468 (cdmlib): Merge branch 'release/3.11.0'
jenkins
07:26 PM Revision e9039a5e (cdmlib): updating poms for branch'release/3.11.0' with non-snapshot versions
jenkins
07:19 PM Revision 999d37c4 (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonom...
Cherian Mathew
07:14 PM Revision 64a4022f (taxeditor): Fix versions
Cherian Mathew
07:06 PM Revision a63b22b4 (taxeditor): Set second demo server ip
Cherian Mathew
06:28 PM Revision 944a3fc3 (taxeditor): Revert project versions to 3.11.0-SNAPSHOT
jenkins
06:27 PM Revision a22860ff (taxeditor): Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
jenkins
06:26 PM Revision de0ece16 (cdm-vaadin): jenkins bumping cdmlib.version to 3.11.0-SNAPSHOT
jenkins
06:26 PM Revision 7fdb7180 (cdm-vaadin): updating poms for 3.12.0-SNAPSHOT development
jenkins
06:26 PM Revision 6f85571d (cdm-server): updating poms for 3.12.0-SNAPSHOT development
jenkins
06:26 PM Revision 9f86b7dd (cdm-vaadin): jenkins bumping cdmlib.version to 3.12.0-SNAPSHOT
jenkins
06:24 PM Revision b8ecd62d (cdmlib): updating poms for 3.12.0-SNAPSHOT development
jenkins
05:05 PM Revision d2a09415 (cdm-dataportal): CRLF will be replaced by LF issues
Andreas Kohlbecker
05:01 PM Revision 1702a931 (cdm-dataportal): Merge tag '3.8.0' into develop
Creating tag for release 3.8.0 Andreas Kohlbecker
05:01 PM Revision aa28b0e1 (cdm-dataportal): Merge branch 'release/3.8.0'
Andreas Kohlbecker
04:59 PM Revision 5d20692e (cdm-dataportal): Normalize all the line endings
Andreas Kohlbecker
04:58 PM Revision 51ca8df9 (cdm-dataportal): Saving files before refreshing line endings
Andreas Kohlbecker
04:47 PM Revision 0e3df23a (cdm-dataportal): deleting folder not removed by subgit after git rm
Andreas Kohlbecker
04:45 PM Revision 3d107583 (cdm-dataportal): deleting folder not removed by subgit after git rm
Andreas Kohlbecker
04:44 PM Revision 3b03b70f (cdm-dataportal): deleting folder not removed by subgit after git rm
Andreas Kohlbecker
04:36 PM Revision 28bd7c97 (cdm-dataportal): moving content of folder 7.x up to the repository root
Andreas Kohlbecker
04:32 PM Revision 4a68a31c (cdm-dataportal): removing sub-folders for drupal versions 5.x and 6.x
Andreas Kohlbecker
04:31 PM Revision c8012211 (cdm-dataportal): removing old test file
Andreas Kohlbecker
03:54 PM Revision fc75c0d7 (taxeditor): Fix for cdmlib version numbers
Cherian Mathew
03:26 PM Revision e9013668 (taxeditor): Fix label consistency #5133
Patrick Plitzner
03:26 PM Revision 09a9071b (taxeditor): Add i18n to binary build path
Patrick Plitzner
03:01 PM Revision f00fe291 (taxeditor): Cache the default feature tree
Cherian Mathew
02:59 PM Revision f76e6020 (taxeditor): #5259 initialising default ranks
Cherian Mathew
02:58 PM Revision 176f1bfc (cdmlib): #5259 Add method to init defaul terms
Cherian Mathew

09/15/2015

09:01 PM Revision 405248eb (taxeditor): Update test versions
Cherian Mathew
08:38 PM Revision ec3a353f (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonom...
Cherian Mathew
08:35 PM Revision d7cab35d (taxeditor): Correct versions
Cherian Mathew
07:13 PM Revision da302e92 (cdm-server): Merge branch 'release/3.10.0'
jenkins
07:13 PM Revision df04a732 (cdm-server): Updating develop poms back to pre merge state
jenkins
07:13 PM Revision 422f2937 (cdm-server): Merge branch 'master' into develop
jenkins
07:13 PM Revision ebe34ca7 (cdm-server): updating develop poms to master versions to avoid merge conflicts
jenkins
07:12 PM Revision 53951977 (cdm-server): updating poms for branch'release/3.10.0' with non-snapshot versions
jenkins
07:10 PM Revision fa242fcb (cdm-webapp): Updating develop poms back to pre merge state
jenkins
07:10 PM Revision b76376f7 (cdm-webapp): Merge branch 'master' into develop
jenkins
07:10 PM Revision 5b1f6ed2 (cdm-webapp): updating develop poms to master versions to avoid merge conflicts
jenkins
07:10 PM Revision 1afce288 (cdm-webapp): Merge branch 'release/3.10.0'
jenkins
07:10 PM Revision cb09baab (cdm-webapp): updating poms for branch'release/3.10.0' with non-snapshot versions
jenkins
07:10 PM Revision 64b31ab5 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.10.0
jenkins
07:06 PM Revision 19822084 (cdm-vaadin): Updating develop poms back to pre merge state
jenkins
07:06 PM Revision 8b6a9625 (cdm-vaadin): Merge branch 'master' into develop
jenkins
07:06 PM Revision 97b46353 (cdm-vaadin): updating develop poms to master versions to avoid merge conflicts
jenkins
07:06 PM Revision 9a80e55b (cdm-vaadin): Merge branch 'release/3.10.0'
jenkins
07:04 PM Revision 45ffe9ba (cdm-vaadin): updating poms for branch'release/3.10.0' with non-snapshot versions
jenkins
07:03 PM Revision d912ee1f (cdmlib): Updating develop poms back to pre merge state
jenkins
07:03 PM Revision c492f59e (cdmlib): Merge branch 'master' into develop
jenkins
07:03 PM Revision 5a289cca (cdmlib): updating develop poms to master versions to avoid merge conflicts
jenkins
07:03 PM Revision 3938be55 (cdmlib): Merge branch 'release/3.10.0'
jenkins
06:52 PM Revision d8de6c71 (taxeditor): Add null check for session
Cherian Mathew
06:44 PM Revision ef7d8f0a (taxeditor): #5250 Add property paths to speed up search
Cherian Mathew
06:31 PM Revision 84de094c (cdmlib): updating poms for branch'release/3.10.0' with non-snapshot versions
jenkins
06:24 PM Revision eca92f67 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.10.0-SNAPSHOT
jenkins
06:24 PM Revision b8b5a178 (cdm-webapp): updating poms for 3.11.0-SNAPSHOT development
jenkins
06:24 PM Revision 199f48bd (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.11.0-SNAPSHOT
jenkins
06:23 PM Revision d78805f8 (taxeditor): updating poms for 3.11.0-SNAPSHOT development
jenkins
06:23 PM Revision 7b0c206b (taxeditor): #5228 Add wait cursor when loading data
Cherian Mathew
06:22 PM Revision 6fc9689e (taxeditor): Revert project versions to 3.10.0-SNAPSHOT
jenkins
06:21 PM Revision 995aa2c5 (taxeditor): Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT
jenkins
06:20 PM Revision e27d0802 (cdm-vaadin): jenkins bumping cdmlib.version to 3.10.0-SNAPSHOT
jenkins
06:20 PM Revision 66dd4478 (cdm-vaadin): updating poms for 3.11.0-SNAPSHOT development
jenkins
06:20 PM Revision 3e7c8fb8 (cdm-server): updating poms for 3.11.0-SNAPSHOT development
jenkins
06:20 PM Revision f1c21f91 (cdm-vaadin): jenkins bumping cdmlib.version to 3.11.0-SNAPSHOT
jenkins
06:16 PM Revision a9dedd2d (cdmlib): updating poms for 3.11.0-SNAPSHOT development
jenkins
05:37 PM Revision 5c0de6cc (taxeditor): Merge branch 'develop' into remoting-4.0
Cherian Mathew
05:27 PM Revision fa0676bc (cdmlib): remove ignore from IPNI test
Andreas Müller
05:25 PM Revision d79ae47c (cdmlib): Ignore Ipni test preliminary
Andreas Müller
05:07 PM Revision ab6d805e (taxeditor): #5252 Add remove method to manually remove root derivate
Cherian Mathew
04:45 PM Revision 46d814ce (taxeditor): Add demo servers to server list
Cherian Mathew
04:09 PM Revision 3824b825 (cdmlib): #5249 Correct if statements
Cherian Mathew
02:48 PM Revision 8175c7f6 (taxeditor): Add missing i18n properties to build path
Patrick Plitzner
01:47 PM Revision 9545c8cd (taxeditor): Update test version numbers
Cherian Mathew
01:07 PM Revision 9d170601 (taxeditor): Correct webapp war name change
Cherian Mathew
12:11 PM Revision 4ac90d61 (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
Cherian Mathew
11:16 AM Revision 9f96b16e (taxeditor): Fix initialization problems for preferences and editor input
Patrick Plitzner
10:55 AM Revision e3bcf994 (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonom...
Cherian Mathew
10:54 AM Revision c3f51ad2 (taxeditor): Add preference for opening a newly created specimen in specimen editor
Patrick Plitzner
10:54 AM Revision 34014ada (taxeditor): Open a newly created specimen in specimen editor
Patrick Plitzner

09/14/2015

06:56 PM Revision c51a943c (cdm-server): Merge branch 'release/3.9.0'
jenkins
06:56 PM Revision 3ecaed22 (cdm-server): Updating develop poms back to pre merge state
jenkins
06:56 PM Revision d70cd18d (cdm-server): Merge branch 'master' into develop
jenkins
06:56 PM Revision 9669e490 (cdm-server): updating develop poms to master versions to avoid merge conflicts
jenkins
06:55 PM Revision 5a0f06ea (cdm-server): updating poms for branch'release/3.9.0' with non-snapshot versions
jenkins
06:44 PM Revision 16279e66 (cdm-webapp): Merge branch 'release/3.9.0'
jenkins
06:44 PM Revision 9b80d6bb (cdm-webapp): Updating develop poms back to pre merge state
jenkins
06:44 PM Revision 095c5efb (cdm-webapp): Merge branch 'master' into develop
jenkins
06:44 PM Revision 11844611 (cdm-webapp): updating develop poms to master versions to avoid merge conflicts
jenkins
06:44 PM Revision 53678ef7 (cdm-webapp): updating poms for branch'release/3.9.0' with non-snapshot versions
jenkins
06:44 PM Revision c107da4d (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.9.0
jenkins
06:32 PM Revision 5b3727a7 (cdm-vaadin): Updating develop poms back to pre merge state
jenkins
06:32 PM Revision 65ebaa7f (cdm-vaadin): Merge branch 'master' into develop
jenkins
06:32 PM Revision c1c14325 (cdm-vaadin): Merge branch 'release/3.9.0'
jenkins
06:32 PM Revision 1949af7d (cdm-vaadin): updating develop poms to master versions to avoid merge conflicts
jenkins
06:30 PM Revision 30698324 (cdm-vaadin): updating poms for branch'release/3.9.0' with non-snapshot versions
jenkins
06:29 PM Revision 0559d46f (cdmlib): Updating develop poms back to pre merge state
jenkins
06:29 PM Revision ac9a88fe (cdmlib): Merge branch 'master' into develop
jenkins
06:29 PM Revision 1faebd77 (cdmlib): updating develop poms to master versions to avoid merge conflicts
jenkins
06:29 PM Revision 4a06fb9b (cdmlib): Merge branch 'release/3.9.0'
jenkins
06:08 PM Revision 23be44a9 (cdmlib): updating poms for branch'release/3.9.0' with non-snapshot versions
jenkins
06:07 PM Revision fdff7002 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.9.0-SNAPSHOT
jenkins
06:07 PM Revision f6600b03 (cdm-webapp): updating poms for 3.10.0-SNAPSHOT development
jenkins
06:07 PM Revision 37d2a2fb (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.10.0-SNAPSHOT
jenkins
06:02 PM Revision 1b8d0e4d (taxeditor): updating poms for 3.10.0-SNAPSHOT development
jenkins
06:01 PM Revision 8c9356dc (taxeditor): Revert project versions to 3.9.0-SNAPSHOT
jenkins
06:00 PM Revision 129e2ea3 (taxeditor): Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
jenkins
06:00 PM Revision 242020c0 (taxeditor): re-initialise group object in input constructor
Cherian Mathew
06:00 PM Revision bbce7a69 (cdm-vaadin): jenkins bumping cdmlib.version to 3.9.0-SNAPSHOT
jenkins
06:00 PM Revision 6e23d11d (cdm-vaadin): updating poms for 3.10.0-SNAPSHOT development
jenkins
06:00 PM Revision 0e504592 (cdm-server): updating poms for 3.10.0-SNAPSHOT development
jenkins
06:00 PM Revision 44b69d7a (cdm-vaadin): jenkins bumping cdmlib.version to 3.10.0-SNAPSHOT
jenkins
05:57 PM Revision 59a7d976 (cdmlib): updating poms for 3.10.0-SNAPSHOT development
jenkins
05:01 PM Revision f62928e4 (taxeditor): #5202 Added alphabetical sort for cdm instances list
Cherian Mathew
04:37 PM Revision 667025a5 (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandl...
Cherian Mathew
04:21 PM Revision c9f13bde (taxeditor): #5242, #5223 Improve performance of derivate loading and editing
Cherian Mathew
02:50 PM Revision 17653afc (taxeditor): Use wizard to create new specimen
Patrick Plitzner
02:38 PM Revision f57943c9 (taxeditor): Trim code
Patrick Plitzner
01:51 PM Revision 445950fe (cdmlib): Preliminary ignore IPNI test
Andreas Müller
11:13 AM Revision 342606ca (taxeditor): Keep media view and factual data view enabled when no significant
selection occurs (#5195) Patrick Plitzner
11:04 AM Revision 2579f2ed (taxeditor): Trim code
Patrick Plitzner
11:03 AM Revision b2b9e057 (cdm-dataportal): Option to view the diff of default and user settings of the name render templates and part definitions
Andreas Kohlbecker
11:01 AM Revision 9498e850 (cdm-dataportal): Updating jquery-ui to 1.8.24
Andreas Kohlbecker

09/11/2015

05:36 PM Revision 32d99982 (taxeditor): #5223 Replace service methods with similar entity calls
Cherian Mathew
05:35 PM Revision 207c35e6 (cdmlib): #5223 Copy utility method from service to derived unit
Cherian Mathew
05:11 PM Revision 45546a91 (cdmlib): Deprecate getCharacterData method in service layer
Andreas Müller
05:11 PM Revision e9829ef9 (cdmlib): Implement hasCharacterData and isCharacterData.
And fix characterData semantics. Andreas Müller
05:11 PM Revision 887126ca (cdmlib): move specimen.getCharacterData to model
Andreas Müller
03:37 PM Revision d1e3ac25 (cdm-dataportal): Changing the text that hints to the Debug block
Andreas Kohlbecker
03:29 PM Revision 253716a1 (taxeditor): Fix incorrect merge
Cherian Mathew
02:42 PM Revision c70f9111 (taxeditor): Fix incorrect merge
Cherian Mathew
02:15 PM Revision 98060576 (taxeditor): Merge branch 'release/3.8.0'
Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.e...
jenkins
01:45 PM Revision 7ebed46b (taxeditor): Revert osgi versions
jenkins
12:52 PM Revision 03f4f6f7 (cdm-dataportal): #5182 fixing bug in name render template processing
Andreas Kohlbecker
10:46 AM Revision c6e78558 (cdm-dataportal): #5182 fixing bug related to hybrid names
- cloning object to avoid modification of the original Andreas Kohlbecker
10:36 AM Revision 993c5743 (taxeditor): Correct version
Cherian Mathew
10:35 AM Revision dbe1e57d (taxeditor): Correct version
Cherian Mathew
10:11 AM Revision b3a806e8 (cdm-dataportal): #5182 name render part definition accepted_taxon.taxon_page_synonymy
- this allows styling the accepted taxon in the synonymy differently Andreas Kohlbecker
09:46 AM Revision 0b7bbf68 (cdm-dataportal): moving more functions to name.inc
Andreas Kohlbecker
09:42 AM Revision 2e31ea9e (cdm-dataportal): Register the new file name.inc
Andreas Kohlbecker
09:40 AM Revision 2fd6da0b (cdm-dataportal): moving non theme functions to include files and module
- name render related functions to new file name.inc
- other functions to the module file
Andreas Kohlbecker

09/10/2015

09:37 PM Revision b03f7ec6 (taxeditor): Correct osgi version
Cherian Mathew
06:48 PM Revision 8555b14b (taxeditor): Update snapshot version
Cherian Mathew
06:39 PM Revision bd67d764 (cdmlib): Add taxon to updated objects when taxon is not to be deleted
Cherian Mathew
06:25 PM Revision b94b6f2a (taxeditor): #5237 Add changes from stand alone handler
Cherian Mathew
06:19 PM Revision 2eaa13b4 (cdm-dataportal): #5182 litte bugfix for last commit : providing feedback on the version of name render part definition and templates
Andreas Kohlbecker
06:18 PM Revision 09cfbd9d (cdm-server): Updating develop poms back to pre merge state
jenkins
06:18 PM Revision 3560acad (cdm-server): Merge branch 'master' into develop
jenkins
06:18 PM Revision b37e303e (cdm-server): Merge branch 'release/3.8.0'
jenkins
06:18 PM Revision 677e3597 (cdm-server): updating develop poms to master versions to avoid merge conflicts
jenkins
06:17 PM Revision d4687311 (cdm-server): updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins
06:11 PM Revision 1a01f6dd (cdm-dataportal): #5182 providing feedback on the version of name render part definition and templates
Andreas Kohlbecker
06:06 PM Revision 91d744f0 (cdm-webapp): Updating develop poms back to pre merge state
jenkins
06:06 PM Revision fd6f8b27 (cdm-webapp): Merge branch 'master' into develop
jenkins
06:06 PM Revision f7836b8d (cdm-webapp): updating develop poms to master versions to avoid merge conflicts
jenkins
06:06 PM Revision aa7323c9 (cdm-webapp): Merge branch 'release/3.8.0'
jenkins
06:06 PM Revision 2ad1aa92 (cdm-webapp): updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins
06:06 PM Revision e5e4515a (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.8.0
jenkins
06:04 PM Revision 97fb2a23 (cdm-vaadin): Updating develop poms back to pre merge state
jenkins
06:04 PM Revision 489f01dd (cdm-vaadin): Merge branch 'master' into develop
jenkins
06:04 PM Revision ccab0dd5 (cdm-vaadin): updating develop poms to master versions to avoid merge conflicts
jenkins
06:04 PM Revision f9abd070 (cdm-vaadin): Merge branch 'release/3.8.0'
jenkins
06:01 PM Revision 5a626bb1 (cdm-vaadin): updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins
05:59 PM Revision ad5fbba2 (taxeditor): updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins
05:58 PM Revision 3dba2cab (taxeditor): Revert project versions to 3.8.0-SNAPSHOT
jenkins
05:58 PM Revision 18358a52 (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonom...
Cherian Mathew
05:57 PM Revision aeb50964 (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.0 and cdmlib version : 3.8.0
jenkins
05:55 PM Revision 7dac0ba4 (cdmlib): Updating develop poms back to pre merge state
jenkins
05:55 PM Revision d8812195 (cdmlib): Merge branch 'master' into develop
jenkins
05:55 PM Revision 1f957550 (cdmlib): updating develop poms to master versions to avoid merge conflicts
jenkins
05:55 PM Revision d00a3071 (cdmlib): Merge branch 'release/3.8.0'
jenkins
05:42 PM Revision 467d468b (taxeditor): Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServic...
Cherian Mathew
05:39 PM Revision c8c879d8 (cdm-dataportal): #5182 some usages of theme_cdm_taxonName have been not adapded to the new function render_taxon_or_name - fixing this
Andreas Kohlbecker
05:37 PM Revision 07883b40 (cdmlib): updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins
05:18 PM Revision 509ba977 (cdm-vaadin): Adapt to tagged text methods change to protected
Cherian Mathew
05:17 PM Revision fb2c5dc3 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.8.0-SNAPSHOT
jenkins
05:17 PM Revision bbd0e677 (cdm-webapp): updating poms for 3.9.0-SNAPSHOT development
jenkins
05:16 PM Revision 5fb66b0e (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.9.0-SNAPSHOT
jenkins
05:09 PM Revision 084507a8 (cdm-vaadin): Adapt to tagged text methods change to protected
Cherian Mathew
05:01 PM Revision cecbda47 (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
jenkins
05:00 PM Revision f27dd202 (taxeditor): updating poms for 3.9.0-SNAPSHOT development
jenkins
05:00 PM Revision 7a0c52f3 (taxeditor): updating poms for 3.8.0 branch with snapshot versions
jenkins
04:59 PM Revision d14cdfb8 (taxeditor): Revert project versions to 3.8.0-SNAPSHOT
jenkins
04:57 PM Revision 4991d5fa (taxeditor): Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
jenkins
04:56 PM Revision 03eeb27b (cdm-server): updating poms for 3.9.0-SNAPSHOT development
jenkins
04:55 PM Revision c6366d49 (cdm-vaadin): jenkins bumping cdmlib.version to 3.8.0-SNAPSHOT
jenkins
04:55 PM Revision dcd0919e (cdm-vaadin): updating poms for 3.9.0-SNAPSHOT development
jenkins
04:55 PM Revision 05744d69 (cdm-vaadin): jenkins bumping cdmlib.version to 3.9.0-SNAPSHOT
jenkins
04:52 PM Revision 5f339b7e (cdmlib): updating poms for 3.9.0-SNAPSHOT development
jenkins
04:48 PM Revision 44069fdc (cdmlib): minor
Andreas Müller
04:22 PM Revision 627fcabe (taxeditor): Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"
This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9. Andreas Kohlbecker
04:22 PM Revision 69040a4b (taxeditor): Revert "Revert project versions to 3.8.0-SNAPSHOT"
This reverts commit e8268306693f047beef36ce53524adc00946cf74. Andreas Kohlbecker
04:19 PM Revision 42da45e2 (cdm-server): Revert "updating poms for 3.9.0-SNAPSHOT development"
This reverts commit 8645b5a1bcf647d6d1ea7eb649fc611a432b997c. Andreas Kohlbecker
04:18 PM Revision f2eb05a0 (cdm-webapp): Revert "jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.9.0-SNAPSHOT"
This reverts commit 9c36ea09e7c66fe685944814c8beb30f4c1bcf40. Andreas Kohlbecker
04:17 PM Revision 36a011b4 (cdm-vaadin): Revert "jenkins bumping cdmlib.version to 3.9.0-SNAPSHOT"
This reverts commit 11e5718ac1ddbd7f9efc9d989e6d9147cdb28347. Andreas Kohlbecker
04:15 PM Revision 6b8d3592 (cdmlib): Revert "updating poms for 3.9.0-SNAPSHOT development"
This reverts commit 1a052a9893afe93249cf81603f410a4e454c305a. Andreas Kohlbecker
03:54 PM Revision e8268306 (taxeditor): Revert project versions to 3.8.0-SNAPSHOT
jenkins
03:53 PM Revision 7ed2ce1e (taxeditor): Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
jenkins
03:52 PM Revision 9c36ea09 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.9.0-SNAPSHOT
jenkins
03:51 PM Revision 8645b5a1 (cdm-server): updating poms for 3.9.0-SNAPSHOT development
jenkins
03:51 PM Revision 11e5718a (cdm-vaadin): jenkins bumping cdmlib.version to 3.9.0-SNAPSHOT
jenkins
03:51 PM Revision 1a052a98 (cdmlib): updating poms for 3.9.0-SNAPSHOT development
jenkins
03:43 PM Revision 1e3d56bb (cdmlib): fixing move Accepted taxon to synonym
U-BGBM\k.luther
03:20 PM Revision 63c3ac73 (cdm-dataportal): #5182 using the taggedTitle which is now provided for TaxonBase instances
- turing theme_cdm_taxonName into normal function render_taxon_or_name wich now can take taxa and names
- hamoniz...
Andreas Kohlbecker
03:07 PM Revision e75cf4e4 (cdmlib): clean up taxon cache strategy
Andreas Müller
03:07 PM Revision a9bde125 (cdmlib): Document new initListener method (#5161)
Andreas Müller
02:05 PM Revision feb6d41a (taxeditor): #5234 Add correct updated objects to change event
Cherian Mathew
02:03 PM Revision 804215c3 (cdmlib): #5234 Add required updated taxon nodes
Cherian Mathew
12:58 PM Revision f63cb922 (cdmlib): Simplify getNameTags in Taxon cache strategy (#5229)
Andreas Müller
12:26 PM Revision c4de108d (cdmlib): Create new tag type for secundum reference (#5229)
Andreas Müller
11:42 AM Revision c5e1782d (cdmlib): Allow retrieving objects via ICommonService and UUID (#5160)
Andreas Müller
11:40 AM Revision 57c49a93 (cdmlib): #3991 hiding the delegeate boolean properties in TaggedText by making them protected
Andreas Kohlbecker
11:26 AM Revision f0eef945 (taxeditor): #5233 Correct login / password persistence
Cherian Mathew
11:24 AM Revision 72412928 (cdmlib): #5229 avoiding LIE by autoinitializing the taggedTitle for TaxonBase
Andreas Kohlbecker
10:59 AM Revision 3b9c3a92 (taxeditor): Disable persisting login preferences when connecting to dev server
Cherian Mathew
10:47 AM Revision d26d8c57 (cdmlib): #5229 implementing output of TaxonBase.getTaggedTitle in web services
- turning the TaxonBeanProcessor into TaxonBaseBeanProcessor
- adding taggedTitle to the taxon instances returned...
Andreas Kohlbecker
10:42 AM Revision 48f63837 (taxeditor): Add initModel call to constructor since it requires the type to be set beforehand
Cherian Mathew
09:35 AM Revision cce928f3 (cdmlib): bug fixes regarding performacne measuring
Andreas Kohlbecker
09:35 AM Revision 2a7668fb (cdmlib): more detailed measuring time of accumulation in TransmissionEngineDistribution for performance testing
Andreas Kohlbecker
09:35 AM Revision 46800822 (cdmlib): measuring time of accumulation in TransmissionEngineDistribution for performance testing
Andreas Kohlbecker
09:35 AM Revision a12582ff (cdmlib): adding more test cases for ClassificationService
- testTaxonNodeByNameComparator now with hybrid name
- testlistRankSpecificRootNodes better testing of pager
Andreas Kohlbecker
09:35 AM Revision 7a6c28bb (cdmlib): using UNKNOWN_RANK as default lowerRank in transmission engine
Andreas Kohlbecker
09:35 AM Revision 70082ec7 (cdmlib): simplifying test code
Andreas Kohlbecker
08:35 AM Revision c59e35c4 (cdmlib): Deproxy name in taxon cache strategy.
Andreas Müller
08:33 AM Revision a81ba5dc (cdm-dataportal): #5182 removing dead code and fixing unrelated bug
Andreas Kohlbecker
 

Also available in: Atom