Harrison
|
62344215b0
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
|
6 years ago |
Harrison
|
a9c325df95
|
无 jira 任务, 恢复分支信息
|
6 years ago |
Harrison
|
aedf4a8891
|
Merge pull request #214 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '7b4ac3728a20d60304e0b07aa084d84b45dc4b12':
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败,job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
.
.
无JIRA任务,build failed
ct
上传math3资源文件
更改math3的gradle
上传commons-math3
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
SocketIOServer.java edited online with Bitbucket
KERNEL-478 升级socketio
无任务,构建失败
无任务,构建失败
无任务,构建失败
资源文件
增加j2v8
引入J2V8
资源文件
|
6 years ago |
Harrison
|
7b4ac3728a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
# Conflicts:
# fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java
|
6 years ago |
ju
|
adf3bac73b
|
Merge pull request #209 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit 'ce64b0abf2547fd370141d68a1f7552d0b6af8a7':
DEC-7569 定时调度模块启动异常
|
6 years ago |
Lanlan
|
ce64b0abf2
|
DEC-7569 定时调度模块启动异常
|
6 years ago |
ju
|
7120a20fb4
|
Merge pull request #207 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '17e93b6201c887407a8dcb897527006798fa704f':
无JIRA任务 打包失败,job未初始化
|
6 years ago |
Lanlan
|
17e93b6201
|
无JIRA任务 打包失败,job未初始化
|
6 years ago |
neil
|
4e366f8a97
|
Merge pull request #204 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '888fd8ee0b7fbe4d23de17f8ae890e5554ed01a0':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
neil
|
2788e4d282
|
Merge pull request #203 in CORE/base-third from ~LANLAN/base-third:feature/10.0 to feature/10.0
* commit 'f03371b0d254b2b467e9d263b348527cf8b88bc3':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
Lanlan
|
f03371b0d2
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
Lanlan
|
888fd8ee0b
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
neil
|
4de2e10c18
|
Merge pull request #200 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit '1232e835836de87ad63308cd8cb20749001e831a':
.
.
无JIRA任务,build failed
|
6 years ago |
neil
|
1232e83583
|
.
|
6 years ago |
neil
|
e0240c694c
|
.
|
6 years ago |
neil
|
2ca92358a7
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/base-third into release/10.0
|
6 years ago |
neil
|
d5e8b0d37f
|
无JIRA任务,build failed
|
6 years ago |
neil
|
0c78d7ac3f
|
Merge pull request #199 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit 'de9e71b6ba2e9b08d3c97be7bb4607444afe87fe': (22 commits)
ct
rt
无JIRA任务 加个参数
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
资源文件
增加J2V8
删除测试代码
joda-time
...
|
6 years ago |
neil
|
de9e71b6ba
|
Merge pull request #7 in ~NEIL/base-third from feature/10.0 to release/10.0
* commit 'f514a1d653993441e26c3a82d26bdd718f4b6e79': (22 commits)
ct
rt
无JIRA任务 加个参数
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
资源文件
增加J2V8
删除测试代码
joda-time
...
|
6 years ago |
neil
|
f514a1d653
|
ct
|
6 years ago |
neil
|
55498c4530
|
Merging in latest from upstream (CORE/base-third:refs/heads/feature/10.0)
* commit 'a6359e2e14a9cfb801c1342855584b1e1e2ba15b':
rt
无JIRA任务 加个参数
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |
richie
|
a3ae3092f5
|
Merge pull request #190 in CORE/base-third from ~JONAS/base-third:release/10.0 to release/10.0
* commit 'dce636e145609b8bac1a533cefbab6ab5c681dbd':
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |
JonasBollack
|
dce636e145
|
上传math3资源文件
|
6 years ago |
JonasBollack
|
f4c2a40301
|
更改math3的gradle
|
6 years ago |
JonasBollack
|
d3f2022c34
|
上传commons-math3
|
6 years ago |
xiaoxia
|
a6359e2e14
|
Merge pull request #189 in CORE/base-third from ~XIAOXIA/base-third:feature/10.0 to feature/10.0
* commit 'deecbc85de0fc26a988c639764ad04e0d883c3ba':
rt
无JIRA任务 加个参数
|
6 years ago |
XiaXiang
|
deecbc85de
|
rt
|
6 years ago |
XiaXiang
|
d3913b10fa
|
无JIRA任务 加个参数
|
6 years ago |
xiaoxia
|
5857fcc09c
|
Merge pull request #188 in CORE/base-third from ~XIAOXIA/base-third:feature/10.0 to feature/10.0
* commit 'df37bc61511aaa9a086e2402db6afa05765a61e8':
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
XiaXiang
|
df37bc6151
|
lib
|
6 years ago |
XiaXiang
|
953f474189
|
REPORT-14835
模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
XiaXiang
|
6ed2f1ff53
|
REPORT-14835
模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
ju
|
f2a3aae412
|
Merge pull request #187 in CORE/base-third from ~JINBOKAI/base-third:feature/10.0 to feature/10.0
* commit '0d95293756d79a5adbb21c318fcf89e3551f2a59':
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
0d95293756
|
REPORT-14820 log4j&log4j-extras resources直接拷贝
|
6 years ago |
jinbokai
|
fa8c9cc970
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
1c03a0f3dc
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
5dd4c5d9f8
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
zed
|
a86c1b0239
|
Merge pull request #186 in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '362aa2e8e7d29c9a6549d86458bca09a0619e768':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
zed
|
659e11f432
|
Merge pull request #185 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0
* commit '75e495523389d8dca1430ea06de858649f5db3c7':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
zed
|
362aa2e8e7
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
zed
|
75e4955233
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
richie
|
1b676661ce
|
SocketIOServer.java edited online with Bitbucket
|
6 years ago |
richie
|
2d87ecf037
|
SocketIOServer.java edited online with Bitbucket
|
6 years ago |
richie
|
edb69b0208
|
KERNEL-478 升级socketio
|
6 years ago |
richie
|
43ff8a8d20
|
更新socketio的版本
|
6 years ago |
richie
|
e26c9b2805
|
Merge pull request #182 in CORE/base-third from ~JONAS/base-third:feature/10.0 to feature/10.0
* commit '7c8b7e562f74361336ff81e6a85aacc1fa34c21e':
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |
JonasBollack
|
7c8b7e562f
|
上传math3资源文件
|
6 years ago |
JonasBollack
|
bcec716e3d
|
更改math3的gradle
|
6 years ago |
JonasBollack
|
8fba7e1861
|
上传commons-math3
|
6 years ago |
ju
|
f47a53fe33
|
Merge pull request #181 in CORE/base-third from ~YAOH.WU/base-third:release/10.0 to release/10.0
* commit '8d89f8aaeac260b4587ab52181536fcfaabd6203':
无任务,构建失败
|
6 years ago |