267 Commits

Author SHA1 Message Date
Richard Cordovano
3260d254ba Reset project.properties build.type to DEVELOPMENT 2017-01-04 15:24:23 -05:00
Richard Cordovano
62abe62a6c Update Autopsy version numbers 2017-01-02 18:44:54 -05:00
Ann Priestman
0be6b1c3dc Merge remote-tracking branch 'upstream/develop' into mergeTest
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2016-11-08 13:08:58 -05:00
rcordovano
05dc9c08bc Set project.properties build.type back to DEVELOPMENT 2016-10-24 14:13:02 -04:00
Richard Cordovano
82b6da6a46 Version number chnages 4.1.1 to 4.2.0 2016-10-12 13:03:57 -04:00
Eugene Livis
69dea39c0c Merged with latest from Autopsy develop 2016-08-19 15:22:18 -04:00
Eugene Livis
91b29d2777 First cut at moving everything auto ingest from autocpy core to experimental NMB 2016-08-15 10:27:16 -04:00
Eugene Livis
55c0980730 Moved 'Experimental' NBM contents into Autopsy-Core package to avoid circular dependency 2016-08-09 13:32:36 -04:00
Richard Cordovano
5effdbfb88 Merge remote-tracking branch 'upstream/release-4.1.1' into develop 2016-08-09 11:36:05 -04:00
Richard Cordovano
0c351e0b48 Update version number to 4.1.1 2016-08-05 22:39:09 -04:00
Richard Cordovano
8b6d5fe74d Add Experimental NBM and autoingest package 2016-07-26 13:28:32 -04:00
Richard Cordovano
48bb082e54 Change build.type property back to DEVFELOPMENT 2016-07-19 13:52:44 -04:00
Richard Cordovano
9293da4cbe Update suite project properties for 4.1.0 release 2016-07-18 17:58:44 -04:00
Richard Cordovano
383445f600 Remove org.netbeans.libs.javafx from diabled modules list in nbproject/platform.properties 2016-04-27 10:53:14 -04:00
Richard Cordovano
a4412894fd Remove jellytools from disabled modules list 2016-04-26 17:29:17 -04:00
Richard Cordovano
313e8ab179 Synch netbeans-plat-version properties 2016-04-26 16:44:47 -04:00
Oliver Spohngellert
536a8871b5 Fixed deprecation warnings to do with netbeans updates 2016-04-11 15:09:11 -04:00
Richard Cordovano
271bdd961b Set build.type back to DEVELOPMENT post release 4.1.0 2016-03-27 20:34:00 -04:00
Richard Cordovano
2179987dad Change build.type to RELEASE fro 4.1.0 2016-03-27 16:05:46 -04:00
Karl Mortensen
0df81b010a bump version to 4.1.0 2016-02-18 11:22:44 -05:00
Karl Mortensen
fd831566cf update comment 2016-02-04 14:46:20 -05:00
Karl Mortensen
4745bb836e Bump version number and copyright date 2016-02-03 16:29:14 -05:00
Brian Carrier
b0d2b8f01f changed back to development for develop branch 2015-11-02 10:56:31 -05:00
Richard Cordovano
c0f125a15b Update NEWS.txt for release 4.0.0 2015-10-30 17:31:53 -04:00
Brian Carrier
baeef27066 Updated version to 4.0.0 2015-10-25 21:31:45 -04:00
momo
090ac9cad9 revert property changes 2015-10-23 11:06:42 -04:00
Karl Mortensen
283f826282 fix up properties 2015-10-22 17:18:08 -04:00
Karl Mortensen
1583ec99ba merge 2015-10-22 16:41:40 -04:00
Karl Mortensen
5e1a557e9e merge 2015-10-22 16:05:56 -04:00
Richard Cordovano
114944dd45 Revert "Revert "enable ImageGallery"" 2015-10-14 17:16:05 -04:00
Richard Cordovano
e53e302ed1 Revert "enable ImageGallery" 2015-10-14 17:10:22 -04:00
Richard Cordovano
94c07630bc Merge pull request #1621 from millmanorama/develop
enable ImageGallery
2015-10-14 16:59:02 -04:00
jmillman
bc39b62e75 enable ImageGallery 2015-10-14 16:57:08 -04:00
momo
8645161e73 sort list of disabled mods 2015-10-14 15:41:40 -04:00
tsk-build
b4c8cea6bc adding back previously disabled modules 2015-10-14 13:12:52 -04:00
tsk-build
a88f9809b8 disabling nb-8 modules and removing windows tools 2015-10-14 10:13:50 -04:00
tsk-build
6cc1686f96 upgreade to 8 2015-10-13 15:53:56 -04:00
Richard Cordovano
27649f3fbe Image Gallery module disabled by default 2015-09-04 11:14:51 -04:00
Richard Cordovano
b1d27128fb Merge in develop and resolve conflicts 2015-08-28 13:00:50 -04:00
jmillman
0289c333df turn on IG 2015-08-28 10:07:02 -04:00
momo
316a27b59d upgrade sqlite to 3.8 and change url to updates.netbeans 2015-08-26 14:46:47 -04:00
Richard Cordovano
f14bb5a667 Revert "Netbeans on collab" 2015-08-26 14:36:41 -04:00
Richard Cordovano
326fc7a972 Revert "removing jellybeans from disabled modules" 2015-08-26 14:35:49 -04:00
momo
9a58814ba6 removing jellybeans from disabled modules 2015-08-26 11:26:08 -04:00
momo
c451159531 remove unneeded modules 2015-08-17 16:29:39 -04:00
momo
80af569dc1 upgrade to netbeans 8 2015-08-17 11:10:50 -04:00
momo
3ea61106a2 changing update source 2015-08-17 11:04:44 -04:00
momo
3298ebcfa3 changed the url to use netbeans (more reliable source) 2015-07-15 13:29:55 -04:00
Richard Cordovano
b4ee3471eb Merge develop branch into collaborative branch 2015-07-13 16:43:28 -04:00
Brian Carrier
fd6c748e51 Updated to develop flag 2015-06-29 19:07:07 -04:00