Code

No maven#53

Code

Open

z275748353 wants to merge 99 commits intomasterhenryyan/kft-activiti-demo:masterfrom no-mavenhenryyan/kft-activiti-demo:no-mavenCopy head branch name to clipboard

+135,763-4,350

Commits

Commits on May 27, 2012

• 创建无Maven分支:no-maven

  henryyan

  committed
  3e3735d

• 补上README

  henryyan

  committed
  71083ef

• Update README.md

  henryyan

  committed
  dca8984

• Update README.md

  henryyan

  committed
  70d26b4

• Update README.md

  henryyan

  committed
  19cf6a2

Commits on May 28, 2012

• 清理classes目录的文件，并让git忽略之

  henryyan

  committed
  155e14f

• Fixed：hruser用户同意申请时系统报错

  henryyan

  committed
  f071558

• Fixed：IE不能登录问题

  henryyan

  committed
  a19448b

Commits on May 29, 2012

• Fixed：IE下面申请请假不能提交问题

  henryyan

  committed
  a12b6fd

Commits on May 31, 2012

• 从master分支合并

  henryyan

  committed
  638fff4

Commits on Aug 2, 2012

• 忽略Mac系统的.DS_Store文件，忽略.ant_targets

  henryyan

  committed
  0631393

• 添加流程打包的ant target，在项目木执行ant workflow.package.all即可自动打包流程资源文件为zip格式压缩包

  henryyan

  committed
  90c659a

Commits on Aug 5, 2012

• master分支脱离了springside之后更新依赖jar

  henryyan

  committed
  dd11173

• 系统首页删除springside说明

  henryyan

  committed
  dcf2b94

Commits on Aug 10, 2012

• 升级activiti到5.10

  Show description for b3fee7c
  henryyan

  committed
  b3fee7c

Commits on Aug 11, 2012

• 合并了master分支的jsp

  henryyan

  committed
  a5b3bc4

• 动态表单中的办理添加未完成提示

  henryyan

  committed
  eb6e0cd

• 合并master分支的动态表单功能，已完成

  henryyan

  committed
  dc4f74f

Commits on Aug 12, 2012

• merge from master: 添加部署单个流程的功能，5.10解决了中文乱码问题

  henryyan

  committed
  202a438

Commits on Aug 13, 2012

• Update README.md

  henryyan

  committed
  00b151e

• Update README.md

  henryyan

  committed
  1dc5fb7

Commits on Aug 16, 2012

• 合并master分支的spring-mvc和web.xml

  henryyan

  committed
  c7c4a18

• Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into no-maven

  Show description for 22467d7
  henryyan

  committed
  22467d7

• 合并master分支的单元测试

  henryyan

  committed
  1e973a5

• 属性配置文件中用具体值代替属性名称

  henryyan

  committed
  df955a4

• merge from master, for version:1.2.0

  henryyan

  committed
  4b5d3cf

Commits on Aug 22, 2012

• merge from master 1.2.1,修复了几个bug

  henryyan

  committed
  17803d5

Commits on Aug 31, 2012

• 从master 1.3.0版本合并，添加了外部表单的演示

  henryyan

  committed
  2260014

• 从master 1.3.0版本合并，添加了外部表单的演示

  henryyan

  committed
  ad72fa8

Commits on Sep 17, 2012

• merge from master

  henryyan

  committed
  416674c

Commits on Sep 18, 2012

• merge from master

  henryyan

  committed
  51cef74

Commits on Sep 24, 2012

• merge from master

  henryyan

  committed
  4e25049

Commits on Nov 29, 2012

• merge from master，修复IE的几个bug，添加发文会签单元测试

  henryyan

  committed
  c9367a4

• 表单名称重构，portlet添加关于作者和表单概念模块

  henryyan

  committed
  a552d0a

Commits on Dec 1, 2012

• 升级:jquery -> 1.83，jquery ui -> 1.9.2, jquery.layout -> 1.3，html头部声明用html标准代替xhtml

  henryyan

  committed
  7f3059b

• jquery.layout.js添加?v=1.3解决缓存问题

  henryyan

  committed
  ec3f676

Commits on Dec 15, 2012

• 升级activiti至5.11，解决jsp中两个head问题，升级portlet插件至1.1.1

  henryyan

  committed
  a682d58

Commits on Dec 16, 2012

• 添加对流程定义状态的控制功能,添加流程实例状态控制功能,formkey查询任务时使用native query

  henryyan

  committed
  00ac786

Commits on Dec 31, 2012

• 删除orm.xml和persistence.xml，see detail: springside/springside4#84

  henryyan

  committed
  96cabf0

Commits on Jan 6, 2013

• 添加发文会签演示

  henryyan

  committed
  2ae8d70

Commits on Feb 7, 2013

• merge from 1.6.1

  henryyan

  committed
  2679da3

Commits on Feb 23, 2013

• 删除多余的jar，解决在tomcat7中不能运行的问题

  henryyan

  committed
  a01dfb8

Commits on Feb 25, 2013

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

  henryyan

  committed
  16c953b

Commits on Feb 28, 2013

• 修复外置表单任务列表读取失败问题

  henryyan

  committed
  68b78b3

Commits on Mar 2, 2013

• 添加servlet-api 2.5版本jar，同时清理普通表单的垃圾代码

  henryyan

  committed
  fb4e8fe

