Code

Master#62

Code

Open

yinjk wants to merge 197 commits intocountersignhenryyan/kft-activiti-demo:countersignfrom masterhenryyan/kft-activiti-demo:masterCopy head branch name to clipboard

+105,078-5,073

Commits

Commits on Jan 25, 2013

• Update README.md

  henryyan

  committed
  177ffee

Commits on Feb 7, 2013

• 读取流程定义的图片时从静态服务读取，格式：http://localhost:10000/leave-formkey/1/leave-formkey.png

  henryyan

  committed
  e4af863

• release 1.6.1

  henryyan

  committed
  415cfb6

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 3aff88a
  henryyan

  committed
  3aff88a

• 升级jquery ui portlet插件至1.1.3

  henryyan

  committed
  01b1717

• Update README.md

  henryyan

  committed
  2921f00

• Update README.md

  henryyan

  committed
  f45ad8f

• Update README.md

  henryyan

  committed
  a6c2553

Commits on Feb 8, 2013

• Update README.md

  henryyan

  committed
  7d8c4f6

Commits on Feb 11, 2013

• revert to 1.6.0

  henryyan

  committed
  3fa73f7

Commits on Feb 25, 2013

• 解决不能运行单元测试的问题

  henryyan

  committed
  e9a6172

Commits on Feb 27, 2013

• Fixed: #18

  henryyan

  committed
  2f47b7e

Commits on Mar 2, 2013

• 删除leaveApply.jsp中的modelAttribute=user，无用额垃圾代码

  henryyan

  committed
  3325ecc

Commits on Mar 8, 2013

• 合并到no-maven分支的脚本禁用对lib目录的操作

  henryyan

  committed
  e031367

• 升级引擎版本至5.12.1

  henryyan

  committed
  bd3be52

• 所有列表开启分页功能

  henryyan

  committed
  958d4f1

• 解决测试类报错

  henryyan

  committed
  9a4f26f

Commits on Mar 10, 2013

• 添加processdefinition的cache

  henryyan

  committed
  baf95a5

• Update README.md

  henryyan

  committed
  81be967

• 添加生成图片的字体属性，默认设置为：宋体，可以自行更改

  henryyan

  committed
  15f2375

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for d8b4db6
  henryyan

  committed
  d8b4db6

• 所有查询列表添加排序字段

  henryyan

  committed
  70f4af4

• Update README.md

  henryyan

  committed
  5c54dd4

• 移除cache的loaded监听，启动时会导致报错

  henryyan

  committed
  e00afcf

• 集成Activiti Modeler

  henryyan

  committed
  894cfd2

• 排除对vaadin和dchars的依赖

  henryyan

  committed
  c4e379c

• 根据model部署流程成功后显示提示消息

  henryyan

  committed
  9e1bf80

• 更新合并到no-maven的脚本

  henryyan

  committed
  1c7d498

• 删除main/resources/activiti.cfg.xml，设置src/test/resources/activiti.cfg.xml的引擎名称，解决通过ProcessEngines.getDefaultProcessEngine()获取引擎时和spring的引擎不同问题

  henryyan

  committed
  b25ebcc

• 优化ModelController的异常处理

  henryyan

  committed
  dcf501b

• Update README.md

  henryyan

  committed
  da393e3

• 简化整合modeler的依赖

  henryyan

  committed
  edabb7b

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for a125c52
  henryyan

  committed
  a125c52

Commits on Mar 14, 2013

• Update README.md

  henryyan

  committed
  eecb618

Commits on Mar 18, 2013

• 禁用流程定义对象缓存

  henryyan

  committed
  81c16c6

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 6ae2d42
  henryyan

  committed
  6ae2d42

Commits on Mar 26, 2013

• Update applicationContext.xml

  Show description for 17c46be
  

  smratx

  committed
  17c46be

• Update applicationContext-test.xml

  Show description for b949aba
  

  smratx

  committed
  b949aba

• Merge pull request #20 from smratx/patch-2

  Show description for 4abcdf8
  henryyan

  committed
  4abcdf8

• Merge pull request #19 from smratx/patch-1

  Show description for aa24d9c
  henryyan

  committed
  aa24d9c

Commits on Mar 29, 2013

