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

370 Commits

Author SHA1 Message Date
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
yystopf b25db9d37f fix: merge from develop 2022-03-31 13:00:36 +08:00
yystopf 747646cd9d add: trace client and api completed 2022-03-30 16:19:32 +08:00
yystopf 1c660213a7 fix: claims is losed 2022-03-10 09:36:51 +08:00
xiaoxiaoqiong 664b806c0a routes合并 2022-03-03 15:06:56 +08:00
yystopf 3091593d14 add: standalone admin menu 2022-03-02 10:48:21 +08:00
xiaoxiaoqiong 28d07d5c54 fixed 合并冲突 2022-02-22 17:49:14 +08:00
yystopf f2f2ce8252 merge from develop 2022-02-22 10:38:42 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf af160084c4 fix: merge from develop 2021-12-17 15:45:28 +08:00
yystopf da4fd3a762 fix: 易修 to 疑修 2021-12-17 15:35:30 +08:00
xiaoxiaoqiong efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
xxq250 93dd5b5d84 Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop 2021-12-08 15:12:15 +08:00
yystopf 24170fc2cb Merge pull request '同步通用代码到预上线' (#274) from develop into standalone_develop 2021-11-30 17:09:31 +08:00
yystopf 4e3c8e414c fix 2021-11-30 15:36:51 +08:00
yystopf d588a78f62 fix: locales for projects update form 2021-11-30 15:35:36 +08:00
xxq250 7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
starlee e25e2fdd77 add the claim mechanism 2021-11-25 13:33:32 +08:00
xiaoxiaoqiong 399558550e fix 验证码过期等#53446，#50806，#50880 2021-11-24 18:13:15 +08:00
yystopf 6713f9b280 fix: pullrequest trend action name 2021-11-17 11:04:15 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 77ad959a8c Merge remote-tracking branch 'gitlink/featrue_login_and_register' into standalone_develop 2021-11-08 15:08:47 +08:00
jasder 9d05973700 FIX 解决featrue_homepage分支代码冲突 2021-11-08 15:07:35 +08:00
jasder 7ad3789fe2 FIX 解决develop分支代码冲突 2021-11-08 14:59:06 +08:00
jasder e3588291b2 Merge pull request '首页api数据以及后台管理' (#240) from yystopf/forgeplus:hh_home_index into featrue_homepage 2021-11-08 14:35:19 +08:00
jasder 6fe3507a16 Merge remote-tracking branch 'gitlink/develop' into develop 2021-11-08 14:22:57 +08:00
yystopf eb18a1e7aa add: project members api and update forks api 2021-11-08 11:35:14 +08:00
yystopf e243a61d0c add: request api data and topic group 2021-11-03 14:21:02 +08:00
jasder 06cf52c384 ADD 注册接口添加确认密码参数 2021-11-03 13:50:38 +08:00
yystopf 18bbbce7b3 add: home index api 2021-11-03 10:19:01 +08:00
yystopf 35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
yystopf 385f45ddde add: home index controllers 2021-11-02 15:59:57 +08:00
jasder 6c67b92bb1 FIX revert system_notification_histories 2021-11-01 11:06:18 +08:00
jasder 1533f40890 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-01 11:00:01 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
jasder 2719e60248 ADD 邮箱、登录名、手机号验证api 2021-10-27 15:15:06 +08:00
yystopf a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
yystopf 21fa609e05 add: project rank and user rank api 2021-10-26 18:42:35 +08:00
jasder 5b19a333ef Merge branch 'develop' into dev_trustie_server 2021-10-21 14:41:43 +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
jasder 33a5b7f4f9 FIX 合并主干分支代码并解决代码冲突 2021-10-18 18:16:12 +08:00
yystopf 1dcc38f617 fix: remove system_notification_history 2021-10-18 13:51:32 +08:00
yystopf 21af31f23c add: system notification history api 2021-10-18 13:49:58 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +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 46a083239b add: release show api 2021-09-29 11:34:21 +08:00
yystopf af7488505d add: project commit_slice 2021-09-29 11:34:21 +08:00
yystopf 91feb8cf89 add: project branch_slice 2021-09-29 11:34:21 +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
chenjing c9a902d416 fix database.yml.example gitea adapter 2021-09-27 10:03:27 +08:00
yystopf 53212975f1 add: init data button 2021-09-22 09:53:43 +08:00
yystopf d957e0544f add: message template management 2021-09-18 18:41:03 +08:00
yystopf 41d04e9e99 fix: 标签改为标记 2021-09-16 18:39:19 +08:00
yystopf b8a52107a5 add: expire issue send message 2021-09-16 10:10:05 +08:00
yystopf 465a3a67a5 add: notice system api 2021-09-13 17:51:34 +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 90ace8b753 fix: download file need authorize 2021-09-10 10:52:21 +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 039779339a add: user and organization merge show api 2021-09-02 10:55:31 +08:00
yystopf 4cb71179fd add: reversed keyword management 2021-08-31 14:22:49 +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 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 87049b74ef Merge branch 'develop' into sync_develop 2021-07-01 10:06:00 +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 e111f40c69 fix 修复bug 2021-06-25 16:13: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
jasder 7bb4cf7391 Merge branch 'develop' into dev_trustie_server 2021-06-22 15:15:51 +08:00
jasder 0bfed83bc0 FIX 解决获取平台base url导致的https的问题 2021-06-22 15:05:10 +08:00
jasder 23f7439a8c Merge branch 'develop' into dev_trustie_server 2021-06-22 09:51:46 +08:00
jasder fff21a1bc8 FIX 处理版本库zip、gzip包链接为无效的问题 2021-06-22 09:39:44 +08:00
jasder bf390c8366 Merge branch 'develop' into dev_trustie_server 2021-06-11 18:03:35 +08:00
vilet.yy 5489ea9fbc add: applied join project 2021-06-09 16:53:09 +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
jasder d75b79670d Merge branch 'develop' into dev_trustie_server 2021-06-04 18:51:47 +08:00
viletyy ed8d646d47 add: user update password 2021-06-03 17:12:27 +08:00
vilet.yy 16c293562a add: pinned projects order by position 2021-06-03 11:27:12 +08:00
vilet.yy 7ba45bc866 fix: some bug 2021-06-03 11:27:12 +08:00
vilet.yy 2410f5bbc0 add: user statistics 2021-06-03 11:27:12 +08:00
vilet.yy ca8fa20c2c add: user project trends 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 422fd35f1e add: user headmap 2021-06-03 11:27:12 +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 7a752b177d Merge branch 'develop' into dev_trustie_server 2021-05-08 14:23:34 +08:00
jasder 51597335a4 FIX 修复易修标题过长导致排版问题 2021-05-08 14:13:16 +08:00
jasder eba8a3553d ADD valiate 
* ADD 项目验证信息
* ADD 组织验证信息
* ADD 团队验证信息
* FIX 处理找不到贡献者的bug
* FIX 处理同步镜像项目导航设置功能的bug
 2021-05-08 14:11:37 +08:00
jasder c67686bdf5 FIX code review 2021-05-07 11:10:03 +08:00
guotao 1021731d2b 修复编号：45283 易修标题过长导致排版问题 2021-05-07 10:45:31 +08:00
vilet.yy fc5876fc32 add: team valid 2021-05-06 18:22:30 +08:00
vilet.yy 411c10e8f3 add: project update valid and user login valid 2021-05-06 17:37:30 +08:00
vilet.yy d867823f01 add: organization validate 2021-05-06 17:04:08 +08:00
vilet.yy 604c2595d3 add: projects create validate length 2021-05-06 15:10:02 +08:00
jasder edd76b9286 Merge branch 'develop' into dev_trustie_server 2021-04-30 17:13:18 +08:00
vilet.yy a9c0d18a5f add: gitea response process 2021-04-30 16:28:29 +08:00
jasder c1ef39b262 Merge branch 'develop' into dev_trustie_server 2021-04-29 18:37:35 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
jasder ba9848ebe7 Merge branch 'develop' into dev_trustie_server 2021-04-27 18:24:41 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +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 0d7a11f3ab Merge branch 'develop' into dev_trustie_server 2021-04-19 18:41:18 +08:00
jasder 8a55e84372 FIX 调整自动生成头像中字母大小 2021-04-19 18:34:18 +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
vilet.yy 57f420848e Merge branch 'develop' into hh_develop 2021-04-02 18:20:41 +08:00
jasder 50fb8d3983 ADD sync user info api 2021-04-02 18:18:52 +08:00
vilet.yy 1153bd5ab6 fix: set redirect_uri 2021-04-02 09:43:18 +08:00
vilet.yy 0d97d7d4f0 add: educoder third party 2021-04-01 18:01:51 +08:00
jasder 62b99c517e Update deploy doc 2021-03-31 10:08:20 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy 34d95451b5 add: get project all files 2021-03-16 10:25:37 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
victor 61e5b9132a 参数删除接口修改 2021-03-04 16:52:00 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +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 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00
viletyy f094fe1799 [ADD]组织项目相关 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 9f7c9d6ec7 FIX CORS problem for develop 2021-02-02 14:32:13 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder 0adcbaa19f ADD repository languages percentage api 
(cherry picked from commit efa99e0f06)
 2021-01-20 14:30:41 +08:00
Jasder 6fa4ee6c14 ADD get readme api 
(cherry picked from commit 232f26ea3b)
 2021-01-20 14:30:24 +08:00
Jasder 4b34822fe2 FIX sidekiq cron config yml bug 
(cherry picked from commit 2253dce4d7)
 2021-01-20 14:30:21 +08:00
Jasder 536e78ffd6 FIX code bug 
(cherry picked from commit 0e8d475de7)
 2021-01-20 14:30:19 +08:00
Jasder e796776f1e FIX updage sidekiq cron 
(cherry picked from commit 1e9bd451e5)
 2021-01-20 14:30:16 +08:00