Commits on Mar 4, 2013

• 还原至1.6.0版本

  henryyan

  committed
  04201e1

Commits on Mar 10, 2013

• release 1.7.0 merged from master branch

  henryyan

  committed
  fc37640

• Update README.md

  henryyan

  committed
  9436fa3

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

  henryyan

  committed
  b3bc481

• Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into no-maven

  Show description for e0d8fb1
  henryyan

  committed
  e0d8fb1

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

  henryyan

  committed
  3a849b7

• Update README.md

  henryyan

  committed
  0c5afee

• 集成Activiti Modeler

  henryyan

  committed
  4589804

• 删除resources/activiti.cfg.xml

  henryyan

  committed
  13a0340

• 优化ModelController的异常处理

  henryyan

  committed
  71d31e4

• Update README.md

  henryyan

  committed
  4d0f077

• 简化整合modeler的依赖

  henryyan

  committed
  741f1f1

• 简化整合modeler的依赖

  henryyan

  committed
  f2023da

• Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into no-maven

  Show description for d5ece58
  henryyan

  committed
  d5ece58

Commits on Mar 14, 2013

• 添加测试配置文件

  henryyan

  committed
  2c00865

• 删除/WEB-INF/applicationContext.xml，多余！！！

  henryyan

  committed
  ca72048

Commits on Mar 18, 2013

• 禁用流程定义对象缓存

  henryyan

  committed
  8a4e7e8

Commits on Mar 29, 2013

• 删除drop table if exist table OA_LEAVE

  henryyan

  committed
  fde9054

Commits on Apr 5, 2013

• 从master分支合并，升级activiti至5.12.2

  henryyan

  committed
  6bc1757

Commits on Apr 9, 2013

• fixed：formkey使用native query报错

  henryyan

  committed
  5722d9f

• 忽略IDEA的文件

  henryyan

  committed
  393635c

Commits on Apr 10, 2013

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

  henryyan

  committed
  9fc97b2

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

  henryyan

  committed
  f829dc6

Commits on Apr 11, 2013

• 用重新打包的5.12.1

  henryyan

  committed
  a6ef007

Commits on Apr 13, 2013

• 更新5.12的sql

  henryyan

  committed
  b659265

Commits on Apr 17, 2013

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

  henryyan

  committed
  319fc41

Commits on May 14, 2013

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

  henryyan

  committed
  b80232d

Commits on Jun 19, 2013

• 修正动态表单和外置表单流程列表不能查看xml和图片问题, 解决首页待办任务跟踪提示样式错乱问题, 升级Activiti至5.13

  henryyan

  committed
  2862805

Commits on Jun 22, 2013

• 上一次提交5.12.1-kft版本未删除导致项目不能运行

  henryyan

  committed
  d8bceab

Commits on Jun 30, 2013

• 配置文件管理升级

  henryyan

  committed
  7683a81

Commits on Aug 16, 2013

• merge from master: 事瞎折腾型，把登录、欢迎页面做了优化（居中），升级了配置文件管理的Servlet，登陆改为登录，登录页面添加版本号信息

  henryyan

  committed
  4b85827

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
  a023a00

• 忽略resources/application.local.properties

  henryyan

  committed
  f2f1527

Commits on Dec 1, 2013

• dd35973 - (HEAD, origin/master, master) 添加综合流程演示（只支持动态表单） (3 minutes ago) <Henry Yan>

  Show description for 6f0ec6b
  henryyan

  committed
  6f0ec6b

Commits on Dec 19, 2013

• REST模块升级

  henryyan

  committed
  5635a15

Commits on Dec 23, 2013

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

  henryyan

  committed
  0da3d4d

Commits on Jan 5, 2014

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

  henryyan

  committed
  c382ed6

Commits on Jan 11, 2014

• 增强请假待办列表容错性

  henryyan

  committed
  8012a79

Commits on Jan 17, 2014

• Hibernate初始化时自动创建实体表

  henryyan

  committed
  2bae109

Commits on Feb 18, 2014

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

  henryyan

  committed
  d964792

Commits on Apr 17, 2014

• 合并1.10.0版本

  henryyan

  committed
  4fe4c47

• merge from master

  henryyan

  committed
  cfc020f

Commits on Apr 23, 2014

• merge from master 1.10.1

  henryyan

  committed
  471ce54

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

  henryyan

  committed
  b6900f8

Commits on Apr 24, 2014

• Update README.md

  henryyan

  committed
  65a878e

• Update README.md

  henryyan

  committed
  41e7039

• Update README.md

  henryyan

  committed
  b01ce4d

• Update README.md

  henryyan

  committed
  e902baf

Commits on May 8, 2014

• 修复动态表单任务列表中任务重复问题 v1.10.2

  henryyan

  committed
  f41a3f8

Commits on Jul 4, 2014

• 添加webservice以及mail演示

  henryyan

  committed
  b108e06

Commits on Jul 12, 2014

• 移除了jetty-server模块依赖

  henryyan

  committed
  4f9ae97

Commits on Aug 1, 2014

• 升级Activiti -> 5.16

  henryyan

  committed
  c35b3a2

Commits on Aug 4, 2014

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

  henryyan

  committed
  18d423b

Commits on Aug 6, 2014

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

  henryyan

  committed
  9340b4a