• 添加IDEA的iml文件，忽略.idea目录

  henryyan

  committed
  27d0fd7

• 删除drop table if exist table OA_LEAVE

  henryyan

  committed
  f9b2be5

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for d81b8f9
  henryyan

  committed
  d81b8f9

Commits on Mar 30, 2013

• Update schema.sql

  Show description for a4877cf
  

  smratx

  committed
  a4877cf

Commits on Mar 31, 2013

• Merge pull request #21 from smratx/patch-3

  Show description for 01f1bbf
  henryyan

  committed
  01f1bbf

Commits on Apr 4, 2013

• 更改私服代理设置，使用kafeitu与http://server.kafeitu.me:8081/nexus/content/repositories/releases

  henryyan

  committed
  083b739

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for eff9801
  henryyan

  committed
  eff9801

• Update pom.xml

  Show description for 524e188
  donsen123

  committed
  524e188

• Merge pull request #22 from donsen123/patch-1

  Show description for efc84d1
  henryyan

  committed
  efc84d1

• 升级activiti至5.12.2

  henryyan

  committed
  541d7fa

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 75dfe52
  henryyan

  committed
  75dfe52

• 添加labelFontName配置

  henryyan

  committed
  6507f1f

Commits on Apr 5, 2013

• Activiti的全部依赖使用5.12.2版本

  henryyan

  committed
  5a3a796

Commits on Apr 7, 2013

• Update README.md

  henryyan

  committed
  faf1e2b

Commits on Apr 8, 2013

• 简化spring mvc的配置

  henryyan

  committed
  5614016

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 9927328
  henryyan

  committed
  9927328

Commits on Apr 9, 2013

• fixed：formkey使用native query报错

  henryyan

  committed
  b284919

• 忽略IDEA的iml文件

  henryyan

  committed
  ed370c2

Commits on Apr 10, 2013

• 升级一批maven插件

  henryyan

  committed
  944b78c

• 清理一些spring配置文件中无用的xsd引用

  henryyan

  committed
  b58d9ce

• 添加转换流程定义为Model功能，在模型列表会添加一条记录

  henryyan

  committed
  065447f

• release 1.7.1

  henryyan

  committed
  81ded7d

• 解决流程引擎自动生成的图片跟踪坐标错乱问题

  henryyan

  committed
  2defbf5

• 解决流程引擎自动生成的图片跟踪坐标错乱问题

  henryyan

  committed
  92f89d6

Commits on Apr 11, 2013

• 使用重新打包的5.12.1

  henryyan

  committed
  002f80e

• 解决跟踪流程图时（调用引擎的图片生成工具）中文乱码

  henryyan

  committed
  83e6e7f

Commits on Apr 12, 2013

• 更新合并到no-maven分支的脚本

  henryyan

  committed
  029c83e

Commits on Apr 13, 2013

• Update README.md

  henryyan

  committed
  3a29966

• 解决创建Model不支持中文问题，解决资源名称包含中文不能查看问题

  henryyan

  committed
  fd278a0

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 3422ab7
  henryyan

  committed
  3422ab7

• 更新sql为5.12

  henryyan

  committed
  366c44b

• 清理垃圾

  henryyan

  committed
  fdb28b8

Commits on Apr 17, 2013

• 使用自定义的Activiti版本 5.12.1-kft，添加全局监听演示

  henryyan

  committed
  aa5ccfd

• Update README.md

  henryyan

  committed
  ba0c343

• Update README.md

  henryyan

  committed
  e8200ef

Commits on Apr 18, 2013

• 更改kafeitu私服的路径

  henryyan

  committed
  9dacc0b

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 65c64ee
  henryyan

  committed
  65c64ee

Commits on Apr 19, 2013

• Context.setProcessEngineConfiguration设置的时候添加说明区分是否使用spring

  henryyan

  committed
  12ac095

Commits on May 14, 2013

• 修复使用mysql时报错：Every derived table must have its own alias

  henryyan

  committed
  8cb30d8

Commits on Jun 10, 2013

• Update README.md

  henryyan

  committed
  32425dd

Commits on Jun 19, 2013

• 解决首页待办任务跟踪提示样式错乱问题

  henryyan

  committed
  7fb8663

