Project

General

Profile

Activity

From 09/22/2015 to 10/21/2015

10/21/2015

05:36 PM Revision 2a2a9f1c (cdmlib): Fix AdvancedBeanInitializer for envers collections/maps #5077
Andreas Müller
05:13 PM Revision 8a103457 (taxeditor): #5256 Set entity container in Bulk Editor to dirty when media is updated
Cherian Mathew
04:58 PM Revision 1da6f4ff (taxeditor): #5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag for factual data in Buld Editor
Cherian Mathew
03:32 PM Revision 04535add (cdmlib): minor
Andreas Müller
02:57 PM Revision 749b7448 (cdmlib): Throw exceptions in AdvancedBeanInitializer instead of logging only
#5077 Andreas Müller
02:41 PM Revision c38734e6 (cdmlib): Add some more BeanUtil test to other classes #5307
Andreas Müller
02:19 PM Revision 346352ad (taxeditor): Enable remote session support
Patrick Plitzner
02:17 PM Revision 70ba3ccf (cdmlib): Fix bean read/write inconsistency in Taxon and TaxonBase #5307
Andreas Müller
12:11 PM Revision 4821643c (utis-core): Store implementation using Neo4j and initial draft for a TinkerPop client
Andreas Kohlbecker
10:29 AM Revision d5daf020 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
10:29 AM Revision 2a681907 (taxeditor): fix test for TaxonNavigator: all nodes need a taxon, except the topmost one
Katja Luther
09:51 AM Revision 0c7f5077 (taxeditor): Enhance search bar layout
Patrick Plitzner
09:43 AM Revision 7d1f2d23 (cdmlib): minor
Katja Luther
08:36 AM Revision dd35c5fd (taxeditor): Implement taxon assignment filter and refactor DerivativeEditor
- Input no longer needs session
- editor itself keeps track of its root elements
- taxon assignment filter allows f...
Patrick Plitzner

10/20/2015

