Commit Graph

233 Commits (master)
 

Author SHA1 Message Date
王宇洋 540664e675 update-coverage 3 years ago
王宇洋 7ee0b168a2 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection 3 years ago
王宇洋 9fe3afcde7 update-coverage 3 years ago
bug_creator b96a9d54af 添加举报|完善功能 3 years ago
bug_creator e3376bbc59 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
bug_creator 0939ba25cd add modification|fix bug|还有一堆事情记不得了 3 years ago
王宇洋 dfce203372 update-coverage 3 years ago
王宇洋 19230c8110 Merge branch 'master' of csgitlab.ucd.ie:19206226/q-a_platform 3 years ago
王宇洋 2fc609ec71 Merge branch 'collection' 3 years ago
王宇洋 600dc3b07e update-coverage 3 years ago
王宇洋 cf76ec12f5 update-doc 3 years ago
王宇洋 dadecf6383 update-doc 3 years ago
王宇洋 589196d11d update-doc 3 years ago
王宇洋 0419bda511 update-doc 3 years ago
Shenyuan Jin e2b4e4cd70 Merge remote-tracking branch 'origin/collection' into collection
# Conflicts:
#	app/templates/Posts/question.html
#	data-dev.sqlite
3 years ago
Shenyuan Jin 16f68de451 follow question 3 years ago
王宇洋 e7ae7510ed update-index-invite 3 years ago
王宇洋 c9340414f3 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection 3 years ago
王宇洋 667310dd4b update-readme.md 3 years ago
Yang Liuxin 4320484dd4 finish music player 3 years ago
王宇洋 000a6f917b Merge branch 'collection' into 'master'
Collection

See merge request 19206226/q-a_platform!2
3 years ago
Shenyuan Jin d97ce15fd4 Merge remote-tracking branch 'origin/collection' into collection
# Conflicts:
#	data-dev.sqlite
3 years ago
Shenyuan Jin 03495aeb41 change for non-logged in user 3 years ago
Yang Liuxin 76c164c059 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
Yang Liuxin 228b48c947 finish music player 3 years ago
王宇洋 3b7ca33dff git pushMerge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into
collection
git push
3 years ago
王宇洋 9313f69483 add-index-page-caching 3 years ago
Yang Liuxin 6bcffb2f8b Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
Yang Liuxin 1f542a3783 finish music player 3 years ago
bug_creator e738c56b31 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
bug_creator 8e81200055 invite 3 years ago
王宇洋 f0eeaabed7 add-index-page-caching 3 years ago
王宇洋 1de65edefd add-index-page-caching 3 years ago
王宇洋 fab6b567e0 add-index-page-caching 3 years ago
Yang Liuxin 588880c01d Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
Yang Liuxin 204290d053 finish music player 3 years ago
bug_creator 405da479e8 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
bug_creator d8b02d2596 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	app/main/views.py
	app/templates/Posts/question.html
	data-dev.sqlite
3 years ago
王宇洋 dbe6437173 git pushMerge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection 3 years ago
bug_creator 8f6728610c follow 3 years ago
王宇洋 938f37d5d2 fix 3 years ago
Shenyuan Jin e25e1cea55 Merge remote-tracking branch 'origin/collection' into collection
# Conflicts:
#	data-dev.sqlite
3 years ago
Shenyuan Jin ea3f9ab3be invite 3 years ago
王宇洋 983f073995 fix 3 years ago
bug_creator 61a6af323d Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago
bug_creator f5d1d73f3f database 3 years ago
王宇洋 f8cd393f3c fix 3 years ago
王宇洋 ee3d8c068a update-backgournd 3 years ago
王宇洋 f1d5c72a33 update-backgournd 3 years ago
bug_creator fe9d70aef3 Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection
 Conflicts:
	data-dev.sqlite
3 years ago