Commit Graph

6 Commits

Author SHA1 Message Date
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
2025-03-20 14:32:54 +08:00
xxq250 a1d8e4fa40 流水线节点增加参数默认值 2025-02-18 09:05:56 +08:00
xxq250 5eda42931c fixed authenticity_token 2024-07-26 14:30:20 +08:00
xxq250 545e96ef7d fixed action js 2024-07-25 11:58:04 +08:00
xxq250 b96d52a84d 增加流水线节点名称,和标识区分 2024-05-31 10:56:46 +08:00
xxq250 8ae91ff558 流水线节点管理和模板管理 2024-05-07 14:08:46 +08:00