69fc73ea97
Merge branch 'development' into feature/allow-dupe-config-names
2018-09-01 16:15:54 -05:00
43cfd1b170
Code style fixes
2018-09-01 20:18:38 +01:00
b4ba5efb49
Brackets
2018-09-01 20:11:12 +01:00
1fcbae57e7
Merge branch 'development' into cleanup/duplicated-class
2018-09-01 12:02:24 -05:00
04bab209da
Merge pull request #249 from Parabot/bugfix/labels
...
[BUGFIX] Fixed yaml file for labels
2018-09-01 11:52:46 -05:00
166eb9dbfb
NPE Fix
2018-09-01 09:45:53 +01:00
812e2daa3b
Add -uuid flag as an alternative to -server quicklaunch arg
2018-09-01 09:45:44 +01:00
097a0bdf7b
Fix ServerDesc comparitor to allow duplicate server names
2018-08-24 03:10:51 +01:00
3eaa11c0ec
Merge branch 'development' into bugfix/labels
2018-08-14 12:33:30 -05:00
0c79df81eb
[BUGFIX] Fixed yaml file for labels
2018-08-14 12:32:48 -05:00
82f3224c36
Merge pull request #246 from Parabot/bugfix/method-error
...
[BUGFIX] Added support for ImagePS
2018-07-02 15:12:11 +02:00
e6605c4a75
[TASK] Added verbose line
2018-07-02 15:08:24 +02:00
a2c94f9267
[BUGFIX] Added support for ImagePS
2018-07-02 15:06:39 +02:00
c754cd2ef0
Update Context.java
2018-05-20 23:36:53 +01:00
01a12a50b5
Update Landing.java
2018-05-20 23:36:10 +01:00
1cf30d5375
[BUGFIX] Java check version
2018-05-20 18:45:43 +01:00
2b93a57774
Merge pull request #242 from Parabot/development
...
[MERGE] Development into master
2018-01-29 21:34:49 +00:00
2b9cde6cf8
Merge branch 'development' into cleanup/duplicated-class
2018-01-28 13:31:29 +00:00
52b758e9cb
Merge pull request #239 from Parabot/task/timer-unit-test
...
[TASK] Added unit tests for the Timer class
2018-01-03 22:28:45 +01:00
5d612762e9
[TASK] Added start parameter to docs
2018-01-03 11:06:53 +01:00
3f0d8d64fe
[TASK] Added unit tests for the Timer class
2018-01-03 11:05:00 +01:00
9d1c4533ca
Merge pull request #238 from Parabot/feature/timer-days
...
[Feature] Added days into Timer
2018-01-03 00:40:02 +01:00
2e1817d254
Merge branch 'feature/timer-days' of https://github.com/Parabot/Parabot into feature/timer-days
2018-01-02 23:28:05 +00:00
cc360f59e7
[TASK] Removed append
2018-01-02 23:27:53 +00:00
c24f03cfe6
Merge branch 'development' into feature/timer-days
2018-01-02 17:46:50 +00:00
6a6b7cd7da
[TASK] Moved to openjdk7
...
For some reason it was using oracle's jdk.
2018-01-02 17:41:22 +00:00
58d9e23094
[FEATURE] Added days into Timer
...
Credits to @parnassian
2018-01-02 17:32:45 +00:00
a0483158d5
[CLEANUP] Removed duplicated class
2017-12-12 10:44:13 +00:00
4162d4b032
Merge pull request #232 from Parabot/feature/randoms
...
[FEATURE] Added Randoms to Script
2017-11-29 18:22:38 +01:00
84816acd27
[FEATURE] Added Randoms to Script
...
Allows users to add randoms though scripts.
2017-11-28 21:42:06 +00:00
04ea26e70c
Merge pull request #230 from Parabot/bugfix/screenshots
...
[BUGFIX] Fixed height on screenshots
2017-11-21 13:25:23 +01:00
47570cbce0
[TASK] Removed random number
...
Also bumped version
2017-11-21 10:41:49 +00:00
610778597f
[BUGFIX] Fixed heigh on screenshots
2017-11-21 08:59:52 +00:00
6bb9dd32ec
Merge pull request #229 from JMapfel/development
...
[BUGFIX] A bug where the method node lookup didn't work
2017-09-26 23:56:38 +02:00
44625f7280
[BUGFIX] A bug where the method node lookup didn't work
...
The 'getMethod' method in the Invoker wrapper did only check the
descriptor of the parameters. To ensure that the right method is
returned, the full method desc must be used.
The return desc (the 'desc' element in the hooks file) is still optional,
but should be used to avoid conflicts.
2017-09-26 23:37:07 +02:00
4da3756f3e
Merge pull request #226 from Parabot/release/2.6.7
...
[MERGE] Release V2.6.7 into Development
2017-09-12 00:21:04 +02:00
7d9d2a2ea1
Merge branch 'development' of github.com:Parabot/Parabot into release/2.6.7
...
# Conflicts:
# src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
# src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
2017-09-12 00:11:53 +02:00
f05226d32d
Merge pull request #225 from Parabot/bugfix/protected-domain
...
[BUGFIX] Added getProtectionDomain to ClassRedirect
2017-09-12 00:06:23 +02:00
a6b444572d
[BUGFIX] Added createImage with ImageProducer
2017-09-12 00:04:17 +02:00
bbe7496ecb
[BUGFIX] Granting access instead of blocking it
2017-09-12 00:00:07 +02:00
a7debba54b
[BUGFIX] Added getProtectionDomain to ClassRedirect
2017-09-11 23:57:24 +02:00
e335cfa835
Merge pull request #224 from Parabot/bugfix/travis-openjdk7
...
[BUGFIX] Set deployment requirement to openjdk7
2017-09-11 23:38:00 +02:00
db8d7989cb
[BUGFIX] Set deployment requirement to openjdk7
...
Instead of oraclejdk7
2017-09-11 23:22:03 +02:00
bf45dfb08d
Merge pull request #223 from Parabot/bugfix/issue-222
...
[BUGFIX] Solving currentThread null return
2017-09-11 23:17:42 +02:00
0834ff2057
[BUGFIX] Using the given Toolkit and not default Toolkit
2017-09-11 23:14:12 +02:00
f667850121
[BUGFIX] Solved issue with returning null image
2017-09-11 23:13:43 +02:00
724d98a6e0
[BUGFIX] Solving issues with Travis building
2017-09-11 23:09:26 +02:00
f284fa0e80
[BUGFIX] Solving currentThread null return
...
Solves issue #222
2017-09-11 23:05:42 +02:00
bcb0ddfab7
[CLEANUP] Reformatted code
2017-08-29 00:19:17 +02:00
d3541f795b
[TASK] Set version to 2.6.7 in travis config
2017-08-29 00:13:47 +02:00
Jeroen Ketelaar