提交 · cddbc4831ea6dbd15681edb863a46235c924c642 · 开发团队 / Flowable Engine

27 8月, 2015 2 次提交
- J
  Merge branch 'activiti6' of https://github.com/Activiti/Activiti into activiti6 · cddbc483
  由 Joram Barrez 提交于 8月 26, 2015
```
# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  Changes for Activiti 6 release build
  Activiti 6 angular UI
```
  cddbc483
- J
  
  First version of the migration doc · 11080eab
  由 Joram Barrez 提交于 8月 26, 2015
  
  11080eab
26 8月, 2015 10 次提交
- T
  
  Changes for Activiti 6 release build · d602640b
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  d602640b
- T
  
  Merge branch 'activiti6' of https://github.com/Activiti/Activiti into activiti6 · 1d28f63e
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  1d28f63e
- T
  
  Activiti 6 angular UI · 8b8ecf00
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  8b8ecf00
- T
  
  Porting https://github.com/Activiti/Activiti/commit/82e5f89b148478a07bda9613528398b8b609c456 to v6 · 522871b7
  由 Tijs Rademakers 提交于 8月 09, 2015
  
  522871b7
- T
  
  Porting https://github.com/Activiti/Activiti/commit/499ce736589a8357845d0eb49747271ee0a25bce to v6 · a61fff6f
  由 Tijs Rademakers 提交于 8月 06, 2015
  
  a61fff6f
- J
  Merge branch 'activiti6' into jbarrez-v6 · 9049cdc7
  由 Joram Barrez 提交于 8月 26, 2015
```
Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
```
  9049cdc7
- T
  
  Merge branch 'activiti6' of https://github.com/Activiti/Activiti into activiti6 · 0c28b003
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  0c28b003
- T
  
  Pull request #653 · c62a0cc2
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  c62a0cc2
- T
  Merge pull request #654 from reva/activiti6 · d05ff5d9
  由 Tijs Rademakers 提交于 8月 26, 2015
```
Delete byte array only if there is one
```
  d05ff5d9
- T
  
  Empty parallel multi instance fix · 0a0102ad
  由 Tijs Rademakers 提交于 8月 26, 2015
  
  0a0102ad
25 8月, 2015 6 次提交
- T
  
  Improvements to bpmn json converter · f297e8c5
  由 Tijs Rademakers 提交于 8月 25, 2015
  
  f297e8c5
- J
  
  Enhancing getList() to use cached objects without needing to create an extra list internally. · e49c06d4
  由 Joram Barrez 提交于 8月 25, 2015
  
  e49c06d4
- J
  
  Improvements to generic entity fetch methods · 9d0c8a27
  由 Joram Barrez 提交于 8月 24, 2015
  
  9d0c8a27
- J
  
  EntityManager interface extraction: last bits. · ac85faaf
  由 Joram Barrez 提交于 8月 24, 2015
  
  ac85faaf
- J
  Merge branch 'activiti6' into jbarrez-v6 · f18b7366
  由 Joram Barrez 提交于 8月 24, 2015
```
Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java
```
  f18b7366
- J
  
  Interface extraction: minor fixes · 637b85f3
  由 Joram Barrez 提交于 8月 24, 2015
  
  637b85f3
24 8月, 2015 2 次提交
- J
  
  Extracting interface for EntityManagers + removal of duplicate and unused methods · 97966564
  由 Joram Barrez 提交于 8月 24, 2015
  
  97966564
- T
  
  Test fix · a01722fd
  由 Tijs Rademakers 提交于 8月 23, 2015
  
  a01722fd
23 8月, 2015 1 次提交
- J
  
  Last bit of moving entity logic into manager. Next up: variables scopes and interfaces. · fa11ad1e
  由 Joram Barrez 提交于 8月 23, 2015
  
  fa11ad1e
22 8月, 2015 1 次提交
- T
  
  Activiti 5 compatibility config · 8a34588c
  由 Tijs Rademakers 提交于 8月 22, 2015
  
  8a34588c
21 8月, 2015 4 次提交
- T
  
  Prepare Activiti 5 compatibility for QA testing · 237439cf
  由 Tijs Rademakers 提交于 8月 21, 2015
  
  237439cf
- J
  
  Further entity cleanup work · fa24e98f
  由 Joram Barrez 提交于 8月 21, 2015
  
  fa24e98f
- T
  
  Fixes for Activiti 6 tests · 1cdaf9cf
  由 Tijs Rademakers 提交于 8月 21, 2015
  
  1cdaf9cf
- T
  
  YES! runs green in my local environment · 2362dfa8
  由 Tijs Rademakers 提交于 8月 21, 2015
  
  2362dfa8
20 8月, 2015 1 次提交
- T
  
  More backwards compatibility work · d7acc11d
  由 Tijs Rademakers 提交于 8月 19, 2015
  
  d7acc11d
19 8月, 2015 2 次提交
- T
  
  More backwards compatibility work · a1e1ebd4
  由 Tijs Rademakers 提交于 8月 18, 2015
  
  a1e1ebd4
- T
  
  More backwards compatibility work · 06636d3a
  由 Tijs Rademakers 提交于 8月 18, 2015
  
  06636d3a
18 8月, 2015 2 次提交
- T
  
  More Activiti 5 compatibility testing · a57b484c
  由 Tijs Rademakers 提交于 8月 17, 2015
  
  a57b484c
- J
  
  Further cleanup and moving entity logic · bd27a34b
  由 Joram Barrez 提交于 8月 17, 2015
  
  bd27a34b
17 8月, 2015 2 次提交
- J
  
  Further cleanup of ExecutionEntity · 4b98cca6
  由 Joram Barrez 提交于 8月 17, 2015
  
  4b98cca6
- J
  (work in progress) Moving logic from entities into EntityManager classes.... · 947e2d8f
  由 Joram Barrez 提交于 8月 16, 2015
```
(work in progress) Moving logic from entities into EntityManager classes. Removing unneeded methods and consolidating almost similar logic.
```
  947e2d8f
16 8月, 2015 1 次提交
- T
  
  More backwards compatibility testing · 8dafe946
  由 Tijs Rademakers 提交于 8月 16, 2015
  
  8dafe946
15 8月, 2015 1 次提交
- T
  
  Fix Activiti 6 failing identity tests + more backwards compatibility testing · ad6b2d59
  由 Tijs Rademakers 提交于 8月 15, 2015
  
  ad6b2d59
14 8月, 2015 5 次提交
- T
  
  Merge branch 'activiti6' of https://github.com/Activiti/Activiti into activiti6 · b68e5a59
  由 Tijs Rademakers 提交于 8月 14, 2015
  
  b68e5a59
- T
  
  More Activiti 5 backwards compatibility · 51197e51
  由 Tijs Rademakers 提交于 8月 14, 2015
  
  51197e51
- J
  
  Fix failing job tests · feb347e8
  由 Joram Barrez 提交于 8月 14, 2015
  
  feb347e8
- J
  Merge branch 'activiti6' of https://github.com/Activiti/Activiti into activiti6 · bc848140
  由 Joram Barrez 提交于 8月 14, 2015
```
# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  First stage of job executor backwards compatibilty
```
  bc848140
- J
  Moving ActivityBehavior and other delegate classes out of the pvm package: · 85536860
  由 Joram Barrez 提交于 8月 14, 2015
```
Breaking change:  org.activiti.engine.impl.pvm.delegate; (ActivityBehavior and others) changed to  org.activiti.engine.impl.delegate;
```
  85536860