GitNex/app/src/main/java/org/mian/gitnex
6543 145043a515 Extend Merge Options (#217)
Merge branch 'master' into extend-merge-dialog

Minor fixes

format

? an AndroidStudio suggestion ?

Signed-off-by: 6543 <6543@obermui.de>

add Title Text and some Fixes

add version check

Merge branch 'master' into extend-merge-dialog

Merge branch 'master' into extend-merge-dialog

use translation and revormat

make Merge Options Translateble
gitea locale revs:
* pulls.merge_pull_request
* pulls.rebase_merge_pull_request
* pulls.rebase_merge_commit_pull_request
* pulls.squash_merge_pull_request

Fix menu item

Make merge options work

Merge branch 'master' into merge-options

work - but UGLY UI

use enum for merge-modes

Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/217
2020-04-11 20:20:26 +00:00
..
actions Close/reopen milestone 2020-04-08 23:31:27 +05:00
activities Extend Merge Options (#217) 2020-04-11 20:20:26 +00:00
adapters Close/reopen milestone 2020-04-08 23:31:27 +05:00
clients Adding caching to picasso service (#345) 2020-04-03 17:02:46 +00:00
fragments Extend Merge Options (#217) 2020-04-11 20:20:26 +00:00
helpers Implement auto switcher for light and dark theme (#388) 2020-04-11 06:06:39 +00:00
interfaces Close/reopen milestone 2020-04-08 23:31:27 +05:00
items Improving design of "Repository Meta" (#362) 2020-04-07 21:17:12 +00:00
models Extend Merge Options (#217) 2020-04-11 20:20:26 +00:00
util Add file size to Files (#292) 2020-03-16 20:01:49 +00:00
viewmodels final implementation and ui completion of commits list 2020-03-27 23:59:24 +05:00