Commit Graph

233 Commits (master)
 

Author SHA1 Message Date
bug_creator 63940d2790 fix bug 3 years ago
bug_creator c261121201 complete answer 3 years ago
bug_creator ccfbc6ebe1 Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post
 Conflicts:
	app/main/views.py
	app/templates/index/index_posts.html
3 years ago
bug_creator 13a51a87a1 add new question 3 years ago
Shenyuan Jin cb4dcc3c4c questions displayed dynamically fixed 3 years ago
Shenyuan Jin 76815b9c49 questions displayed dynamically 3 years ago
Shenyuan Jin d160bff036 Merge remote-tracking branch 'origin/ajax_post' into ajax_post 3 years ago
Shenyuan Jin ab3763565c new questions 3 years ago
Yang Liuxin fceab10dbb finish music player 3 years ago
Yang Liuxin 7ed409a1a1 Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post 3 years ago
Yang Liuxin e5b779c1f0 finish music player 3 years ago
Shenyuan Jin 11b7943642 Merge remote-tracking branch 'origin/ajax_post' into ajax_post 3 years ago
Shenyuan Jin d7b081d990 questions pages added 3 years ago
Yang Liuxin 8d9de37d6a finish music player 3 years ago
bug_creator ee04c354f6 Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post 3 years ago
bug_creator 0e2be43b0f test 3 years ago
Yang Liuxin 49d24ea452 finish music player 3 years ago
Yang Liuxin 86bd695b27 music player 3 years ago
Yang Liuxin 74d13c51a7 resolve conflict 3 years ago
Yang Liuxin 5c1ee40645 resolve conflict 3 years ago
bug_creator cbbed8b829 Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post 3 years ago
bug_creator 8571da5b38 fix lib 3 years ago
Yang Liuxin 82b7050dbd resolve conflict 3 years ago
Yang Liuxin 2c062d3607 resolve conflict 3 years ago
Yang Liuxin 1ffd607401 resolve conflict 3 years ago
Yang Liuxin aa0a9adbf8 resolve conflict 3 years ago
Yang Liuxin 8c83f28899 resolve conflict 3 years ago
Yang Liuxin 1a7ddf0cbb resolve conflict 3 years ago
Yang Liuxin d7829d59d4 resolve conflict 3 years ago
Yang Liuxin f3daf5ee59 resolve conflict 3 years ago
Yang Liuxin fe00008882 resolve conflict 3 years ago
Yang Liuxin b681f02fdf resolve conflict 3 years ago
Yang Liuxin 6b69dc669a resolve conflict 3 years ago
Yang Liuxin 731c5a7c73 resolve conflict 3 years ago
Yang Liuxin 237a31af80 resolve conflict 3 years ago
Yang Liuxin 7ec8bdfe51 Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post
 Conflicts:
	app/templates/index/index_posts.html
3 years ago
Yang Liuxin 8ca8659f11 resolve conflict 3 years ago
bug_creator cce4493cad add icon 3 years ago
bug_creator 4e90b8fa36 fix bug 3 years ago
bug_creator 7d9d73bdd6 change editor 3 years ago
bug_creator 63adb378db Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post 3 years ago
bug_creator e7948e4515 fix index 3 years ago
Yang Liuxin 151f084134 resolve conflict 3 years ago
王宇洋 87a6e92ab7 add-web-methodology.yaml 3 years ago
王宇洋 55b67b8066 add-web-methodology.yaml 3 years ago
Yang Liuxin 288f61452a Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post 3 years ago
bug_creator 5f5330fdc3 login test 3 years ago
Yang Liuxin e156cea8ea Merge branch 'ajax_post' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post
 Conflicts:
	data-dev.sqlite
3 years ago
bug_creator 93cad5fb25 no login go to login 3 years ago
Yang Liuxin 5f0e18063f Merge branch 'master' of csgitlab.ucd.ie:19206226/q-a_platform into ajax_post
 Conflicts:
	data-dev.sqlite
3 years ago