floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,149 Commits 7 Branches 16 Tags 707 MiB
Commit Graph

873 Commits

Author SHA1 Message Date
yystopf 3ce8723de2 fix 2021-10-19 14:49:35 +08:00
yystopf dbe47dbddf fix: change template message setting default value 2021-10-19 14:40:47 +08:00
yystopf bd9759a3ed fix: user template message setting init data 2021-10-19 14:40:47 +08:00
yystopf 7d98bd0bbe fix: template message settinng type order by order index 2021-10-19 14:40:47 +08:00
yystopf 88a7456300 add: template message control by setting 2021-10-19 14:40:47 +08:00
yystopf dbdd2e2dd3 add: user template message setting 2021-10-19 14:40:45 +08:00
yystopf d54dcb6b67 add: template message settings api 2021-10-19 14:40:21 +08:00
yystopf 8252cb7e71 add: template setting model 2021-10-19 14:40:20 +08:00
jasder 33a5b7f4f9 FIX 合并主干分支代码并解决代码冲突 2021-10-18 18:16:12 +08:00
yystopf 0885b7d75d fix 2021-10-18 13:51:32 +08:00
yystopf 1dcc38f617 fix: remove system_notification_history 2021-10-18 13:51:32 +08:00
yystopf 0d60e58304 fix: system notification edit error 2021-10-18 13:51:32 +08:00
yystopf 1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
yystopf 21af31f23c add: system notification history api 2021-10-18 13:49:58 +08:00
yystopf 490ce7a234 add: setting of system notification 2021-10-18 13:49:58 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
jasder 4ebb6a5e74 Merge branch 'develop' into dev_trustie_server 2021-10-15 16:09:48 +08:00
yystopf 2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
yystopf ffa0715374 fix 2021-10-14 18:34:37 +08:00
yystopf 79b394d291 fix: projecttrend show rule 2021-10-14 18:34:27 +08:00
jasder 3325ec842d Merge pull request 'FIX 代码库二级页面改版以及其他bug' (#172) from develop into dev_trustie_server 2021-10-09 16:15:12 +08:00
yystopf aabfaad458 add: release use database data 2021-09-30 11:09:13 +08:00
jasder a825271a36 FIX code bug 2021-09-28 15:59:36 +08:00
jasder 14949c0bfd ADD 通知系统模块代码 2021-09-28 15:59:06 +08:00
jasder 4f3dc2b627 Merge pull request '同步镜像项目增加重试机制，更新项目去掉一些验证，易修访问权限修复' (#160) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-28 15:27:11 +08:00
yystopf 3a22ece871 fix: orgainization left receiver email 2021-09-26 15:00:17 +08:00
yystopf 6b68ea998d add: email message sended by html 2021-09-24 15:37:55 +08:00
jasder 5b16138c5a Merge pull request '通知系统功能模块' (#153) from yystopf/forgeplus:hh_notice_system into develop 2021-09-22 14:43:04 +08:00
yystopf e5199425ee add: template email message 2021-09-22 14:25:56 +08:00
yystopf 0581c59a84 fix: message template simple type 2021-09-18 18:50:45 +08:00
yystopf d957e0544f add: message template management 2021-09-18 18:41:03 +08:00
yystopf a2ae8f1630 fix: profile completed 2021-09-18 10:24:16 +08:00
yystopf 74a4b499a9 fix 2021-09-18 10:16:37 +08:00
yystopf 9a7a5ca3a1 fix: message content add space 2021-09-17 14:48:00 +08:00
yystopf 18b0c76082 fix 2021-09-17 14:15:38 +08:00
yystopf 228becfe07 fix: some content for messages 2021-09-17 10:37:49 +08:00
yystopf 08de4819d7 fix: bold messsage some content 2021-09-17 09:44:17 +08:00
yystopf a1679cfc53 fix some template and add copy issue message 2021-09-16 17:29:07 +08:00
yystopf dbcbc01251 fix and add some message feature 2021-09-16 16:54:49 +08:00
yystopf b8a52107a5 add: expire issue send message 2021-09-16 10:10:05 +08:00
yystopf 88bc5f29ff add: message touch condition 2021-09-15 18:55:58 +08:00
yystopf 8a02981a2e fix: mirror broadcast error and retry 2021-09-15 11:28:38 +08:00
yystopf 65af40c29b add: join message content be necessary 2021-09-14 23:04:33 +08:00
yystopf ca4f416f0a add: message template content 2021-09-14 17:39:58 +08:00
yystopf 86d634d94f add: notice message skeletal code 2021-09-13 10:34:28 +08:00
jasder 00ed177089 Merge pull request 'FIX bug' (#148) from develop into dev_trustie_server 2021-09-10 18:32:08 +08:00
jasder e594c72c43 Merge pull request '一些bug修复' (#147) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-10 18:30:40 +08:00
jasder 26c0d36227 Merge pull request 'FIX 优化项目流程' (#146) from develop into dev_trustie_server 2021-09-10 18:28:36 +08:00
jasder 4c41d50506 ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
yystopf 02f8e453f1 fix: remove watcher when project change is_public 2021-09-10 11:26:01 +08:00
yystopf 84aed0391a fix: project list query 2021-09-07 17:19:38 +08:00
jasder 143e88593f Merge pull request 'FIX 路由优化' (#138) from develop into dev_trustie_server 2021-09-03 17:55:43 +08:00
jasder cb1d77ee6d Merge pull request '系统保留关键词模块' (#137) from yystopf/forgeplus:hh_reversed_keyword into develop 2021-09-03 17:52:48 +08:00
yystopf a422aa638d fix: update user profile completed rule 2021-09-02 11:48:53 +08:00
yystopf 4cb71179fd add: reversed keyword management 2021-08-31 14:22:49 +08:00
yystopf fe7dfcea52 add: reversed keyword and api forbidden 2021-08-31 10:18:00 +08:00
jasder 0f57844106 Merge pull request 'FIX some bug' (#128) from develop into dev_trustie_server 2021-08-27 15:12:27 +08:00
yystopf 43add36d29 add: team unit add type wiki 2021-08-24 18:30:58 +08:00
jasder 299e8534d1 Merge branch 'develop' into dev_trustie_server 2021-08-19 17:48:31 +08:00
yystopf e8496e77dc fix 2021-08-17 15:33:03 +08:00
yystopf 155f288c81 add: project unit add wiki 2021-08-17 15:33:03 +08:00
jasder 27e5febef2 Merge branch 'develop' into dev_trustie_server 2021-07-30 17:04:21 +08:00
yystopf 264a831a1c add: webhook tasks and test 2021-07-28 14:27:11 +08:00
yystopf 8b53aac8a6 add: repository update destroy webhook 2021-07-27 16:44:58 +08:00
yystopf ebc4305ca8 add: repository webhooks 2021-07-26 17:25:06 +08:00
jasder deebfc3292 fix merge develop branch 2021-07-23 14:16:29 +08:00
viletyy 998381585a add: user public keys controller 2021-07-14 15:38:14 +08:00
jasder b054094798 FIX conflicts 2021-07-12 16:20:14 +08:00
jasder 2d648e516e FIX merge develop branch 2021-07-12 16:19:03 +08:00
jasder 71e039efb8 FIX merge develop branch 2021-07-12 16:14:51 +08:00
viletyy ff21916f18 fix: merge from develop 2021-07-09 13:48:48 +08:00
viletyy d9162cb3bf fix: merge from develop 2021-07-09 13:47:21 +08:00
jasder 87049b74ef Merge branch 'develop' into sync_develop 2021-07-01 10:06:00 +08:00
vilet.yy 8331d849d5 fix: forked projects private set 2021-06-29 17:36:15 +08:00
vilet.yy 0e7f3a8905 fix: project permission and update user lastname 2021-06-29 10:36:58 +08:00
viletyy 259090b8e3 fix 2021-06-28 21:07:10 +08:00
jasder 7e474cab70 Merge branch 'feature/pull_conflict_files' into dev_trustie_server 2021-06-28 10:06:54 +08:00
jasder 01341d4389 FIX pull、 gitea pull model relation bug 2021-06-28 10:04:48 +08:00
jasder 3a475a4674 FIX get conflict files bug with create pr api 2021-06-28 09:59:47 +08:00
jasder 83b7b8cd9c Merge branch 'develop' into dev_trustie_server 2021-06-25 18:03:28 +08:00
jasder c298ff02b8 ADD pr冲突文件展示 2021-06-25 18:03:07 +08:00
jasder 62d1a2378c FIX [更改字段名称]conflicts file for pull api 2021-06-25 17:31:23 +08:00
jasder 8d300e11f9 FIX [bug]conflicts file for pull api 2021-06-24 16:18:34 +08:00
jasder b7dd12927b ADD conflicts file for pull api 2021-06-24 16:08:32 +08:00
vilet.yy 4126ea7b4e fix: some bug from security 2021-06-22 15:54:42 +08:00
vilet.yy 0af08bc967 fix: projects load by project language slowly 2021-06-21 17:05:51 +08:00
jasder 6f19093dc2 FIX merge develop flick 2021-06-18 17:23:48 +08:00
jasder e24269c2a7 Merge branch 'develop' into dev_trustie_server 2021-06-17 18:14:19 +08:00
jasder bf0bf0e23b 解决applied_projects相关表操作的问题 2021-06-17 17:05:32 +08:00
vilet.yy 2682d60717 fix: repeat table name 2021-06-17 16:37:48 +08:00
vilet.yy be63beb78b fix: update openning count navbar 2021-06-16 09:49:08 +08:00
vilet.yy 7fccd2aed2 fix: nickname search alone 2021-06-15 16:14:15 +08:00
vilet.yy 818317c292 fix: projects load by invite code slowly 2021-06-15 15:33:23 +08:00
jasder bf390c8366 Merge branch 'develop' into dev_trustie_server 2021-06-11 18:03:35 +08:00
vilet.yy bdec369ec2 back: change navbar count 2021-06-11 16:19:43 +08:00
vilet.yy 1376e004f2 fix 2021-06-11 14:54:24 +08:00
vilet.yy 672f37fe48 add: project detail show open task count 2021-06-11 14:11:44 +08:00
vilet.yy d077f18590 fix: update invite_code error 2021-06-11 09:30:22 +08:00
jasder fc60278f9a FIX * ENHANCEMENTS 
* ADD 用户活动统计图表功能
  * ADD 用户精选项目功能
  * ADD 用户贡献度统计图表功能
  * ADD 用户开发能力数据统计工
  * ADD 用户角色定位展示功能
  * ADD 用户专业定位标签展示功能
  * ADD 修改用户基本资料功能
  * ADD 更改密码功能
  * ADD 用户个人主页基本现在展示可配置功能

* BUGFIXES
  * Fix 解决一些bug
  * Fix 优化美化页面change license
 2021-06-09 17:52:57 +08:00
vilet.yy 5489ea9fbc add: applied join project 2021-06-09 16:53:09 +08:00
vilet.yy d4b8b3e24f add: invite code 2021-06-09 13:36:57 +08:00
jasder 632a06e575 Merge branch 'develop' into dev_trustie_server 2021-06-08 18:13:16 +08:00
vilet.yy 02fe8a8966 add: user and platform cache 2021-06-08 11:51:46 +08:00
vilet.yy a5b98bcad4 fix: concat nickname 2021-06-07 14:56:23 +08:00
jasder d75b79670d Merge branch 'develop' into dev_trustie_server 2021-06-04 18:51:47 +08:00
jasder 4754993e2a ADD 个人中心模块 
用户开发能力
用户近期活动统计
用户贡献度
用户动态
用户开发能力
用户角色定位
用户专业定位
用户精选模块
修改个人资料
修改账号密码
调整导入初始数据的顺序
mimemagic安装不上
 2021-06-04 18:51:09 +08:00
vilet.yy c211c38d87 fix 2021-06-04 18:41:19 +08:00
vilet.yy 12c252ea10 fix: merge from hh_develop 2021-06-04 18:36:33 +08:00
jasder 2c5fa8492f Merge branch 'develop' into dev_trustie_server 2021-06-03 17:26:35 +08:00
jasder fcf8033fbf FIX 解决镜像项目手动同步镜像不成功的问题 2021-06-03 17:04:22 +08:00
viletyy c58b074173 fix: init project 2021-06-03 11:27:13 +08:00
vilet.yy 7dc21ff388 add: update user more info 2021-06-03 11:27:13 +08:00
vilet.yy 86f0f2051d add: update user_info 2021-06-03 11:27:12 +08:00
vilet.yy 2410f5bbc0 add: user statistics 2021-06-03 11:27:12 +08:00
vilet.yy ea79772bd2 add: user pinned projects 2021-06-03 11:27:12 +08:00
vilet.yy 496867cac7 add: update user more info 2021-06-03 10:19:33 +08:00
vilet.yy 0b450c0c5f add: update user_info 2021-05-31 18:39:49 +08:00
vilet.yy 1df95eab4d add: user statistics 2021-05-28 15:36:05 +08:00
vilet.yy c2449d59af add: user pinned projects 2021-05-27 14:23:59 +08:00
jasder 6d845eeb3b Merge branch 'develop' into dev_trustie_server 2021-05-26 17:39:54 +08:00
jasder 77076c60a6 ADD issue、pull、milestone钩子,自动触发项目的更新时间 2021-05-26 17:37:13 +08:00
jasder 83e666a387 Merge branch 'develop' into dev_trustie_server 2021-05-24 17:06:54 +08:00
jasder e716dba249 FIX query project members api bug 2021-05-24 17:05:06 +08:00
jasder aeeaedbd7a Merge branch 'develop' into standalone 2021-05-24 10:11:02 +08:00
jasder 72b89d4b2b Merge branch 'develop' into dev_trustie_server 2021-05-21 19:26:47 +08:00
jasder 2f9d583fac FIX add nickname lastname query conditions for list users api 2021-05-17 16:57:46 +08:00
jasder 8a4b0ba966 Merge branch 'develop' into dev_trustie_server 2021-05-14 17:34:36 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
jasder 2cca2c756e ADD recommend organizations api 2021-05-13 14:52:07 +08:00
jasder 60b22b3912 Merge develop 2021-05-08 18:16:45 +08:00
jasder 7a752b177d Merge branch 'develop' into dev_trustie_server 2021-05-08 14:23:34 +08:00
jasder f470807225 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-05-08 14:23:05 +08:00
vilet.yy e490ddb1f5 add: sync mirror project remove pulls module 2021-05-07 17:27:37 +08:00
jasder b162b3357a FIX get mirror url bug 2021-05-07 14:06:40 +08:00
vilet.yy fc5876fc32 add: team valid 2021-05-06 18:22:30 +08:00
jasder 91a804caf7 Merge branch 'develop' into dev_trustie_server 2021-04-29 23:23:42 +08:00
jasder b22330d146 Merge branch 'sync_develop' into develop 2021-04-29 23:23:25 +08:00
jasder b2e338732d FIX 解决合并请求的权限问题 2021-04-29 23:23:16 +08:00
jasder dae5c9690f Merge branch 'develop' into dev_trustie_server 2021-04-29 23:19:17 +08:00
jasder d71272146f Merge branch 'sync_develop' into develop 2021-04-29 23:18:56 +08:00
jasder c56f0ca7fc FIX 解决合并请求的权限问题 2021-04-29 23:17:55 +08:00
jasder 246b6b52ec Merge branch 'develop' into dev_trustie_server 2021-04-29 19:27:36 +08:00
jasder f222cc6e4f FIX bug 
个人名下所有仓库加载接口调整
 2021-04-29 19:18:58 +08:00
jasder e0f9a3d43d Merge branch 'develop' into dev_trustie_server 2021-04-29 18:50:11 +08:00
jasder 0133ec24ca FIX pr merge bug 2021-04-29 18:48:54 +08:00
jasder c1ef39b262 Merge branch 'develop' into dev_trustie_server 2021-04-29 18:37:35 +08:00
jasder 03e54f9b3d Merge branch 'sync_develop' into develop 2021-04-29 18:37:09 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
jasder a078c07b59 Merge branch 'develop' into dev_trustie_server 2021-04-29 10:41:59 +08:00
vilet.yy c14c92ac11 fix: pull_request permit develop create pr 2021-04-29 10:32:49 +08:00
jasder 876591100e Merge branch 'develop' into dev_trustie_server 2021-04-28 21:17:36 +08:00
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
jasder ba9848ebe7 Merge branch 'develop' into dev_trustie_server 2021-04-27 18:24:41 +08:00
vilet.yy 1d81548eb6 fix 2021-04-26 11:32:59 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +08:00
jasder 016cf648da FIX merge develop 2021-04-23 17:07:46 +08:00
jasder 713e0bba18 Merge branch 'develop' into standalone 2021-04-23 16:18:31 +08:00
jasder 31738fc227 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:43:04 +08:00
jasder d07543111a FIX code bug 2021-04-22 16:42:50 +08:00
jasder 39193324e9 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:38:58 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 002c773746 FIX code bug 2021-04-20 19:06:31 +08:00
jasder 45f05c9fc4 FIX render commmiter and author avatar bug 2021-04-20 18:58:14 +08:00
jasder 0d7a11f3ab Merge branch 'develop' into dev_trustie_server 2021-04-19 18:41:18 +08:00
vilet.yy f75827bcf0 fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy f0c4d1226b fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy 3a47c61010 add: team nickname 2021-04-19 18:37:30 +08:00
jasder de6ae5b720 Upate models Schema Information 2021-04-19 18:36:02 +08:00
jasder 21befb6486 FIX auto generate avatar bug 2021-04-19 17:28:57 +08:00
jasder 002ae9f327 ADD auto generate user avatar 2021-04-19 15:06:56 +08:00
jasder 879e45e106 Merge branch 'develop' into trustie_server 2021-04-13 16:40:23 +08:00
vilet.yy 1fe9ea126a fix: permission with organization 2021-04-13 11:53:06 +08:00
jasder 3af75e1a1c FIX merge develop branch 2021-04-13 10:18:35 +08:00
jasder 2b0c987558 Merge branch 'develop' into trustie_server 2021-04-07 11:35:09 +08:00
vilet.yy cf224bc9fe add: project menulist resources 2021-04-07 11:29:44 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
vilet.yy a66e5b876d fix 2021-04-07 11:29:44 +08:00
vilet.yy b11fd350da fix: project permission 2021-04-07 11:29:44 +08:00
vilet.yy fba58800a7 fix 2021-04-02 18:08:36 +08:00
vilet.yy c4a43c4392 add: need edit user password 2021-04-02 16:44:36 +08:00
jasder be6bb690d2 FIX models schema 2021-03-31 11:21:36 +08:00
jasder 3869529620 Update setting api 2021-03-31 09:49:05 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
jasder 11350bb76f Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-01 10:02:35 +08:00
vilet.yy 70922b81db [FIX]watcher type error 2021-02-25 11:52:24 +08:00
jasder 50d81b2490 FIX schema 2021-02-09 11:49:47 +08:00
viletyy ec1acde99a [FIX]show teams, org name valid message 2021-02-06 15:49:56 +08:00
viletyy 54204d4db8 [ADD]org team search, project teams add\remove, org can create field 
[FIX]
 2021-02-06 15:49:55 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00
viletyy c6269f44ee [FIX]add user organization count 2021-02-06 15:49:54 +08:00
viletyy fef43caf4c [ADD]组织项目相关 2021-02-06 15:49:53 +08:00
viletyy 289d1877d6 [ADD]组织、组织团队 2021-02-06 15:49:53 +08:00
viletyy 0c58447afb [FIX]组织上传头像支持多种格式、项目详情返回拥有者类型 
[FIX]

[FIX]
 2021-02-06 15:49:52 +08:00
viletyy 3f73484596 [FIX]一些筛选以及创建最大项目数量验证 
[FIX]
 2021-02-06 15:49:49 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
viletyy 1dc43a23b7 [FIX]为组织创建项目做准备 2021-02-06 14:27:47 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy 2434ca9681 [ADD]组织模块相关代码 2021-02-06 14:27:47 +08:00
viletyy c00336e7b5 [ADD]统计平台概况 
[FIX]更改请求参数

[FIX]

[ADD]rank statistic

[FIX]
 2021-02-06 11:15:25 +08:00
Jasder be57c75166 ADD schema for pipeline model 2021-02-02 16:42:48 +08:00
victor b18fbd698f Merge branch 'develop' into trustie-pipeline 
# Conflicts:
#	app/models/ci/pipeline.rb
 2021-02-02 14:41:23 +08:00
victor 8d3838614f FIX pipeline model schma 
# Conflicts:
#	app/models/ci/pipeline.rb
 2021-02-02 14:32:02 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder dcda8671b3 FIX pipeline model schma 2021-01-20 17:00:19 +08:00
jasder 122667c67c Merge pull request '【devops】可视化创建流水线' (#13) from trustie-pipeline into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/13
 2021-01-20 16:01:21 +08:00
Jasder 1c59832abf FIX get assignees bug in issues 
(cherry picked from commit e9223c53de)
 2021-01-20 14:30:39 +08:00
Jasder d2e2793d29 FIX pull request bug 
(cherry picked from commit 2b140d6f7c)
 2021-01-20 14:29:52 +08:00
Jasder 8c8d9f64c4 ADD sync repo updated at time 
(cherry picked from commit 8c6df359a5)
 2021-01-20 14:28:56 +08:00
moshenglv 1001d10017 流水线字段校验 2021-01-19 14:00:22 +08:00
moshenglv 05416339e5 流水线查询返回字段修改 2021-01-19 11:10:47 +08:00
Jasder e9223c53de FIX get assignees bug in issues 2021-01-18 15:28:20 +08:00
moshenglv 2d99713cd0 流水线增加用户字段 2021-01-18 09:32:23 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
Jasder 2b140d6f7c FIX pull request bug 2021-01-12 15:45:18 +08:00
moshenglv bcb4e78829 修改模板查询相关接口 2021-01-12 13:54:11 +08:00
moshenglv 77529319a1 可视化创建流水线后端代码 2021-01-12 10:23:26 +08:00
Jasder 8c6df359a5 ADD sync repo updated at time 2021-01-08 18:07:48 +08:00
moshenglv cbe5b3afde 解绑时取消激活该用户的所有项目 2021-01-06 14:45:34 +08:00
Jasder e127d12390 Merge branch 'develop' 2020-12-30 13:47:26 +08:00
Jasder 56965910a5 ADD column to cloud table 2020-12-30 13:47:00 +08:00
jasder 584ed2e852 NICE 2020-12-30 09:37:02 +08:00
moshenglv a3724e80b9 增加trustie提供服务器流程。 
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
 2020-12-24 10:35:38 +08:00
Jasder 32a52a5c7a Update model schemas 2020-12-23 15:48:07 +08:00
Jasder 01f79c81cc FIX code review for create pull request 2020-12-23 15:47:08 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 17e182788f FIX bug 2020-11-24 17:55:12 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
Jasder 0ca699cc49 FIX find educoder project's bug 2020-11-11 10:14:41 +08:00
Jasder 70f7b59349 Update search projects api 2020-10-30 17:20:06 +08:00
Jasder 1bc935ffd5 FIX code review and user cache 2020-10-30 15:47:09 +08:00
Jasder 58f8d60646 FIX 版本库兼容euducoder平台数据 2020-10-22 18:00:31 +08:00
Jasder 9477555ebd FIX merge dev_devops branch 2020-10-21 11:56:30 +08:00
Jasder 99f67cf3a7 FIX merge 2020-10-21 11:54:22 +08:00
Jasder 495dc0d2e1 FIX query project 2020-10-21 11:53:52 +08:00
Jasder e3d9dae8fd Update projects sime api with statics 2020-10-21 11:45:55 +08:00
Jasder 2f7b6c9b75 FIX bug 2020-10-19 23:41:05 +08:00
Jasder a63d675a92 FIX 同步educoder平台实训项目放入job中执行 2020-10-19 23:39:44 +08:00
Jasder 7f685e4119 FIX 完善同步educoder平台实训 2020-10-19 23:08:17 +08:00
Jasder 2eef143251 ADD 同步educoder平台实训项目 2020-10-19 22:59:41 +08:00
Jasder edcb9f863c FIX ci certification bug 2020-10-16 09:47:36 +08:00
Jasder e430645304 FIX ci connection database bug 2020-10-16 09:42:08 +08:00
Jasder 28d6aa2dda ADD drone user oauth 2020-10-13 19:49:52 +08:00
Jasder b8cace558b Merge branch 'dev_trustie' into dev_devops 2020-10-04 17:33:21 +08:00
Jasder 0faa750450 ADD project detail api 2020-10-04 17:32:37 +08:00
Jasder 705ae1020b FIX merge dev_trustie branch 2020-10-04 12:05:53 +08:00
Jasder c6a7719d4d ADD recommand projects api 2020-10-04 12:01:26 +08:00
Jasder 2636923c9b FIX merge 2020-09-29 11:53:41 +08:00
Jasder 3621f4ff48 ADD gitea databse config 2020-09-27 15:30:44 +08:00
Jasder a308862567 FIX 优化ci流程，并配置gitea相关database 2020-09-27 11:30:37 +08:00
Jasder db6e3b0f38 FIX fork users list api bug 2020-09-25 10:41:32 +08:00
Jasder 135bdfd69f FIX code bug 2020-09-23 11:12:15 +08:00
Jasder 76b9031fc8 FIX bug 2020-09-23 11:06:54 +08:00
Jasder a97bbb6ddb Update ci db schema 2020-09-23 09:17:30 +08:00
Jasder 467f278de5 ADD ci datbase config 2020-09-18 16:40:54 +08:00
Jasder b74d43083e FIX 解决ci 数据库安全性问题 2020-09-18 15:26:14 +08:00
Jasder fae4907fd1 FIX set ci repo default value 2020-09-11 16:34:19 +08:00
Jasder f9ec41f9bc FIX ci repo asstassion 2020-09-11 10:41:27 +08:00
Jasder 2e0d76575c FIX repo instance method's bug 2020-09-11 10:13:54 +08:00
Jasder ad43c6975b ADD 解决ci端用户授权后，项目同步失败的问题 2020-09-10 18:00:37 +08:00
Jasder 217dfc03b2 ADD ci namespace modle associations 2020-09-10 10:53:12 +08:00
Jasder be6ff6a043 FIX update query ci user and ci repo method 2020-09-09 09:57:44 +08:00
Jasder 0edac45e82 FIX 解决自动触发构建失败的问题 2020-09-09 09:17:11 +08:00
Jasder e77475e26a ADD ci cloud account authenticate url 2020-09-04 17:35:29 +08:00
Jasder e0dac72114 FIX ci repos dependent destroy bug 2020-09-04 16:45:38 +08:00
Jasder 32ec60bbe3 FIX 完善ci服务的解绑流程 2020-09-04 10:17:44 +08:00
Jasder 562d0b7b07 ADD 个人中心添加devops管理功能 2020-09-03 15:52:54 +08:00
Jasder 003db1405d Merge branch 'dev_trustie' into dev_devops 2020-08-29 12:07:37 +08:00
Jasder ef4578286f FIX 解决forked项目删除后，fork user没有关联删除的bug 2020-08-29 12:07:06 +08:00
Jasder 903103ec5d FIX ci active repo bug 2020-08-28 11:40:29 +08:00
Jasder b75896821f FIX 优化ci初始化流程 2020-08-28 10:25:08 +08:00
Jasder 2866c060c7 FIx code review 2020-08-26 16:24:51 +08:00
Jasder 5375c3ec71 ADD build status with killed 2020-08-25 17:01:03 +08:00
Jasder 1617a541fe FIX code review 2020-08-25 15:59:53 +08:00
Jasder 1ea9e420be ADD paginate for builds api 2020-08-25 15:43:30 +08:00
Jasder ae9d857d7f FIX ci server 2020-08-21 14:53:48 +08:00
Jasder e7a0bc7e0f FIX code bug 2020-08-21 10:46:37 +08:00
Jasder 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00
Jasder a4d8338cb5 ADD ci database port 2020-08-17 14:29:09 +08:00
Jasder 7bb43700b4 ADD namespace ci for model 2020-08-17 11:22:53 +08:00
Jasder 7b8bb996a6 Merge branch 'dev_trustie' into dev_devops 2020-08-17 11:14:35 +08:00
Jasder c40777be2b FIX debug token 2020-08-16 00:54:22 +08:00
Jasder 652654e606 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:57:10 +08:00
Jasder 675c380967 FIX 2020-08-14 21:56:16 +08:00
Jasder 63148c339c Merge branch 'dev_change_route' into dev_devops 2020-08-14 18:21:04 +08:00
Jasder c1b0061b8d ADD educode user login 2020-08-14 18:19:00 +08:00
Jasder cf43a64ada FIX rewrite devops with ci 2020-08-13 23:38:32 +08:00
Jasder 8e7c25b5ed FIX code bug 2020-08-13 21:11:33 +08:00
Jasder 78b091ddd3 FIX merge bug 2020-08-13 09:44:38 +08:00
sylor_huang@126.com d80600a58c Change 2020-08-12 10:58:16 +08:00
sylor_huang@126.com 54b1af8d06 Change 2020-08-12 10:55:13 +08:00
Jasder 6bd8095258 FIX 升级完善项目相关路由 2020-08-11 23:20:04 +08:00
Jasder 69ea60dfd5 FIX update devops process 2020-08-06 14:26:19 +08:00
sylor_huang@126.com 46e8920f25 Merge branch 'dev_trustie' into dev_devops 2020-07-17 15:31:34 +08:00
sylor_huang@126.com 7b219d385c 修改同步项目及添加没有gitea账户的用户 2020-07-17 15:30:17 +08:00
sylor_huang@126.com f4a54dbb38 Merge branch 'dev_trustie' into dev_devops 2020-07-16 11:02:10 +08:00
sylor_huang@126.com 88875ed473 change 2020-07-16 11:01:59 +08:00
Jasder 006ff7fd62 ADD devops builds's api 2020-07-15 20:34:01 +08:00
Jasder b9abd6a152 FIX 插销掉dev_chain分支的合并 2020-07-15 17:13:16 +08:00
Jasder 43b413706c Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 17:03:03 +08:00
Jasder c181abce81 FIX 完善devops流程 2020-07-15 16:53:38 +08:00
sylor_huang@126.com 09835dda24 change bugs 2020-07-15 16:25:31 +08:00
Jasder da0e45a3c6 ADD devops 2020-07-15 09:43:30 +08:00
Jasder 2b6fe8f9a8 FIX merge 2020-07-14 15:15:50 +08:00
Jasder fbb7fa34e3 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-14 15:11:40 +08:00
Jasder 6527603e24 FIX 完善devops流程 2020-07-14 15:06:09 +08:00
sylor_huang@126.com 5f4dc22625 change branches 2020-07-14 14:15:16 +08:00
sylor_huang@126.com 2e8095af58 change bugs 2020-07-13 20:20:30 +08:00
Jasder e74bba9092 ADD test devops 2020-07-10 14:08:16 +08:00
sylor_huang@126.com b340de89c7 qianyi datas 2020-07-09 16:46:57 +08:00
Jasder dbafd32d0b Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-07 16:08:18 +08:00
Jasder df6bddfb8d FIX actioncable job 2020-07-07 16:08:10 +08:00
sylor_huang@126.com 1bb8060b37 change projects lists 2020-07-07 13:54:57 +08:00
sylor_huang@126.com 8f6b455a95 change pr codes 2020-07-03 17:00:55 +08:00
sylor_huang@126.com 281889ebae change counts 2020-07-03 15:14:25 +08:00
sylor_huang@126.com 999006fba7 change pr 2020-06-30 09:44:28 +08:00
sylor_huang@126.com 81d46405a4 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-29 17:07:01 +08:00
sylor_huang@126.com 4212d46b3f change pull-request 2020-06-29 17:06:46 +08:00
Jasder e671071420 FIX code review 2020-06-29 16:05:57 +08:00
Jasder 1133517127 ADD simple project api 2020-06-29 16:05:22 +08:00
Jasder 5f283b3cdf FIX Mirror validate bug 2020-06-23 15:08:55 +08:00
sylor_huang@126.com 4c7fa23404 修改bug 2020-06-18 15:46:00 +08:00
sylor_huang@126.com 26bc53ad26 修改工单和里程碑暂不需要的字段 2020-06-08 11:38:03 +08:00
sylor_huang@126.com fbf2738bd1 修改watcher 2020-06-05 18:36:33 +08:00
sylor_huang@126.com 88d2f1d07f Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-05 18:26:31 +08:00
sylor_huang@126.com f25fd82428 修改关注用户 2020-06-05 18:26:18 +08:00
Jasder 7c479f13fb FIX coder review for repository api 2020-06-05 18:01:58 +08:00
sylor_huang@126.com 6b44b28c60 修改数量 2020-06-03 18:31:26 +08:00
sylor_huang@126.com fe8ad87c51 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-03 18:24:08 +08:00
sylor_huang@126.com c977b9350c 修改个人主页 2020-06-03 18:23:53 +08:00
Jasder cec2995438 ADD mirror_status column for repository's show view 2020-06-03 17:26:49 +08:00
Jasder 783f872a86 FIX update_column bug 2020-06-03 15:59:53 +08:00
sylor_huang@126.com fa17a2eb7f change commits committer 2020-06-02 16:06:51 +08:00
sylor_huang@126.com f54c374c78 修改commit返回的用户 2020-06-02 15:57:06 +08:00
sylor_huang@126.com 569c5309ce 修改is_mirror 2020-06-02 14:13:40 +08:00
sylor_huang@126.com 259142c59b 修改issues的问题 2020-05-25 16:20:34 +08:00
sylor_huang@126.com 0a5752b5ed 修改bug 2020-05-25 14:41:16 +08:00
sylor_huang@126.com efad719de0 change bug 2020-05-25 13:46:08 +08:00
sylor_huang@126.com a50470b14b 修改bug 2020-05-25 12:01:21 +08:00
sylor_huang@126.com bc5f695094 修改后端bug 2020-05-25 11:19:59 +08:00
sylor_huang@126.com 9b302875ed 修改project 的managers 2020-05-22 15:41:30 +08:00
Jasder 19bb95b1a4 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-22 12:10:37 +08:00
Jasder e14e6230c7 FIX sync update closed issues count 2020-05-21 18:37:32 +08:00
sylor_huang@126.com f197f41839 add version_releases attachments 2020-05-20 14:43:14 +08:00
Jasder b02efc3609 FIX bug 2020-05-19 14:41:45 +08:00
Jasder f309ec997d Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-18 18:28:39 +08:00
Jasder 0e390ca912 ADD sync mirror repo api 2020-05-18 18:25:50 +08:00
Jasder d464ab3891 FIX 根据gitea接口更新创建镜像项目api 2020-05-18 18:25:01 +08:00
Jasder e8ac921aa9 FIX 重新定义项目权限控制的相关方法 2020-05-18 18:22:50 +08:00
sylor_huang@126.com 46c929a394 关注列表/点赞列表/fork列表的后端 2020-05-15 17:05:53 +08:00
sylor_huang@126.com ac2e3ae730 admins 页面的修改 2020-05-14 18:08:27 +08:00
sylor_huang@126.com 96e03ac249 修改已发行版本的数量问题 2020-05-13 17:15:22 +08:00
sylor_huang@126.com 3e6ee91f9a 部分修改 2020-05-13 17:10:29 +08:00
sylor_huang@126.com 8aed492dae 项目的列表页修改数量参数 2020-05-13 17:07:41 +08:00
Jasder 1e0811006b FIX query projects list 2020-05-09 15:51:40 +08:00
sylor_huang@126.com fe32adee16 issues添加includes 2020-05-08 14:48:53 +08:00
sylor_huang@126.com c35156e487 工单修改后，创建的为工单用户的bug 2020-04-28 10:41:20 +08:00
sylor_huang@126.com 21b279d551 删除attachment关联的attachment_histories 2020-04-24 15:52:32 +08:00
Jasder a510fb94d4 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-04-24 10:15:08 +08:00
Jasder 260e6f8932 FIX 更改云上实验室主站配置 2020-04-24 10:15:02 +08:00
sylor_huang@126.com 98a055db69 修改附件及搜索协作者的bug 2020-04-24 09:45:42 +08:00
sylor_huang@126.com 279521289e 增加weap_setting 2020-04-23 11:13:24 +08:00
sylor_huang@126.com 620c8754d4 精简model/controllers/views 2020-04-23 11:08:29 +08:00
Jasder 4a182829a0 FIX 去掉user中无关的model关联关系 2020-04-22 21:32:42 +08:00
Jasder 1c1586e5dd FIX 去掉user中无关的model关联关系 2020-04-22 21:26:14 +08:00
sylor_huang@126.com 724c894e32 修改搜索 2020-04-22 13:37:15 +08:00
sylor_huang@126.com 0b1a7af108 修改like方法 2020-04-22 12:01:45 +08:00
sylor_huang@126.com 7142e88256 修改bug 2020-04-22 11:58:36 +08:00
sylor_huang@126.com a655b73946 修改bug 2020-04-22 11:56:58 +08:00
sylor_huang@126.com 3f81d2ab5d 修改like方法 2020-04-22 11:54:32 +08:00
sylor_huang@126.com 69e3e372c5 项目搜索添加logger 2020-04-22 09:51:11 +08:00
sylor_huang@126.com 441f8eb877 修改首页搜索后的显示数量不对的问题 2020-04-22 09:32:39 +08:00
sylor_huang@126.com 2b24bc9724 修改搜索显示数量不对的问题 2020-04-22 09:19:43 +08:00
sylor_huang@126.com 611aafdb4f 修复搜索报错的问题 2020-04-22 09:09:34 +08:00
sylor_huang@126.com f07a10ad99 修改不显示匿名用户的项目 2020-04-21 19:03:06 +08:00
Jasder 0c993efaf3 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-04-21 16:31:58 +08:00
Jasder c9e1ef0f64 FIX 去掉项目成员’游客‘身份的用户信息 2020-04-21 16:31:48 +08:00
sylor_huang@126.com 036718356d 修改用户id的数量 2020-04-21 15:03:48 +08:00
sylor_huang@126.com 4787ba3c4e 修改项目主页的内容 2020-04-21 14:48:52 +08:00
sylor_huang@126.com b64d910525 修改homepage_info 及用户项目的分类 2020-04-21 10:45:29 +08:00
sylor_huang@126.com 5410e11a51 修改用户的schools表关联 2020-04-21 10:24:27 +08:00
sylor_huang@126.com fdcdc3baf6 修改我的项目的后端参数 2020-04-21 10:11:54 +08:00
sylor_huang@126.com 599060e538 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-04-16 09:45:18 +08:00
sylor_huang@126.com 66f4d01790 修改user.rb的anonymous_user 2020-04-16 09:45:05 +08:00
Jasder d27af59a76 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-04-16 09:43:02 +08:00
Jasder f1aea1fc7d FIX admin 2020-04-16 09:42:56 +08:00
sylor_huang@126.com f57af4bcd8 setting的api测试 2020-04-16 09:42:08 +08:00
sylor_huang@126.com 740477dcd2 修改remote_update 2020-04-15 11:47:00 +08:00
sylor_huang@126.com 2578cdec71 修改同步trustie的注册/登录/修改 2020-04-14 17:54:33 +08:00
sylor_huang@126.com a6b7fa02b7 修改了描述 2020-04-06 14:32:21 +08:00
sylor_huang@126.com bdb4a0c084 修改工单权限 2020-04-06 14:03:03 +08:00
sylor_huang@126.com ae8e8f65a5 修改项目成员的问题 2020-04-03 18:01:56 +08:00
sylor_huang@126.com db437eb191 修改项目成员可以项目的问题 2020-04-03 17:55:13 +08:00
sylor_huang@126.com ce9677ad94 修改bug 2020-04-02 11:02:08 +08:00
sylor_huang@126.com cc242a2765 迁移数据的修改 2020-04-01 11:07:01 +08:00
sylor_huang@126.com 6afbdfdc63 修改版本库的数量改变bug 2020-03-30 11:08:48 +08:00
sylor_huang@126.com c78508dfd6 修改bug 2020-03-27 16:49:08 +08:00
sylor_huang@126.com 8db1b88fac 修改issues的接口方法异常 2020-03-26 16:38:01 +08:00
sylor_huang@126.com cfbc8676ca 修改bug 2020-03-26 14:47:24 +08:00
sylor_huang@126.com b30510bf3d 修改分类数量显示bug 2020-03-26 10:19:04 +08:00
Jasder e462ae24a2 FIX 项目成员列表api去除项目拥有者信息 2020-03-25 22:32:49 +08:00
Jasder 5a92c5bfdc FIX enum bug 2020-03-25 12:05:29 +08:00
sylor_huang@126.com a72675cf1a 评论不显示的错误 2020-03-20 18:30:35 +08:00
Jasder 5a7544e94b FIX login fail bug 2020-03-20 13:21:17 +08:00
Jasder 7f26393fc1 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-03-20 13:10:30 +08:00
Jasder b15f4e904b FIX query projects bug 2020-03-20 13:10:25 +08:00
sylor_huang@126.com 16b240051f 修改匿名用户 2020-03-20 12:01:01 +08:00
sylor_huang@126.com 451d8c0a3f test_user 2020-03-20 11:34:49 +08:00
Jasder 65c51304c1 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-03-19 17:18:25 +08:00
Jasder 70de2ae571 FIX . 2020-03-19 17:18:17 +08:00
Jasder fe9ac94222 FIX search projects relation repository 2020-03-19 17:15:56 +08:00
sylor_huang@126.com fe4aefa3b6 修改 2020-03-18 15:37:05 +08:00
sylor_huang@126.com cf27fe8839 修改工单的评论修改内容后显示记录的问题 2020-03-18 15:32:54 +08:00
sylor_huang@126.com b9bd07541e 修改迁移的问题 2020-03-13 16:53:03 +08:00
sylor_huang@126.com 98c5372d61 sync_forge_job的修改 2020-03-13 14:17:12 +08:00
sylor_huang@126.com 95ddc0af1c 用户的迁移 2020-03-11 20:01:44 +08:00
sylor_huang@126.com 47eafd9f3c 这个版本适用educoder，不适用trustie 2020-03-11 18:07:31 +08:00
Jasder a9cdf966f8 FIX 删除与课程相关的无用代码文件 2020-03-09 15:06:15 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00