Merge remote-tracking branch 'remotes/origin/develop' into jeesite_plus

Conflicts: src/main/java/com/thinkgem/jeesite/common/web/BaseController.java src/main/java/com/thinkgem/jeesite/modules/cms/entity/Article.java src/main/java/com/thinkgem/jeesite/modules/cms/utils/CmsUtils.java src/main/webapp/WEB-INF/views/modules/sys/selectUserToRole.jsp
fuqunqin · Dec 12, 2013 · 9117b66 · 9117b66
2 parents 6cb5a47 + 211b175
commit 9117b66
Show file tree

Hide file tree

Showing 180 changed files with 1,910 additions and 2,949 deletions.
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.510.to.511.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.510.to.511.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.511.to.512.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.511.to.512.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.512.to.513.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.512.to.513.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.engine.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.identity.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.53.to.54.identity.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.54.to.55.engine.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.54.to.55.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.54.to.55.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.54.to.55.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.56.to.57.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.56.to.57.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.58.to.59.engine.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.58.to.59.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.59.to.510.history.sql b/bin/refresh-db/act/upgrade/activiti.db2.upgradestep.59.to.510.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.50.to.51.engine.sql b/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.50.to.51.engine.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.50.to.51.history.sql b/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.50.to.51.history.sql
diff --git a/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql b/bin/refresh-db/act/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql