xxq250 feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop ...

# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb

2022-12-01 17:48:11 +08:00

..

assets

修复：项目列表表头样式

2022-10-18 15:53:37 +08:00

channels

FIX actioncable job

2020-07-07 16:08:10 +08:00

constraint

qianyi datas

2020-07-09 16:46:57 +08:00

controllers

Merge remote-tracking branch 'origin/develop' into standalone_develop

2022-12-01 17:48:11 +08:00

decorators

FIX code review

2021-11-11 18:03:30 +08:00

docs/slate/source

Merge branch 'develop' into standalone_develop

2022-09-29 13:59:04 +08:00

forms

Merge branch 'develop' into standalone_develop

2022-09-06 14:58:02 +08:00

helpers

Merge branch 'develop' into standalone_develop

2022-10-21 14:32:03 +08:00

imports

add: download and import user template xlsx

2022-05-16 16:59:25 +08:00

interactors

修复：提交文件内容格式由前端决定

2022-11-29 17:08:26 +08:00

jobs

通知邮件支持用户不存在时发送

2022-06-01 15:24:39 +08:00

libs

fixed 邮箱验证正则优化

2022-07-26 17:11:46 +08:00

mailers

fixed 区分找回密码邮件标题

2022-11-15 14:31:18 +08:00

models

Merge remote-tracking branch 'origin/develop' into standalone_develop

2022-12-01 17:48:11 +08:00

queries

项目搜索增加组织和用户信息搜索

2022-11-15 14:40:37 +08:00

services

Merge branch 'develop' into standalone_develop

2022-11-29 17:09:00 +08:00

tasks

Fix admin project list

2020-07-22 17:21:59 +08:00

views

fixed 组织用户不存在

2022-11-28 11:20:44 +08:00