• 修正动态表单和外置表单流程列表不能查看xml和图片问题

  henryyan

  committed
  6e0257d

• 升级Activiti至5.13

  henryyan

  committed
  18b3f3d

• start version 1.8.0 for activiti 5.13

  henryyan

  committed
  634a28b

Commits on Jun 22, 2013

• 升级合并脚本

  henryyan

  committed
  5f8dbd9

Commits on Jun 25, 2013

• add maven-jrebel-plugin

  henryyan

  committed
  b62b939

• Update README.md

  henryyan

  committed
  9bc604e

Commits on Jun 29, 2013

• 优化配置文件读取方式，解决读取application-file.properties文件内容无序问题，在view层可以更方便的获取属性值

  henryyan

  committed
  b896d0a

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 2a99356
  henryyan

  committed
  2a99356

Commits on Jun 30, 2013

• Update README.md

  henryyan

  committed
  b942f70

Commits on Aug 16, 2013

• 没事瞎折腾型，把登录、欢迎页面做了优化（居中），升级了配置文件管理的Servlet

  henryyan

  committed
  1d6825b

• jetty插件版本回退，支持JDK 1.6+

  henryyan

  committed
  2952def

• 登陆改为登录，登录页面添加版本号信息

  henryyan

  committed
  d41fa05

Commits on Aug 17, 2013

• 一些配置用portable-config-maven-plugin在打包时替换

  henryyan

  committed
  7b2d811

• spring的placeholder先禁用动态替换，插件目前不支持

  henryyan

  committed
  1e5406d

Commits on Aug 18, 2013

• fix

  henryyan

  committed
  03129e1

Commits on Aug 21, 2013

• portable插件：目前不支持带namespace的属性替换，请Juven协助

  henryyan

  committed
  f94b7c0

Commits on Aug 22, 2013

• upgrade sql scheme for 5.13

  henryyan

  committed
  44c02da

• 修复online profile打包时，不能替换有namespace的内容

  henryyan

  committed
  35ad528

Commits on Aug 30, 2013

• 发布1.8.2，添加了UUID生成器的配置，参考文章：http://www.kafeitu.me/activiti/2013/08/30/using-uuid-as-primary-key-in-activiti.html

  henryyan

  committed
  ad74747

Commits on Sep 9, 2013

• jrebel插件添加version 1.1.5

  henryyan

  committed
  f3408dd

Commits on Sep 27, 2013

• Update DateConverter.java

  Show description for 8ef32d5
  sgq0085

  committed
  8ef32d5

Commits on Oct 14, 2013

• Merge pull request #27 from sgq0085/patch-1

  Show description for 954d129
  henryyan

  committed
  954d129

Commits on Nov 7, 2013

• 有时候提交空值过来会有点问题

  ceylog

  committed
  08093f5

• Merge pull request #29 from ceylog/patch-1

  Show description for bf8287c
  henryyan

  committed
  bf8287c

Commits on Nov 30, 2013

• 不疼不痒的升级到5.14（just fixed bugs），顺便升级了几个依赖的版本号 and log4j的输出格式配置

  henryyan

  committed
  60b6795

• QQ群介绍状态更改

  henryyan

  committed
  264def5

• 继续不疼不痒的升级

  henryyan

  committed
  fc1dd6d

• 升级Activiti Modeler

  henryyan

  committed
  f47dfc6

• 格式化代码，仅此而已

  henryyan

  committed
  09b95a9

Commits on Dec 1, 2013

• 添加综合流程演示（只支持动态表单）

  henryyan

  committed
  dd35973

Commits on Dec 3, 2013

• 登陆页面的QQ群更新

  henryyan

  committed
  8e449de

Commits on Dec 4, 2013

• log4j的格式调整

  henryyan

  committed
  9aa51c6

Commits on Dec 16, 2013

• 把jdk改为1.6

  henryyan

  committed
  4e2deb8

Commits on Dec 18, 2013

• 增强容错性

  henryyan

  committed
  f971c78

• rest模块配置更改

  henryyan

  committed
  f1f8c5c

Commits on Dec 23, 2013

• 针对mysql的乱码问题，在属性文件里面说明要用UTF8编码

  henryyan

  committed
  34fe598

Commits on Jan 5, 2014

