Activity
From 09/16/2015 to 10/15/2015
10/15/2015
- 11:26 AM Revision 3605c716 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 11:26 AM Revision 5bd41add (taxeditor): fix move taxonnode in natural order
- 11:13 AM Revision 07c3eb13 (cdmlib): fix delete of specimen with specimenDescriptions
- 11:13 AM Revision 0c9ec93a (cdmlib): fix move taxon node in natural order
10/14/2015
- 06:28 PM Revision e8719569 (cdmlib): #5066 Remove unnecessary merge listener
- 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.
- 04:33 PM Revision 4030ebf8 (cdmlib): Rename CdmPreDataChangeObservableListener to CdmPreDataChangeListener
- 04:24 PM Revision 4dad5e16 (cdmlib): Cleanup IVocService
- 04:24 PM Revision 79854485 (cdmlib): cleanup
- 12:05 PM Revision bc073c98 (taxeditor): #5268 Use convert methods which use uuids
- 10:48 AM Revision 3ba542cb (cdmlib): #5268 Add convert methods which take uuid as input
- 10:19 AM Revision 68450228 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 10:18 AM Revision 7d8cee12 (taxeditor): fix #5261 and minor
10/13/2015
- 05:54 PM Revision 44854e6f (utis-core): all test successful, after minor bug fix related to like search
- 05:42 PM Revision c05932b2 (utis-core): addSynonmy feature implemented
- 05:39 PM Revision d875880c (taxeditor): Fix setting of key statement
- 02:50 PM Revision 7a9c921d (taxeditor): Performance tuning
- 12:48 PM Revision 515c1f40 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 12:47 PM Revision fd602c14 (taxeditor): fixing #5324 and #5325
- 12:45 PM Revision e652d197 (cdmlib): fixing getUUIDAndTitleCache for Classification and excluding taxa
- 11:59 AM Revision 983575e5 (utis-core): avoiding duplicate enties and other improvements
- 11:16 AM Revision ce82a12e (taxeditor): Bind null session for new derived unit wizard
10/12/2015
- 04:46 PM Revision 2a086835 (taxeditor): #5321 Add missing return statement for bad credentials
- 04:09 PM Revision cc712487 (taxeditor): #5320 Fix whitespace problem
- 03:14 PM Revision e1090d5d (cdmlib): Fully remove old vocabulary.byClass methods #3843
- 03:07 PM Revision cf5e30c3 (taxeditor): Adapt TaxEditor to use vocabulary term type instead of class: #3843.
- 01:22 PM Revision 613875c8 (taxeditor): add distinction between remote and standalone for getting the geoService
- 01:17 PM Revision a3960fa7 (cdmlib): accept the change from a number to null in TimePeriod fields #5319
- 12:27 PM Revision d5e15c43 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 12:26 PM Revision b18cb5fe (taxeditor): add moveDescription to transientService
- 12:08 PM Revision 97ac3d7b (cdmlib): Remove listEmpty method from TermVocabularyDao #3843
- 11:55 AM Revision 367973e0 (cdmlib): Add vocabulary list method by term types #3843
- 10:57 AM Revision ce921df3 (taxeditor): Add deproxy of entities in assertSame assertions
- 09:16 AM Revision 188c3e1c (cdmlib): minor
- 09:16 AM Revision a4f373ef (cdmlib): minor
- 09:16 AM Revision 4c891790 (cdmlib): move description fix
- 09:16 AM Revision f31151bf (cdmlib): move descriptions and elements
10/09/2015
- 09:40 PM Revision 9c97664e (utis-core): tests with more detailed expectations
- 08:24 PM Revision b25fc9c9 (utis-core): using species-schema#validName to detect accepted taxa
- 07:50 PM Revision 070fd8df (utis-core): local TDB access problems solved
- 04:21 PM Revision d73a468e (utis-core): bugfix: starting transaction before executing describe
- 03:46 PM Revision b84bdb82 (utis-core): first working implementation of the EUNIS SPARQL client
- 03:42 PM Revision 3b668a07 (taxeditor): remove Ignore on saveNewTerm test
- 03:41 PM Revision bd10f42b (taxeditor): Cleanup DeleteOperation
- 03:33 PM Revision 9a84bed8 (taxeditor): Merge branch 'master' into develop
- 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
... - 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.
- 02:17 PM Revision 51c5b735 (taxeditor): Add missing files to ignore on merge conflict
- 02:15 PM Revision eb9a6442 (cdmlib): minor clean ups
- 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
- 01:55 PM Revision 3cb0b24a (taxeditor): Add files to ignore on merge conflict if the 'ours' driver is configured
- 10:30 AM Revision 2f9c6d26 (cdmlib): Cleanup SecurityTest
- 10:09 AM Revision 97ee0157 (cdmlib): Adapt listeners and tests to new pre-insert strategy #5066
10/08/2015
- 06:18 PM Revision 7bc01856 (taxeditor): Add test for editor / server cdmlib version check
- 05:19 PM Revision d4d342a1 (taxeditor): #5302 Add cdm version and services version check
- 05:02 PM Revision 09081d2b (cdmlib): Add cascade merge to members field
- 04:54 PM Revision 36ae5e03 (taxeditor): Update transient services for new load method
- 03:13 PM Revision ce18bb89 (taxeditor): #5309, #5310 Add load method to retrieve user entity after create and password change
- 03:10 PM Revision c77f6466 (cdmlib): #5309, #5310 Switch on write transaction annotation for delete, Add load methof for updating session cache
- 02:17 PM Revision da54d73f (cdmlib): Fix recursive merge call
- 02:04 PM Revision 23d7bfe0 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 02:01 PM Revision 7f1e8a4d (taxeditor): last changes for #5114
- 12:48 PM Revision 37d7ce64 (taxeditor): Add load capability for MergeResult objects
- 12:48 PM Revision 6c95dd3d (taxeditor): Update root entity merge calls to use new merge method.
- 12:47 PM Revision ce9bc492 (cdmlib): Add new merge method for root entitites which returns the newly created MergeResult object
- 12:31 PM Revision ff7c8e43 (taxeditor): minor
- 10:38 AM Revision c40ece3e (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 10:38 AM Revision 947bebd6 (taxeditor): #5114 fix
10/07/2015
- 05:40 PM Revision b0792cd5 (taxeditor): Merge branch 'develop' into unify_derivative_views
- 05:38 PM Revision c1252729 (taxeditor): Implement filter for assigned specimens
- - added drop down to select filter type
- implemented filtering of specimen list - 05:33 PM Revision 8d922848 (taxeditor): Fix label
- 05:33 PM Revision 1c5d598c (taxeditor): Listen to taxon selection
- 05:32 PM Revision a6cf45ad (taxeditor): Fix potential class cast exception
- 05:32 PM Revision 8d8db03d (taxeditor): Fix potential NPE
- 05:30 PM Revision e3a07c8a (taxeditor): Use convenience method for associated taxa
- 05:26 PM Revision b6b6d586 (cdmlib): Add new service method for retrieving all associated taxa for a specimen
- 02:30 PM Revision 82e1ba17 (taxeditor): Fix typo
- 02:14 PM Revision 4231dc94 (taxeditor): new ErrorDialog for delete result messaging
- 02:13 PM Revision 8336cf65 (taxeditor): improve messaging for deleteresults
- 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/... - 01:16 PM Revision db434445 (taxeditor): Add initial OccurenceView to RCP plugin
- 12:34 PM Revision 1a363aeb (taxeditor): minor
- 12:31 PM Revision bb08b867 (taxeditor): check for isdeletable before set delete button disabled
- 11:08 AM Revision f19b5344 (taxeditor): Fix layout of derivative tree
- 11:03 AM Revision 63c806ca (taxeditor): Delete unused classes
- 09:20 AM Revision c25cef49 (taxeditor): Refresh hierarchy tree after searching
- 07:24 AM Revision 10041c67 (taxeditor): Add "Show View" entry for derivative editor
- 07:11 AM Revision 2fcd92b4 (taxeditor): Move derivative search view classes to taxeditor.editor
- - adapted DerivateView
10/06/2015
- 03:50 PM Revision 8aac42d2 (taxeditor): I18n of login and data source view
- 02:41 PM Revision 3137470a (taxeditor): Fix potential NPE
- 02:25 PM Revision 06c38222 (cdmlib): typos in documentation
- 02:10 PM Revision de30f355 (taxeditor): Fix named area filter for selection dialog (#2353)
- 01:26 PM Revision 4f494eae (cdmlib): Add commented code for copying properties
- 11:53 AM Revision 619baf35 (taxeditor): create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons
- 11:48 AM Revision d1fd5d18 (taxeditor): minor
- 11:40 AM Revision ee0d8808 (taxeditor): minor in TaxonNodeDetailElement
- 11:15 AM Revision 489f607b (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
- 11:15 AM Revision 5395d49a (taxeditor): merge branches
- 11:09 AM Revision d17ecaf7 (taxeditor): merge branches
- 11:07 AM Revision bba3fcf8 (taxeditor): minor
- 11:05 AM Revision 958979c5 (taxeditor): Disable expanding of key section (#3461)
- 11:05 AM Revision e11c0cff (taxeditor): Trim code
- 10:58 AM Revision c860d200 (taxeditor): merge
- 10:47 AM Revision 04a79edb (taxeditor): minor
- 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
- 09:21 AM Revision 86c1f3a7 (taxeditor): Disable expanding of key section (#3461)
- 09:16 AM Revision e68d8e76 (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
- 09:16 AM Revision 369ac904 (taxeditor): improve messaging for deleteResult
- 08:53 AM Revision 803c3a9a (taxeditor): Trim code
10/05/2015
- 07:12 PM Revision b91fa795 (cdm-server): #5302 Add new jsp to provide general server info
- 05:50 PM Revision 164eb9f0 (taxeditor): Change merge to standard call for new taxon node
- 03:05 PM Revision 4fbac559 (taxeditor): Add check for remoting before setting new entity listener
- 01:29 PM Revision 676a8bf4 (taxeditor): Add null check to handler (#5283)
- 01:27 PM Revision c0dba325 (taxeditor): Trim code
- 01:23 PM Revision 29e3f630 (taxeditor): Add null check to derivate label provider (#5271)
- 12:58 PM Revision fe515a88 (taxeditor): Disable search bar when not connected to CDM store (#3341)
- 12:46 PM Revision dc62592d (taxeditor): Allow using the search bar only if at least one letter is entered
- (#3341)
- 11:29 AM Revision dd7f77fb (taxeditor): Disable menu items when not connected to CDM store (#4901)
- 10:14 AM Revision e11fa59e (taxeditor): Enable DetailsView for SpecimenView selection
- - Details view shows hierarchy details like in the data portal
- 10:13 AM Revision d06b07d3 (taxeditor): Trim code
- 09:38 AM Revision b112fd08 (taxeditor): minor
- 09:02 AM Revision 9d69a13b (taxeditor): Adapt MediaSpecimen i18n
- 09:02 AM Revision e9bfec4a (taxeditor): Fix child hierarchy for DnaSamples
- - Fixed adding and displaying of sub derived units like e.g. media
- 09:02 AM Revision 5ce71816 (taxeditor): Fix null selection for existing media
10/02/2015
- 06:59 PM Revision cf412a22 (taxeditor): #5282 Integrate remoting in referencing objects view
- 06:08 PM Revision ee35e38f (taxeditor): Documentation
- 04:59 PM Revision 72c118d0 (taxeditor): Merge branch 'hotfix/3.8.1'
- 04:56 PM Revision f0d40971 (taxeditor): updating poms for branch'hotfix/3.8.1' with non-snapshot versions
- 04:55 PM Revision 67b71ba5 (taxeditor): Revert project versions to 3.8.1-SNAPSHOT
- 04:54 PM Revision db87bf1d (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.1 and cdmlib version :
- 04:52 PM Revision ec23f5f4 (taxeditor): #5301 Fix null session issues, Add remoting session for feature tree editor
- 04:49 PM Revision 4a6c88be (taxeditor): Use deproxy
- 04:49 PM Revision 7c291513 (taxeditor): Trim code
- 04:49 PM Revision 984a9f75 (taxeditor): Add double-click and context menu to specimen view
- 04:49 PM Revision f1884def (taxeditor): Trim code
- 04:49 PM Revision 2b6aa4fb (taxeditor): Initial implementation of SpecimenView
- 04:49 PM Revision 144f4aa3 (taxeditor): Trim code
- 04:49 PM Revision d44f2e81 (cdmlib): Set transient id for root merge object
- 03:47 PM Revision dac7aeec (taxeditor): Adapt transient services
- 03:32 PM Revision ac48a1e8 (taxeditor): Add i18n files to build
- 03:19 PM Revision 6eccaa42 (cdmlib): Extend media gathering for taxon specimens
- 03:19 PM Revision 3b75292b (cdm-dataportal): Add /bin to .gitignore
- 03:18 PM Revision 43034365 (cdm-dataportal): Fix typo
- 01:55 PM Revision 5e395a46 (taxeditor): Updated version in pom / project files to taxeditor version : 3.8.1-SNAPSHOT and cdmlib version :
- 01:54 PM Revision 627378a3 (taxeditor): updating poms for 3.8.1 branch with snapshot versions
- 01:38 PM Revision 1ec52766 (taxeditor): Change null session to singleton with no owner
- 11:24 AM Revision a8911868 (taxeditor): Update transient services with new merge method
- 11:10 AM Revision d29a0062 (cdmlib): Add merge method to return updated transient object for lists
- 10:59 AM Revision fce7d237 (taxeditor): Add remoting checks for merge, Move to merge call which returns updated transient object
10/01/2015
- 05:27 PM Revision a1a8b581 (taxeditor): #5300 Implement remoting in Alignment Editor
- 05:23 PM Revision 5189077e (cdmlib): #5281 Make SingleReadAlignment.Shift serializable
- 04:11 PM Revision 79136a9f (taxeditor): Correct derivative hierarchy context menu label
- 03:14 PM Revision c27ecf00 (taxeditor): #5299 Handle session caching of new entities
- 03:11 PM Revision 27e202aa (cdmlib): #5299 Add new entity listener and event firing
- 02:58 PM Revision 3331cc69 (taxeditor): #5256 Add workaround for description reference issue
- 02:48 PM Revision 528e950d (cdmlib): #5256 Add test for description reference problem
- 11:03 AM Revision 1e469223 (taxeditor): minor
- 11:00 AM Revision 557e4df8 (taxeditor): fixing problem of reusing name for creation of taxon
- 10:55 AM Revision 3915821a (taxeditor): Pre-select country as named area type for country selection for
- specimens (#2353)
- 10:54 AM Revision 033c0527 (taxeditor): Trim code
09/30/2015
- 06:57 PM Revision adb2a726 (taxeditor): Add check for remoting to decide whether to merge or save
- 03:43 PM Revision 421666b4 (taxeditor): Fix i18n (#5155)
- 02:05 PM Revision 7d8050b3 (utis-core): moving checklist tests in own package
- 02:03 PM Revision c5e6fc74 (utis-core): separating query protocol implementation from checklist clients
- 01:01 PM Revision 79b22d9c (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
- 01:00 PM Revision 4537c26d (taxeditor): move descriptions in a service call
- 12:55 PM Revision b2e3cca7 (taxeditor): Always search for FieldUnits in DerivativeSearchView
- 12:49 PM Revision a8933813 (taxeditor): Add check to ensure merge in editors is performed only in remoting
09/29/2015
- 11:42 AM Revision ec120379 (cdm-dataportal): syntax typo
- 11:36 AM Revision 502f8712 (cdm-dataportal): #4411 hack to avoid regression reported in #5286
- 10:36 AM Revision 9aa8416d (taxeditor): #5291 Disable data change event firing in case of remoting
- 10:15 AM Revision 054e8c86 (cdm-server): Merge branch 'hotfix/3.11.1'
- 10:15 AM Revision 372e50a0 (cdm-server): Updating develop poms back to pre merge state
- 10:15 AM Revision 7f3cc435 (cdm-server): Merge branch 'master' into develop
- 10:15 AM Revision 6dd4339d (cdm-server): Updating develop poms to hotfix version to avoid merge conflicts
- 10:14 AM Revision 8aa58655 (cdm-server): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
09/28/2015
- 05:34 PM Revision b8712a66 (cdmlib): Updating develop poms back to pre merge state
- 05:34 PM Revision b1d3ac06 (cdmlib): Merge branch 'master' into develop
- 05:34 PM Revision 1e3df039 (cdmlib): Updating develop poms to hotfix version to avoid merge conflicts
- 05:34 PM Revision 5740535e (cdmlib): Merge branch 'hotfix/3.11.1'
- 04:28 PM Revision 6f564b84 (cdmlib): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
- 03:47 PM Revision 5408a4d5 (cdm-webapp): Merge branch 'hotfix/3.11.1'
- 03:47 PM Revision 5f91b1c4 (cdm-webapp): setting cdmlib dependency to 3.11.1
- 03:42 PM Revision b3984db7 (cdm-webapp): reverting broken hotfix release 3.11.1
- 03:27 PM Revision 857bc6ab (cdm-webapp): Merge branch 'hotfix/3.11.1'
- 03:27 PM Revision 72202816 (cdm-webapp): Updating develop poms back to pre merge state
- 03:27 PM Revision a8f8433e (cdm-webapp): Merge branch 'master' into develop
- 03:27 PM Revision 89048116 (cdm-webapp): Updating develop poms to hotfix version to avoid merge conflicts
- 03:27 PM Revision 44a7fe25 (cdm-webapp): updating poms for branch'hotfix/3.11.1' with non-snapshot versions
- 03:26 PM Revision 1f4ff0d0 (cdmlib): resolving conficts in project versions after hotfixrelease
- 03:23 PM Revision b779b385 (cdmlib): Merge branch 'hotfix/3.11.1'
- 02:23 PM Revision 353fbf79 (cdmlib): #5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
- 02:18 PM Revision 31ef9ed5 (cdm-server): updating poms for 3.11.1 branch with snapshot versions
- 02:17 PM Revision 2745879b (cdm-webapp): updating poms for 3.11.1 branch with snapshot versions
- 02:15 PM Revision 1e10c95b (cdmlib): updating poms for 3.11.1 branch with snapshot versions
- 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.
- 01:46 PM Revision 2693f710 (cdmlib): #5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
- 09:58 AM Revision d5486ffa (taxeditor): Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
- 09:57 AM Revision 2a56c01d (taxeditor): minor
09/25/2015
09/24/2015
- 11:58 AM Revision bf93de2d (taxeditor): Add missing properties file for tests
- 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
- 11:05 AM Revision e7923b05 (taxeditor): #5247 Use updated entities
- 11:05 AM Revision 3b89ce77 (taxeditor): #5250 Initial attempt at property paths
- 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
09/23/2015
- 02:29 PM Revision 8de05ed8 (taxeditor): merge with local branch
- 01:21 PM Revision 5354f693 (taxeditor): fix delete of taxon which is in two classifications and has children
- 12:26 PM Revision 9e671498 (taxeditor): Remove profile for clean goals to delete cdmlib jars
- 11:51 AM Revision 5b647198 (cdmlib-apps): minor for Caryophyllales
- 11:29 AM Revision dd12e4f8 (cdmlib): minor
- 11:29 AM Revision 82a73743 (cdmlib): minor
- 11:29 AM Revision ef39b9bb (cdmlib): adapt CacheUpdater to changes in ImportConfiguratorBase
- minor changes in TcsXmlNameImport
- 11:26 AM Revision 8d43a8ed (cdmlib): minor
- 11:26 AM Revision 49d85c28 (cdmlib): minor
- 11:17 AM Revision 210c01fc (cdmlib): fixing merge conflict
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... - 10:01 AM Revision 7f9465d2 (taxeditor): Sort classifications in dropdown of taxon node selection dialog (#5184)
- 10:01 AM Revision 0c6a1a43 (taxeditor): Pre-select current classification for taxon node selection dialog
- (#3462)
- 10:01 AM Revision 8393634c (taxeditor): Delete unused method
- 10:01 AM Revision 9f6b5e8b (taxeditor): Trim code
- 09:51 AM Revision 34469274 (taxeditor): Expand polytomous key section #3461
- 09:49 AM Revision 4da44861 (taxeditor): Trim code
- 09:49 AM Revision e4ab9116 (taxeditor): Add geoscopes and taxonomic scope as subsection to polytomous key detail
- element
- 08:21 AM Revision 0bae5e5a (taxeditor): Add selection listener to media detail element to allow showing
- supplemental data (#3367)
- 08:10 AM Revision 8b6a0f21 (taxeditor): Fix media view selection
09/21/2015
- 03:02 PM Revision a45e3c4a (taxeditor): Generalized UriWithLabelElement to use super class
- 02:40 PM Revision f8ee2720 (taxeditor): Add Lsid text field to taxonname details view
- - added generic abstract class for URI text fields
- 09:57 AM Revision 5a91da84 (taxeditor): Disable menu "New..." meun entries when no connection available (#4901)
- 09:44 AM Revision a4350d13 (taxeditor): Disable media view when synonym selected (#5195)
- 09:30 AM Revision 12ebf505 (taxeditor): I18n for specimen editor (#5155)
09/18/2015
- 04:16 PM Revision ddcc5e18 (cdmlib): minor
- 04:11 PM Revision b6301f68 (cdmlib): minor
- 03:56 PM Revision df1f5db8 (cdmlib): minor
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
- 05:03 PM Revision 65b1cba1 (cdm-dataportal): resolving conflicts that occured during relase-finish
- 05:00 PM Revision a2304745 (cdm-dataportal): updating develop poms to master versions to avoid merge conflicts
- 05:00 PM Revision 8598bb97 (cdm-dataportal): Merge branch 'release/3.9.0'
- 04:59 PM Revision 8f5f8f6c (cdm-dataportal): adding distributionmanagement and buid waggon connectors to the new pom.xml
- 04:58 PM Revision b5a14dab (cdm-dataportal): disabling old pom.xml used for site
- 04:49 PM Revision 9f03d709 (cdm-dataportal): updating poms for branch'release/3.9.0' with non-snapshot versions
- 04:49 PM Revision 7cf97d55 (cdm-dataportal): updating poms for 3.9.1-SNAPSHOT development
- 04:42 PM Revision 7226d02b (cdm-dataportal): initial pom.xml with jgitflow-maven-plugin
- 03:10 PM Revision f555e0ec (cdm-dataportal): whitespace
09/16/2015
- 09:24 PM Revision fbedcb23 (taxeditor): Fix merge
- 07:51 PM Revision c106c48b (taxeditor): Fix versions
- 07:49 PM Revision 3dce810f (cdm-server): Merge branch 'release/3.11.0'
- 07:49 PM Revision 3bfd5b07 (cdm-server): Updating develop poms back to pre merge state
- 07:49 PM Revision 2dc69ea6 (cdm-server): Merge branch 'master' into develop
- 07:49 PM Revision 5b835142 (cdm-server): updating develop poms to master versions to avoid merge conflicts
- 07:48 PM Revision 91cc5230 (cdm-server): updating poms for branch'release/3.11.0' with non-snapshot versions
- 07:48 PM Revision dc450cf7 (cdm-webapp): Updating develop poms back to pre merge state
- 07:48 PM Revision 40b5a9f7 (cdm-webapp): Merge branch 'master' into develop
- 07:48 PM Revision b9959264 (cdm-webapp): updating develop poms to master versions to avoid merge conflicts
- 07:48 PM Revision c7557d6e (cdm-webapp): Merge branch 'release/3.11.0'
- 07:48 PM Revision d50a6ce5 (cdm-webapp): updating poms for branch'release/3.11.0' with non-snapshot versions
- 07:48 PM Revision eb778035 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.11.0
- 07:47 PM Revision 2222cdd3 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.11.0-SNAPSHOT
- 07:47 PM Revision d5a76d18 (cdm-webapp): updating poms for 3.12.0-SNAPSHOT development
- 07:47 PM Revision 6446d714 (cdm-webapp): jenkins bumping cdmlib.remote.webapp.version and cdm.vaadin.version to 3.12.0-SNAPSHOT
- 07:43 PM Revision e4c8fe2e (cdm-vaadin): Updating develop poms back to pre merge state
- 07:43 PM Revision c2998d39 (cdm-vaadin): Merge branch 'master' into develop
- 07:43 PM Revision 03abef78 (cdm-vaadin): Merge branch 'release/3.11.0'
- 07:43 PM Revision d9284b9a (cdm-vaadin): updating develop poms to master versions to avoid merge conflicts
- 07:42 PM Revision a52450e2 (taxeditor): Fix versions
- 07:42 PM Revision ebd606e2 (cdm-vaadin): updating poms for branch'release/3.11.0' with non-snapshot versions
- 07:41 PM Revision af701e3c (cdmlib): Updating develop poms back to pre merge state
- 07:41 PM Revision c73eea93 (cdmlib): Merge branch 'master' into develop
- 07:41 PM Revision ed8f34b1 (cdmlib): updating develop poms to master versions to avoid merge conflicts
- 07:41 PM Revision 0ce6d468 (cdmlib): Merge branch 'release/3.11.0'
- 07:26 PM Revision e9039a5e (cdmlib): updating poms for branch'release/3.11.0' with non-snapshot versions
- 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... - 07:14 PM Revision 64a4022f (taxeditor): Fix versions
- 07:06 PM Revision a63b22b4 (taxeditor): Set second demo server ip
- 06:28 PM Revision 944a3fc3 (taxeditor): Revert project versions to 3.11.0-SNAPSHOT
- 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
- 06:26 PM Revision de0ece16 (cdm-vaadin): jenkins bumping cdmlib.version to 3.11.0-SNAPSHOT
- 06:26 PM Revision 7fdb7180 (cdm-vaadin): updating poms for 3.12.0-SNAPSHOT development
- 06:26 PM Revision 6f85571d (cdm-server): updating poms for 3.12.0-SNAPSHOT development
- 06:26 PM Revision 9f86b7dd (cdm-vaadin): jenkins bumping cdmlib.version to 3.12.0-SNAPSHOT
- 06:24 PM Revision b8ecd62d (cdmlib): updating poms for 3.12.0-SNAPSHOT development
- 05:05 PM Revision d2a09415 (cdm-dataportal): CRLF will be replaced by LF issues
- 05:01 PM Revision 1702a931 (cdm-dataportal): Merge tag '3.8.0' into develop
- Creating tag for release 3.8.0
- 05:01 PM Revision aa28b0e1 (cdm-dataportal): Merge branch 'release/3.8.0'
- 04:59 PM Revision 5d20692e (cdm-dataportal): Normalize all the line endings
- 04:58 PM Revision 51ca8df9 (cdm-dataportal): Saving files before refreshing line endings
- 04:47 PM Revision 0e3df23a (cdm-dataportal): deleting folder not removed by subgit after git rm
- 04:45 PM Revision 3d107583 (cdm-dataportal): deleting folder not removed by subgit after git rm
- 04:44 PM Revision 3b03b70f (cdm-dataportal): deleting folder not removed by subgit after git rm
- 04:36 PM Revision 28bd7c97 (cdm-dataportal): moving content of folder 7.x up to the repository root
- 04:32 PM Revision 4a68a31c (cdm-dataportal): removing sub-folders for drupal versions 5.x and 6.x
- 04:31 PM Revision c8012211 (cdm-dataportal): removing old test file
- 03:54 PM Revision fc75c0d7 (taxeditor): Fix for cdmlib version numbers
- 03:26 PM Revision e9013668 (taxeditor): Fix label consistency #5133
- 03:26 PM Revision 09a9071b (taxeditor): Add i18n to binary build path
- 03:01 PM Revision f00fe291 (taxeditor): Cache the default feature tree
- 02:59 PM Revision f76e6020 (taxeditor): #5259 initialising default ranks
- 02:58 PM Revision 176f1bfc (cdmlib): #5259 Add method to init defaul terms
Also available in: Atom