Quick fix for crashes on Android 5 and 6 in file viewer using highlightjs
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/476
Reviewed-by: 6543 <6543@noreply.gitea.io>
Merge branch 'release-2.5' into backport_431
Update from Crowdin
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/432
Reviewed-by: M M Arif <mmarif@swatian.com>
Dismiss bottom sheet on subscribe/unsubscribe to issue: Does not really fix the issue as there is way to handle this without a proper call.
And dismiss does not work properly either.
But added few improvements and fixed close/reopen issue along the way.
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/429
Reviewed-by: 6543 <6543@noreply.gitea.io>
add own error message for this
Merge branch 'master' into login-fix
Merge branch 'master' into login-fix
Merge branch 'master' into login-fix
Adding ability to login again when version check failes.
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/417
Reviewed-by: M M Arif <mmarif@swatian.com>
Reformat Code
FIX IssueComments moddel
reformate Code
TimeHelper.formatTime dont crash on null date object
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/425
Reviewed-by: M M Arif <mmarif@swatian.com>
Disable minify to get proper logs
Enable it by default
Integrate crash reporting
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/418
Reviewed-by: 6543 <6543@noreply.gitea.io>
Merge branch 'master' into crowdin-update
Update Crowdin 2020-04-14
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/411
Reviewed-by: M M Arif <mmarif@swatian.com>
new strings for tabs
Merge branch 'refactor-issues' of gitea.com:gitnex/GitNex into refactor-issues
Fix conflicts and files refactors
Merge branch 'master' into refactor-issues
Merge branch 'master' into refactor-issues
refactored closed issues in new tab
Added gitea ver check, minor ui fixes
Merge branch 'master' into refactor-issues
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
Refactored open issues
Added parent fragment
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/380
add isRepoAdmin
extend Adapters
add check to RepoDetails
refactor var names
reformat code
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/402
Reviewed-by: M M Arif <mmarif@swatian.com>
Final changes.
Merge branch 'master' into bug-desc-improve
Merge branch 'master' into bug-desc-improve
Removing unnecessary bar.
Simplifying stuff.
Some more examples.
Further improvements.
Further improvements.
Improving issue template.
Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/401
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
Merge branch 'master' into 389_alternate_version-api-auth
rm comment
get gitea Version Authentificated
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/399
Reviewed-by: M M Arif <mmarif@swatian.com>
Trying to find a compromise.
make them great again ;)
Applying changes of LabelWidthCalculator to LabelsAdapter.
Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/398
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
Merge branch 'master' into 372-remember-login-type
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Use strings instead of boolean
Remember login type
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/394
Revert "store default if user didnt touch Font settings"
This reverts commit 9c5f9731
store default if user didnt touch Font settings
Setting translatable to false
Last changes.
Defaulting to Manrope in strings.xml
Default to Manrope in settings.
Changes in default value.
Automatic formatting.
Merge remote-tracking branch 'remotes/main/master' into manrope
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
Manrope just literally as default font.
Reformatting code.
Making optimizations.
Moving initialization to BaseActivity
Merge remote-tracking branch 'remotes/main/master' into manrope
Setting Manrope as default font.
Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/379
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
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
Merge branch 'fix-fab-scroll-issue' of gitea.com:gitnex/GitNex into fix-fab-scroll-issue
Merge branch 'master' into fix-fab-scroll-issue
Merge branch 'master' into fix-fab-scroll-issue
Fix fab hide scroll issue and clean up
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/381
Reviewed-by: 6543 <6543@noreply.gitea.io>
Remove import and add author
Implement auto switcher for light and dark theme. other ui fixes
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/388
Reviewed-by: 6543 <6543@noreply.gitea.io>