• 解决Activiti Modeler的Rest与Activiti-Rest模块实现类冲突问题

  henryyan

  committed
  8e23b07

• 添加finalName

  henryyan

  committed
  9da15a8

• Update README.md

  henryyan

  committed
  f4363b1

Commits on Jan 11, 2014

• 修复请假办理异常问题

  henryyan

  committed
  027e854

Commits on Jan 16, 2014

• demo启动时自动创建请假实体表

  henryyan

  committed
  e226e3e

• 优化合并到no-maven分支的脚本

  henryyan

  committed
  2c11dad

• demo启动时自动创建请假实体表

  henryyan

  committed
  5072a7c

Commits on Feb 11, 2014

• . add identityService.setAuthenticatedUserId(null)

  south55

  committed
  78d7d4d

Commits on Feb 14, 2014

• Merge pull request #33 from lizhe5/daily_south_0211_1

  Show description for d2c2131
  henryyan

  committed
  d2c2131

Commits on Feb 18, 2014

• 解决Hibernate自动创建表导致activiti的act_id_group和act_id_user没有使用最新版本的sql，导致初始化数据不能导入

  henryyan

  committed
  c2efc65

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 9ba5af0
  henryyan

  committed
  9ba5af0

Commits on Feb 25, 2014

• 删掉mysql jdbc.url中的"amp;",因为这个是xml中&的转义符配置方法，但在properties中不适用.

  Show description for 0dcc176
  jacarrichan

  committed
  0dcc176

Commits on Mar 11, 2014

• Merge pull request #35 from jacarrichan/master

  Show description for 039b4a8
  henryyan

  committed
  039b4a8

Commits on Mar 24, 2014

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 3320e3f
  henryyan

  committed
  3320e3f

Commits on Apr 3, 2014

• 升级Activiti到5.15.1版本

  henryyan

  committed
  bbf93e2

• 升级editor到最新版

  henryyan

  committed
  cd5c66c

• 升级到5.12.1-kft(解决任务查询bug)，添加JPA集成演示

  henryyan

  committed
  7cfc3ef

Commits on Apr 10, 2014

• 测试配置文件添加Hibernate自动创建表的配置，删除无用的sql引用

  henryyan

  committed
  ce6dbf7

Commits on Apr 17, 2014

• 完成了JPA演示

  henryyan

  committed
  db0efd7

• JPA流程中当领导审批和人事审批处理完成后更新JPA实体的属性值持久化到数据库

  henryyan

  committed
  fd530e9

• 更新5.15.1版本的SQL脚本

  henryyan

  committed
  ce34658

• 集成了diagram-viewer

  henryyan

  committed
  419c2b7

• LeaveProcessEndListener改为实现ExecutionListener接口

  henryyan

  committed
  3fdcd0e

• Update README.md

  henryyan

  committed
  96bc2cb

Commits on Apr 23, 2014

• 解决Activiti Modeler不能在Chrome V34运行问题

  henryyan

  committed
  cd89e74

• release 1.10.1

  henryyan

  committed
  0a1eeeb

• sql文件的5.15.1-SNAPSHOT版本改为5.15.1

  henryyan

  committed
  53ef5f8

Commits on Apr 24, 2014

• Update README.md

  henryyan

  committed
  837a2f0

• Update README.md

  henryyan

  committed
  d2f9b3d

• Update README.md

  henryyan

  committed
  bdd5fdc

• Update README.md

  henryyan

  committed
  f638810

• Update README.md

  henryyan

  committed
  112069c

Commits on May 8, 2014

• 优化方法注释

  Wang-Ray

  committed
  db1d0f5

• 修复h2版本不对的问题

  Wang-Ray

  committed
  d68d20b

• Merge pull request #37 from AngiWANG/master

  Show description for fc82d69
  henryyan

  committed
  fc82d69

• 解决动态表单任务列表任务重复问题

  henryyan

  committed
  33907c8

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for 5511d61
  henryyan

  committed
  5511d61

• release 1.10.2

  henryyan

  committed
  b7469ff

Commits on May 11, 2014

• 完成集成Webservice的演示

  henryyan

  committed
  32e9a19

Commits on May 12, 2014

• 添加邮件集成演示

  henryyan

  committed
  b1e8d74

