“xxq250”
|
cb302b50dd
|
Merge branch 'develop' into dev_jk_server
# Conflicts:
# app/assets/javascripts/admin.js
# app/controllers/accounts_controller.rb
# app/controllers/application_controller.rb
# app/controllers/attachments_controller.rb
# app/controllers/concerns/login_helper.rb
# app/controllers/concerns/register_helper.rb
# app/controllers/concerns/render_helper.rb
# app/controllers/concerns/repository/languages_percentagable.rb
# app/controllers/repositories_controller.rb
# app/controllers/users/is_pinned_projects_controller.rb
# app/controllers/users_controller.rb
# app/docs/slate/source/api.html.md
# app/docs/slate/source/includes/_projects.md
# app/docs/slate/source/includes/_pulls.md
# app/docs/slate/source/includes/_repositories.md
# app/docs/slate/source/includes/_teams.md
# app/docs/slate/source/includes/_users.md
# app/helpers/application_helper.rb
# app/imports/admins/new_import_user_from_excel.rb
# app/libs/custom_regexp.rb
# app/models/journal.rb
# app/models/project.rb
# app/models/user.rb
# app/queries/admins/user_query.rb
# app/services/admins/import_user_from_excel_service.rb
# app/views/admins/users/index.html.erb
# app/views/members/index.json.jbuilder
# app/views/settings/show.json.jbuilder
# config/routes.rb
# public/导入用户模板.xlsx
|
2022-09-27 15:32:46 +08:00 |
|
“xxq250”
|
7148957368
|
nps用户调研
|
2022-08-30 18:10:27 +08:00 |
 yystopf
|
04f2dbee9a
|
merge from develop
|
2022-01-18 15:30:57 +08:00 |
|
yystopf
|
4310cc9f26
|
add: platform person admin
|
2021-12-06 16:41:12 +08:00 |
|
yystopf
|
43dc966cf9
|
add: project category upload logo
|
2021-10-27 18:02:21 +08:00 |
|
Jasder
|
2937b2a94d
|
init project
|
2020-03-09 00:40:16 +08:00 |