Commit Graph

24 Commits (4c3e56da1329c8f0de8e25c094753e968b4b6627)

Author SHA1 Message Date
parnic f4d27498bd
Add DefaultMergeStyle option to repository (#14789) 4 years ago
Bo-Yi Wu 167b0f46ef
chore(models): rewrite code format. (#14754) 4 years ago
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543) 4 years ago
zeripath f0e15250b9
Migrate to use jsoniter instead of encoding/json (#14841) 4 years ago
6543 a19447aed1
migrate from com.* to alternatives (#14103) 4 years ago
Jimmy Praet 2791cc139e
Don't show a dropdown menu when only 1 merge option is available (#13660) (#13670) 4 years ago
Lanre Adelowo 4027c5dd7c
Kanban board (#8346) 4 years ago
Lunny Xiao c61b902538
Upgrade xorm to v1.0.0 (#10646) 5 years ago
David Svantesson 3c07d03c03 Add setting to set default and global disabled repository units. (#8788) 5 years ago
Lunny Xiao d151503d34 Upgrade xorm to v0.8.0 (#8536) 5 years ago
Tamal Saha 171b359877 Use gitea forked macaron (#7933) 5 years ago
Lunny Xiao 85202d4784
Display ui time with customize time location (#7792) 5 years ago
Lunny Xiao aa7c34cf86 Fix error log when loading issues caused by a xorm bug (#7271) 5 years ago
Julian 4a685f8b87 Add rebase with merge commit merge style (#3844) (#4052) 6 years ago
Lunny Xiao eabbddcd98
Restrict permission check on repositories and fix some problems (#5314) 6 years ago
kolaente 1bff02de55 Added dependencies for issues (#2196) (#2531) 6 years ago
Lauris BH 8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 7 years ago
Lunny Xiao f2e20c81b6 Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago
Morlinest a04718a2a6 Remove repo unit index (#2621) 7 years ago
Lunny Xiao a8717e5e3a Use AfterLoad instead of AfterSet on Structs (#2628) 7 years ago
Jonas Franz 5ccecb44ad Feature: Timetracking (#2211) 7 years ago
Lauris BH f33e6ae09e Remove unit types commits and settings (#2161) 7 years ago
Lunny Xiao fd6034aaf2 Add units to team (#947) 8 years ago
Lunny Xiao 8a421b1fd7 Add units concept for modulable functions of a repository (#742) 8 years ago