Azheng
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,862 Commits 44 Branches 16 Tags 850 MiB
Commit Graph

70 Commits

Author SHA1 Message Date
xiaoxiaoqiong 689a91ab49 Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/competition_infos_controller.rb
 2022-04-11 17:41:03 +08:00
xiaoxiaoqiong a517d1df68 登录cookie_action 2022-04-02 15:49:08 +08:00
xiaoxiaoqiong d1b5ead752 debug模式对应用户 2022-03-31 09:51:24 +08:00
xiaoxiaoqiong 3f0ded057b merge local 2022-03-28 18:07:32 +08:00
xiaoxiaoqiong 1e1d07e697 竞赛配置增加属性，通知管理 2022-03-28 18:05:52 +08:00
xiaoxiaoqiong a72a0de2b9 竞赛配置增加属性，通知管理 2022-03-28 18:05:31 +08:00
xiaoxiaoqiong bcd5c6bee0 已报名信息 2022-03-28 09:48:08 +08:00
xiaoxiaoqiong b852b8cf08 启智竞赛接口调整 2022-03-25 09:17:43 +08:00
xiaoxiaoqiong cee09d9f8f Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/users_controller.rb
#	config/routes.rb
 2022-03-24 16:35:04 +08:00
xiaoxiaoqiong 7ab87df7fc 启智竞赛接口调整 2022-03-24 16:03:01 +08:00
xiaoxiaoqiong b7914e54f6 fixed 登录token统一 2022-02-24 14:48:04 +08:00
xiaoxiaoqiong ada03e45ea debug开启 2022-02-15 16:49:20 +08:00
xiaoxiaoqiong cad35e3757 debug开启 2022-02-15 16:32:41 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 499734ebf9 fix: upload user image allow base64 2022-01-04 22:44:39 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 6fe3507a16 Merge remote-tracking branch 'gitlink/develop' into develop 2021-11-08 14:22:57 +08:00
yystopf 1a449d1dc6 add: atme service 2021-11-08 11:35:14 +08:00
jasder 4676b756e8 FIX 完善邮箱注册发送邮件功能 2021-10-27 17:01:16 +08:00
yystopf 4841943419 fix 2021-09-29 10:49:39 +08:00
yystopf 60720c309f fix: profile completed 2021-09-29 10:39:50 +08:00
yystopf 74a9743bcc fix: annoymous user visit project 2021-09-07 15:17:52 +08:00
yystopf a422aa638d fix: update user profile completed rule 2021-09-02 11:48:53 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +08:00
yystopf 0f45e8f44b fix 2021-08-17 15:33:03 +08:00
jasder ef0a0e5ddd FIX [bug]cherry pick ce85273^..0bfed83 2021-06-23 17:56:04 +08:00
jasder 0bfed83bc0 FIX 解决获取平台base url导致的https的问题 2021-06-22 15:05:10 +08:00
vilet.yy 09dfd504c2 fix: sql attack 2021-06-17 16:13:40 +08:00
vilet.yy 2ad963cdf1 add: update user image 2021-06-01 10:07:01 +08:00
jasder aa314c141c ADD some url with in hovercoard api 2021-04-23 14:40:26 +08:00
vilet.yy cc978c8dea [FIX]merge from develop 2021-03-01 13:59:30 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy c278ed1863 [FIX] 2021-02-06 14:27:47 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
Jasder 2347697e93 ADD some api 
* api/v1/repos/{owner}/{repo}/pulls/{number}/commits
* api/v1/repos/{owner}/{repo}/pulls/{number}/files
* api/v1/repos/{owner}/{repo}/compare/{base}...{head}
 2020-11-03 18:37:47 +08:00
Jasder 1bc935ffd5 FIX code review and user cache 2020-10-30 15:47:09 +08:00
Jasder 2636923c9b FIX merge 2020-09-29 11:53:41 +08:00
sylor_huang@126.com e698efb14f Add Attachment Video 2020-09-24 14:57:36 +08:00
Jasder 3829f21da1 FIX load project bug 2020-09-23 16:58:22 +08:00
sylor_huang@126.com 5bef80ee58 Change Index Category 2020-09-11 18:32:42 +08:00
sylor_huang@126.com 79bc2655b7 Test Project Validate Failed13 2020-08-24 14:19:32 +08:00
sylor_huang@126.com 3586952a89 Test Project Validate Failed1 2020-08-24 14:16:11 +08:00
Jasder 2ac2920399 FIX merge dev_trustie branch 2020-08-18 17:39:37 +08:00
Jasder 63148c339c Merge branch 'dev_change_route' into dev_devops 2020-08-14 18:21:04 +08:00
Jasder c1b0061b8d ADD educode user login 2020-08-14 18:19:00 +08:00
Jasder 78b091ddd3 FIX merge bug 2020-08-13 09:44:38 +08:00
sylor_huang@126.com ff847184cc Change 2020-08-12 11:01:34 +08:00
sylor_huang@126.com facf7a0040 Chnage 2020-08-12 11:00:39 +08:00
sylor_huang@126.com d80600a58c Change 2020-08-12 10:58:16 +08:00
sylor_huang@126.com 54b1af8d06 Change 2020-08-12 10:55:13 +08:00