Commits on May 20, 2014

• Update README.md

  henryyan

  committed
  ea28752

• QQ群替换成主1群

  henryyan

  committed
  bbf489f

• Merge branch 'master' of github.com:henryyan/kft-activiti-demo

  Show description for b200840
  henryyan

  committed
  b200840

Commits on Jul 12, 2014

• 解决tomcat:run不能运行问题（设置了cxf-jetty模块的scope为test）

  henryyan

  committed
  a2dea05

• release 1.11.1

  henryyan

  committed
  6e683ef

Commits on Jul 21, 2014

• 请假流程（普通表单）待办任务查询优化

  henryyan

  committed
  3e07303

Commits on Jul 23, 2014

• 解决Diagram viewer不显示线上文字问题

  henryyan

  committed
  b906dc6

Commits on Aug 1, 2014

• 切换到Activiti 5.16版本

  henryyan

  committed
  2227bfc

• 修复编译错误问题

  henryyan

  committed
  6e78afc

• spring version -> 4.0.6.RELEASE

  henryyan

  committed
  38449de

• Hibernate二级缓存禁用 + 切换到1.12版本 + 升级几个依赖版本

  henryyan

  committed
  d1c299d

• 5.15 -> 5.16

  henryyan

  committed
  047ea61

Commits on Aug 4, 2014

• 5.16中流程图生成器重构后API变更

  henryyan

  committed
  1706cf2

Commits on Aug 6, 2014

• qq群欢迎加入改为1号

  henryyan

  committed
  a4cd4b7

• 升级lang3版本到3.3.2，升级dhcp到dhcp2

  henryyan

  committed
  c137473

Commits on Nov 16, 2015

• Activiti升级到5.19.0，修改了Modeler的整合方式

  henryyan

  committed
  09d9c64

• Update README.md

  henryyan

  committed
  6aa3e10

• 添加图片

  henryyan

  committed
  bcab48b

• Update README.md

  henryyan

  committed
  39bbcb1

• demo数据自动初始化

  henryyan

  committed
  5f08c26

Commits on Nov 23, 2015

• release 1.13.0

  henryyan

  committed
  82efb4a

Commits on Nov 24, 2015

• Update README.md

  henryyan

  committed
  0d5027a

• 解决登录页面没有Activiti实战图片问题

  henryyan

  committed
  8256187

• pom.xml添加osc的仓库地址

  henryyan

  committed
  56fe90e

• Update README.md

  henryyan

  committed
  63f2161

Commits on Nov 26, 2015

• 清理无用sql和ant配置文件 + 解决创建模型后页面404问题 + 模型可以根据json或者bpmn格式导出

  henryyan

  committed
  54944fd

• 添加了作业管理、用户与组、流程引擎信息查看、引擎数据库表查询

  henryyan

  committed
  1181423

• 整合Restful api， 5.17+方式

  henryyan

  committed
  127a566

Commits on Nov 27, 2015

• 解决mysql profile的jdbc.url转义问题

  henryyan

  committed
  9e6125a

Commits on Dec 10, 2015

• 有人说不支持JDK6了，然后我就妥协降级了；有人说一堆bean配置在一起不好区分，然后我又妥协进行了拆分

  

  三寻

  committed
  49c28a8

• h2支持工具升级

  

  三寻

  committed
  8acc679

• 注释强迫症

  

  三寻

  committed
  f1e8f13

Commits on Dec 27, 2015

• 调整spring配置文件结构

  henryyan

  committed
  39cf2ae

Commits on Jan 6, 2016

• 解决maven jetty插件配置应用名称错误问题

  

  三寻

  committed
  7ae8ad8

Commits on Feb 17, 2016

• tomcat memory opts

  

  三寻

  committed
  79c5dcd

Commits on Nov 9, 2016

• 升级activiti -> 5.22.0

  

  三寻

  committed
  857c5ac

• move to 1.15.0-SNAPSHOT

  

  三寻

  committed
  0e835de

• 禁用osc仓库

  

  三寻

  committed
  50cbebc

• NPE

  

  三寻

  committed
  d0da931

Commits on Nov 13, 2016

• add DbInitConfigurator

  

  三寻

  committed
  de99ecd