Commit Graph

254 Commits

Author SHA1 Message Date
keyeqing 3df52e03b8 Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-11-06 21:06:50 +08:00
keyeqing e25ec07959 add icons 2013-11-06 21:06:11 +08:00
dawncx b33d6adb77 change main.js 2013-11-06 21:03:16 +08:00
dawncx fbe9026d8b Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-11-06 20:45:59 +08:00
dawncx e5b84b894c merge 2013-11-06 20:45:45 +08:00
keyeqing c1c36d0eb7 Merge branch 'master' of https://github.com/justinliucs/haflow.git
Conflicts:
	src/main/webapp/script/haflow.main.js
2013-11-06 17:48:07 +08:00
keyeqing 361602115d conflict 2013-11-06 17:37:36 +08:00
dawncx 4594020e80 change logon.css delete font lib 2013-11-06 17:35:13 +08:00
dawncx 4c57554031 change haflow.main.js 2013-11-06 17:28:36 +08:00
dawncx d1f3ed625e add pngs 2013-11-06 17:04:35 +08:00
dawncx e557c93387 bug fix 2013-11-06 17:01:54 +08:00
dawncx a9afe150c4 Merge branch 'master' of https://github.com/justinliucs/haflow.git
Conflicts:
	src/main/java/haflow/module/util/ModuleUtil.java
2013-11-06 16:55:22 +08:00
dawncx a4c73c3508 update logon pages, update admin pages adding detail information for
module.
2013-11-06 16:29:17 +08:00
dawncx e1457e632f conflict 2013-11-06 16:26:11 +08:00
zhaowei8188127 5b93bc82e3 hive module bug fix. 2013-11-05 21:57:30 +08:00
zhaowei8188127 fbba87b470 Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-11-05 21:57:06 +08:00
zhaowei8188127 6fc3d9e868 main.js 2013-11-05 21:56:57 +08:00
keyeqing 77a4324a6f add refresh button to hdfs. fix bugs on hive and oozie page. 2013-11-05 21:53:43 +08:00
keyeqing 9e37d8a05e Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-11-05 21:52:13 +08:00
keyeqing e5831fb6c7 main.js 2013-11-05 21:52:02 +08:00
zhaowei8188127 2b03a896a0 add run history tab to the bottom. 2013-11-05 14:04:39 +08:00
keyeqing cdd85cf1fa hdfs path 2013-10-28 11:23:33 +08:00
keyeqing 9312ac6b14 Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-10-28 09:40:39 +08:00
keyeqing 5f0beae4d5 g 2013-10-28 09:40:25 +08:00
keyeqing 671bfbdfeb g 2013-10-28 09:35:54 +08:00
dawncx 89b3554e50 delete Chinese comments in main.js 2013-10-24 11:05:33 +08:00
dawncx 7f805036f0 change prompt message to English version 2013-10-24 10:58:47 +08:00
dawncx 28198d8079 Commit userListModel 2013-10-24 10:30:58 +08:00
dawncx 4ae070f370 admin user management- add edit user information and delete user 2013-10-24 10:17:30 +08:00
dawncx 1c35d25868 modified background management 2013-10-18 09:41:32 +08:00
dawncx c9997b1515 change main css 2013-10-09 19:42:57 +08:00
keyeqing 6d6ab2babf bug fix on main.js after merge. 2013-10-09 16:48:15 +08:00
keyeqing 74804f1da3 bug fix after merge. 2013-10-09 15:57:52 +08:00
keyeqing c3ffff9891 Merge branch 'master' of https://github.com/justinliucs/haflow.git
Conflicts:
	src/main/java/haflow/dto/entity/Flow.java
	src/main/java/haflow/service/FlowService.java
	src/main/java/haflow/ui/controller/FlowController.java
	src/main/java/haflow/ui/controller/HomeController.java
	src/main/java/haflow/ui/helper/FlowHelper.java
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/WEB-INF/views/logon.jsp
	src/main/webapp/WEB-INF/views/main.jsp
	src/main/webapp/style/haflow.main.css
2013-10-09 15:08:29 +08:00
dawncx 2ff1551e02 chenxi 2013-10-09 11:23:33 +08:00
dawncx 3bf8def93c chenxi 2013-10-09 11:22:19 +08:00
dawncx 4bece66fe4 chenxi 2013-10-09 11:19:30 +08:00
keyeqing 480c680aa1 Merge branch 'master' of https://github.com/justinliucs/haflow
Conflicts:
	src/main/webapp/script/haflow.main.js
2013-10-08 17:28:09 +08:00
keyeqing 5750c12fdd management of hdfs files 2013-10-08 16:45:00 +08:00
zhaowei8188127 fbc1552636 增加工作流正确性验证:输入输出不能为空,每个节点的required参数不能为空,必须有起始节点,不能有环。 2013-09-11 10:35:13 +08:00
zhaowei8188127 9f3befbd08 Add component : show flow run history. 2013-09-10 21:28:55 +08:00
keyeqing 5790b6fa38 oozie 2013-09-06 11:10:59 +08:00
zhaowei8188127 86c1f43042 update readme.txt, adding "how to upload modules". 2013-09-06 10:15:06 +08:00
zhaowei8188127 668914b9cb add log4j. change module upload dir from /classes to /lib. 2013-09-06 10:01:56 +08:00
keyeqing 08c7320763 checkbox edtion 2 2013-09-05 18:58:24 +08:00
keyeqing 25eaea4d13 checkbox and oozie 2013-09-05 09:56:23 +08:00
keyeqing 63ec9c81cd 8.30 2013-08-30 22:15:33 +08:00
keyeqing d8358bd17a Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-08-30 22:10:14 +08:00
zhaowei8188127 8afc1e34d7 pull jsPlumb lib to local. 2013-08-30 22:03:23 +08:00
zhaowei8188127 85ee0a2c60 Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-08-30 21:58:52 +08:00