04:41 PM Revision 75dd6927 (taxeditor): Disable term menu when disconnected (#4901)
Patrick Plitzner
03:36 PM Revision 78080cbe (cdmlib): Add os dependent file separator
Cherian Mathew
03:13 PM Revision 20b48481 (cdmlib): Revert back early commit since it breaks jetty tests
Cherian Mathew
02:05 PM Revision 29cf4691 (cdmlib): fix the pom of remote-webapp for windows
Katja Luther
11:31 AM Revision 403887ce (taxeditor): Merge branch 'develop' into unify_derivative_views
Patrick Plitzner
09:55 AM Revision ed6fc7fb (utis-core): increasing efficiency by caching remote models per request
Andreas Kohlbecker

10/19/2015

06:28 PM Revision fb736afc (utis-core): externalizing TripleStore functionality from SparqlClient
Andreas Kohlbecker
04:26 PM Revision 678427f8 (utis-core): all search modes implemented in EEA_BDC_Client, all test successful
Andreas Kohlbecker
04:02 PM Revision 9d63acde (taxeditor): #5301 Add merge call for saving new feature tree
Cherian Mathew
03:33 PM Revision 16583742 (taxeditor): #5335 Use new getLanguageByLabel methof in term service
Cherian Mathew
03:30 PM Revision 57be0561 (cdmlib): #5335 Add get language using label to service
Cherian Mathew
02:44 PM Revision 5126cb20 (taxeditor): #5306 Use default language if preferred language is null
Cherian Mathew
01:15 PM Revision 8f6bbcc2 (cdmlib): fix #5179 and adapting the tests because the classification argument is needed now
Katja Luther

10/16/2015

05:18 PM Revision a8b94903 (utis-core): refinement of test assertion
Andreas Kohlbecker
02:58 PM Revision 4b57d65c (utis-core): pushing version to 1.1.0-SNAPSHOT
Andreas Kohlbecker

10/15/2015

11:26 AM Revision 3605c716 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
11:26 AM Revision 5bd41add (taxeditor): fix move taxonnode in natural order
Katja Luther
11:13 AM Revision 07c3eb13 (cdmlib): fix delete of specimen with specimenDescriptions
Katja Luther
11:13 AM Revision 0c9ec93a (cdmlib): fix move taxon node in natural order
Katja Luther

10/14/2015

06:28 PM Revision e8719569 (cdmlib): #5066 Remove unnecessary merge listener
Cherian Mathew
04:44 PM Revision 9251360c (cdmlib): Revert handling treeindex in PreInsert listener #5066.
Treeindex creation works fine until now so we keep it where it is. Andreas Müller
04:33 PM Revision 4030ebf8 (cdmlib): Rename CdmPreDataChangeObservableListener to CdmPreDataChangeListener
Andreas Müller
04:24 PM Revision 4dad5e16 (cdmlib): Cleanup IVocService
Andreas Müller
04:24 PM Revision 79854485 (cdmlib): cleanup
Andreas Müller
12:05 PM Revision bc073c98 (taxeditor): #5268 Use convert methods which use uuids
Cherian Mathew
10:48 AM Revision 3ba542cb (cdmlib): #5268 Add convert methods which take uuid as input
Cherian Mathew
10:19 AM Revision 68450228 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
10:18 AM Revision 7d8cee12 (taxeditor): fix #5261 and minor
Katja Luther

10/13/2015

05:54 PM Revision 44854e6f (utis-core): all test successful, after minor bug fix related to like search
Andreas Kohlbecker
05:42 PM Revision c05932b2 (utis-core): addSynonmy feature implemented
Andreas Kohlbecker
05:39 PM Revision d875880c (taxeditor): Fix setting of key statement
Cherian Mathew
02:50 PM Revision 7a9c921d (taxeditor): Performance tuning
Cherian Mathew
12:48 PM Revision 515c1f40 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
12:47 PM Revision fd602c14 (taxeditor): fixing #5324 and #5325
Katja Luther
12:45 PM Revision e652d197 (cdmlib): fixing getUUIDAndTitleCache for Classification and excluding taxa
Katja Luther
11:59 AM Revision 983575e5 (utis-core): avoiding duplicate enties and other improvements
Andreas Kohlbecker
11:16 AM Revision ce82a12e (taxeditor): Bind null session for new derived unit wizard
Cherian Mathew

10/12/2015

04:46 PM Revision 2a086835 (taxeditor): #5321 Add missing return statement for bad credentials
Cherian Mathew
04:09 PM Revision cc712487 (taxeditor): #5320 Fix whitespace problem
Cherian Mathew
03:14 PM Revision e1090d5d (cdmlib): Fully remove old vocabulary.byClass methods #3843
Andreas Müller
03:07 PM Revision cf5e30c3 (taxeditor): Adapt TaxEditor to use vocabulary term type instead of class: #3843.
Andreas Müller
01:22 PM Revision 613875c8 (taxeditor): add distinction between remote and standalone for getting the geoService
Katja Luther
01:17 PM Revision a3960fa7 (cdmlib): accept the change from a number to null in TimePeriod fields #5319
Katja Luther
12:27 PM Revision d5e15c43 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther
12:26 PM Revision b18cb5fe (taxeditor): add moveDescription to transientService
Katja Luther
12:08 PM Revision 97ac3d7b (cdmlib): Remove listEmpty method from TermVocabularyDao #3843
Andreas Müller
11:55 AM Revision 367973e0 (cdmlib): Add vocabulary list method by term types #3843
Andreas Müller
10:57 AM Revision ce921df3 (taxeditor): Add deproxy of entities in assertSame assertions
Cherian Mathew
09:16 AM Revision 188c3e1c (cdmlib): minor
Katja Luther
09:16 AM Revision a4f373ef (cdmlib): minor
U-BGBM\k.luther
09:16 AM Revision 4c891790 (cdmlib): move description fix
U-BGBM\k.luther
09:16 AM Revision f31151bf (cdmlib): move descriptions and elements
U-BGBM\k.luther

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
 

Also available in: Atom