forgeplus

Commit Graph

Select branches

Hide Pull Requests

dev_local_v1

dev_local_v2

dev_zhejianglab_private

develop

docker

feature

master

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

v1

v1.0.0

v3.0.0

v3.0.1

v3.0.2

v3.0.3

v3.0.3(standalone)

v3.0.4

v3.0.4(standalone)

v3.1.0

v3.1.0-standalone

v3.1.1

v3.1.1-standalone

v3.1.5

v3.2.0

v4.0.0

43792d3100 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-06-08 20:52:07 +0800
6f42889b06 通知邮件支持用户不存在时发送base_url xiaoxiaoqiong 2022-06-08 20:52:01 +0800
4a886b4bb1 Merge pull request '20220608版本' (#307) from develop into master xxq250 2022-06-08 14:44:09 +0800
507d63e98c Merge pull request '20220608版本' (#306) from Trustie/forgeplus:trustie_server into develop xxq250 2022-06-08 14:43:22 +0800
7a0dbaaefb Merge branch 'develop' into standalone_develop yystopf 2022-06-08 10:47:08 +0800
3e4dd90e17 修复: 用户名称展示时只去掉首末的空格 yystopf 2022-06-08 10:46:55 +0800
8a7dc75907 fix merge from develop yystopf 2022-06-08 10:38:10 +0800
8ae5587516 fix: search name use strip yystopf 2022-06-08 10:37:31 +0800
b3dfc72546 Merge branch 'pre_trustie_server' into trustie_server xiaoxiaoqiong 2022-06-02 16:41:51 +0800
6f10d4ca24 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-06-02 16:41:27 +0800
15a0b85ae6 通知邮件支持用户不存在时发送base_url xiaoxiaoqiong 2022-06-01 16:11:18 +0800
0b543f7dda 通知邮件支持用户不存在时发送base_url xiaoxiaoqiong 2022-06-01 16:08:20 +0800
a07204111a 通知邮件支持用户不存在时发送 xiaoxiaoqiong 2022-06-01 15:24:39 +0800
a7ce3f3728 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-06-01 15:23:14 +0800
7290cd6495 通知邮件支持用户不存在时发送 xiaoxiaoqiong 2022-06-01 15:23:05 +0800
e69fe13745 merge from develop yystopf 2022-06-01 10:03:29 +0800
038df804c0 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop yystopf 2022-06-01 10:01:15 +0800
877948b0cd 新增: 通用消息模板后台创建 yystopf 2022-06-01 10:00:57 +0800
9a17c4865f 项目名称和描述增加敏感词检测 xiaoxiaoqiong 2022-06-01 09:27:18 +0800
4a23878185 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-06-01 09:23:21 +0800
dc787a35d4 项目名称和描述增加敏感词检测 xiaoxiaoqiong 2022-06-01 09:23:11 +0800
b785406ab8 Merge branch 'develop' into standalone_develop yystopf 2022-05-31 16:34:20 +0800
9427db3e5a 新增: 通用消息模板 yystopf 2022-05-31 16:34:08 +0800
2d52dbfc2f Merge branch 'develop' into standalone_develop yystopf 2022-05-30 14:50:48 +0800
81da71d478 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop yystopf 2022-05-30 14:50:23 +0800
169dc84e22 新增: 组织下项目需返回是否为公有项目字段 yystopf 2022-05-30 14:50:12 +0800
fe4dca2eb7 Merge branch 'pre_trustie_server' into trustie_server xiaoxiaoqiong 2022-05-30 11:20:37 +0800
9d0980ecfd Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-30 11:19:45 +0800
f66e951f31 Merge branch 'develop' into standalone_develop xiaoxiaoqiong 2022-05-30 11:19:13 +0800
d6fd85f536 Repository.url重写，导入项目时为空 xiaoxiaoqiong 2022-05-30 11:18:24 +0800
b1d3b9ee5f Merge branch 'pre_trustie_server' into trustie_server xiaoxiaoqiong 2022-05-30 10:44:21 +0800
3b5da788a8 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-30 10:44:00 +0800
331dfa4b12 Merge branch 'develop' into standalone_develop xiaoxiaoqiong 2022-05-30 10:26:35 +0800
6448a30e03 render_error替换成tip_exception xiaoxiaoqiong 2022-05-30 10:25:43 +0800
17fb43cea8 render_error替换成tip_exception xiaoxiaoqiong 2022-05-30 10:24:39 +0800
5e5093a44c Merge branch 'pre_trustie_server' into trustie_server xiaoxiaoqiong 2022-05-27 16:56:27 +0800
d27f55bb35 fixed ci报错200处理 xiaoxiaoqiong 2022-05-27 16:55:52 +0800
e76822eb34 fixed ci报错200处理 xiaoxiaoqiong 2022-05-27 16:54:09 +0800
2fbd93114c Merge branch 'pre_trustie_server' into trustie_server xiaoxiaoqiong 2022-05-27 14:47:31 +0800
d48e1a82b1 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-27 14:46:26 +0800
1220223322 rake导入项目,无语言处理 xiaoxiaoqiong 2022-05-27 14:43:16 +0800
0b35f56212 rake导入项目,无语言处理 xiaoxiaoqiong 2022-05-27 14:31:29 +0800
95f98710d6 rake导入项目 xiaoxiaoqiong 2022-05-27 14:26:53 +0800
40a987116f rake导入项目 xiaoxiaoqiong 2022-05-27 14:25:16 +0800
a00b1d4530 rake导入项目 xiaoxiaoqiong 2022-05-27 14:21:00 +0800
48cf92a2cf rake导入项目 xiaoxiaoqiong 2022-05-27 14:19:57 +0800
bb8e8f2d94 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-27 10:49:39 +0800
6c94da3f05 Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-27 10:49:22 +0800
2a387ad997 Merge branch 'develop' into standalone_develop yystopf 2022-05-27 10:48:38 +0800
a6e50d2a25 修复 devops无法激活项目的问题 yystopf 2022-05-27 10:48:20 +0800
f6e8f24480 Merge branch 'develop' into standalone_develop yystopf 2022-05-26 15:09:26 +0800
bd16ca476d 增加: 退出仓库api文档 yystopf 2022-05-26 15:08:42 +0800
6eaf491f70 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-25 15:49:21 +0800
d4d00b30bf Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-25 11:47:55 +0800
19ec81e975 Merge branch 'develop' into standalone_develop yystopf 2022-05-25 11:47:44 +0800
2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 yystopf 2022-05-25 11:47:35 +0800
4c066b30ef Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 18:10:28 +0800
ad9bb8e542 修复: 合并从develop yystopf 2022-05-24 18:10:20 +0800
e36c7a4b6a 修复: 邮箱搜索不需要return 404 yystopf 2022-05-24 18:09:36 +0800
18c4c6ae2f Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 17:38:21 +0800
9979c87d0c 修复: 合并从develop yystopf 2022-05-24 17:27:24 +0800
8e8ec821f2 新增: 根据邮箱来获取用户 yystopf 2022-05-24 17:26:10 +0800
774b1bc79e Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 15:24:43 +0800
94166a363c fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 15:24:15 +0800
0219a1fdde Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:34:29 +0800
ebe5fad7dd fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:33:23 +0800
b2e7491ade Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:15:21 +0800
85a36ca2e7 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:14:57 +0800
b0f80012ab Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:08:58 +0800
75cef14605 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:08:33 +0800
0fc96026c8 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 14:01:01 +0800
93f8b659a1 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 14:00:15 +0800
b45ee11239 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 13:46:58 +0800
553d3a019f Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 11:50:30 +0800
33fa55bcb6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-24 11:49:01 +0800
643a99fdf1 fixed 增加自动登录，gitea注册 xiaoxiaoqiong 2022-05-24 11:48:56 +0800
38c5432c2a Merge branch 'develop' into standalone_develop yystopf 2022-05-24 11:46:26 +0800
5cf257c3cc Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop yystopf 2022-05-24 11:45:53 +0800
aa18fe0ad4 修复: 转移项目时新接受者需要移除原来的权限角色 yystopf 2022-05-24 11:43:47 +0800
1358c23ca6 fix: trasfer project member must remove old permission yystopf 2022-05-24 11:43:47 +0800
e8bfd0c955 Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-24 11:10:13 +0800
183eb15c7d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop yystopf 2022-05-24 11:03:59 +0800
fb43268444 fix: merge from develop yystopf 2022-05-24 11:03:54 +0800
c27cc063e6 add: new update user info simple and sync gitea yystopf 2022-05-24 10:59:52 +0800
6f6fe61a9d Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:47:37 +0800
b673909f9e fixed 增加自动登录，手机号先记录，后续用 xiaoxiaoqiong 2022-05-24 10:47:17 +0800
bd4dbd577b Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:34:54 +0800
ee3a14fa28 fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:34:31 +0800
26bfc2c0bf fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:33:21 +0800
eb2d976876 Merge branch 'standalone_develop' into pre_trustie_server xiaoxiaoqiong 2022-05-24 10:29:00 +0800
56721930a2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-24 10:26:06 +0800
2959414d56 fixed 增加自动登录 xiaoxiaoqiong 2022-05-24 10:25:58 +0800
319e6ea084 Merge branch 'pre_trustie_server' into trustie_server yystopf 2022-05-23 18:24:17 +0800
008fdbaf5a Merge branch 'standalone_develop' into pre_trustie_server yystopf 2022-05-23 18:24:06 +0800
6223cf41e2 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop yystopf 2022-05-23 18:10:54 +0800
1d3f79e777 Merge branch 'develop' into standalone_develop yystopf 2022-05-23 18:10:47 +0800
b0092487e6 fix: is readme use regex yystopf 2022-05-23 18:10:41 +0800
0ae3544235 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop xiaoxiaoqiong 2022-05-23 18:06:24 +0800
05b3f2a2fb fixed timego时间差 xiaoxiaoqiong 2022-05-23 18:05:13 +0800
97fe157279 Merge branch 'develop' into standalone_develop yystopf 2022-05-23 09:27:16 +0800