shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
500 Commits 21 Branches 42 Tags
b31e2973c2ac7dc8987fb4ea7b7c767ee941da19
Commit Graph

500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
M M Arif
b31e2973c2 Merge pull request 'Release 2.5.1' (#479) from prepare-release-2.5.1 into release-2.5 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/479
2.5.1 		2020-04-30 09:36:00 +00:00
M M Arif
63f03db21b Release 2.5.1 2020-04-30 14:30:18 +05:00
M M Arif
7c90a32de7 Disable Code Highliging in File View to avoid crashes on Android 5 and 6 (#476) 
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>
 2020-04-28 22:56:31 +00:00
M M Arif
0bc4b6fd10 Merge pull request 'Fix the context bug (#470)' (#471) from backport_470-ctx-fix into release-2.5 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/471
Reviewed-by: M M Arif <mmarif@swatian.com>
 2020-04-28 10:52:15 +00:00
M M Arif
e8ab396e43 Fix the context bug (#470) 
Fix the context bug. done in activities

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/470
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-28 12:37:24 +02:00
opyale
83911da86f Temporary fix for data scrambling in diff. (#465) 
Temporary fix for data scrambling in diff.

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/465
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-27 20:32:51 +00:00
M M Arif
78f8a3d1c7 Fix share repo url (#456) 
Fix share repo url

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/456
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-26 11:07:37 +00:00
M M Arif
e27e29b7ae [Backport] Notification icons (#459) 
backport notification icons

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/459
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-26 10:58:06 +00:00
M M Arif
e8c25fca2a [Bug] Crash in issues fragment (#444) 
Fixed #443

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/444
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-23 15:08:53 +00:00
M M Arif
3ddf978bf0 Merge pull request 'prepare release 2.5' (#434) from prepare-release-2.5 into release-2.5 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/434
2.5.0 		2020-04-21 16:02:15 +00:00
M M Arif
bb8cc3ff6e prepare release 2.5 2020-04-21 19:19:16 +05:00
6543
e9eef8fcbf [Backport] Crowdin [2020-04-21] (#432) 
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>
 2020-04-21 13:54:07 +00:00
M M Arif
eba170f7e9 Shuffle tabs, add images (#430) 
update images
workaround for #414 (shuffle tabs)

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/430
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-21 08:50:51 +00:00
M M Arif
c2b316446c #427 Dismiss bottom sheet on subscribe/unsubscribe to issue & Fix (#429) 
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>
 2020-04-18 14:21:48 +00:00
M M Arif
c3f4cbb186 Merge pull request 'Rc release' (#426) from prepare-rc-release into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/426
2.5.0-rc4 		2020-04-18 05:21:39 +00:00
M M Arif
57ecf3b7d2 Rc release 2020-04-18 10:19:43 +05:00
opyale
03a9cd1bba Adding ability to login again when version check failes. (#417) 
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>
 2020-04-18 04:51:58 +00:00
6543
aa85b99e84 FIX IssueComments moddel (#425) 
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>
 2020-04-18 04:50:36 +00:00
M M Arif
0c6c596208 Integrate crash reporting (#418) 
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>
 2020-04-17 23:39:49 +00:00
M M Arif
30165f27ba Merge pull request 'Fix crash caused by res shrinking and minification' (#421) from 420-fix-release-crash into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/421
 2020-04-17 10:12:59 +00:00
M M Arif
b7abe65508 Fix crash caused by res shrinking and minification 2020-04-17 15:10:32 +05:00
6543
31723008ed [CI] publish signed builds from master to nextcloud (#416) 
publish builds from master

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/416
Reviewed-by: M M Arif <mmarif@swatian.com>
 2020-04-15 16:09:29 +00:00
6543
a544e2ef56 Crowdin [2020-04-14] (#411) 
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>
 2020-04-15 06:33:38 +00:00
opyale
13dbbe3ec7 Fixing toasty bug. (#412) 
Fixing toasty bug.

Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/412
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-14 22:41:40 +00:00
M M Arif
9cbcb1f87b Merge pull request 'Prepare 2.5.0 rc release' (#410) from rc-release-fdroid into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/410
 2020-04-14 21:31:36 +00:00
M M Arif
e7554819fd Prepare 2.5.0 rc release 2020-04-15 02:27:58 +05:00
M M Arif
7caecadb32 Refactor issues (#380) 
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
 2020-04-14 20:55:04 +00:00
6543
b8d8b34b0e Show ContributorsTab only if you have permission to (#402) 
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>
 2020-04-14 19:25:36 +00:00
M M Arif
ab47e409e9 update libs, enhance release builds (#408) 
Merge branch 'master' into update-libs-enhance-release-build

update libs, enhance release builds

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/408
 2020-04-14 08:50:12 +00:00
opyale
344284c1c1 Improving issue template. (#401) 
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>
 2020-04-13 15:56:31 +00:00
M M Arif
b10df63c8a Merge pull request 'Adjusting size of text views in organizations list.' (#406) from opyale/GitNex:size-adj into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/406
Reviewed-by: M M Arif <mmarif@swatian.com>
 2020-04-13 15:55:17 +00:00
opyale
4cb0253b38 Adjusting size of text views in organizations list. 2020-04-13 17:31:39 +02:00
M M Arif
539c5be4b5 Themes for source code in file viewer (#403) 
reformat code

move from else-if to switch-case

Merge branch 'master' into 396-themes-file-veiwer

Merge branch 'master' into 396-themes-file-veiwer

Make string translatable false

Themes for source code in file viewer

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/403
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-13 15:23:31 +00:00
M M Arif
008ffaa553 Merge pull request 'Fix of views being gone randomly' (#404) from 400-milestone-bug into master 
Merging via app
 2020-04-13 10:40:05 +00:00
6543
9a5a774d8c Merge branch 'master' into 400-milestone-bug 2020-04-13 10:20:18 +00:00
6543
2e452eaa81 Fix version API auth check (#399) 
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>
 2020-04-13 08:01:56 +00:00
M M Arif
3b84ec46d1 Fix of views being gone randomly 2020-04-13 12:48:23 +05:00
opyale
4123e03f7d Applying changes of LabelWidthCalculator to LabelsAdapter. (#398) 
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>
 2020-04-13 07:25:39 +00:00
M M Arif
3a524c9f5d Remember-login-type (#394) 
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
 2020-04-12 19:15:20 +00:00
M M Arif
e709aba3c2 Remember login type (#392) 
Merge branch 'master' into 372-remember-login-type

Remember login type

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/392
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-12 19:04:02 +00:00
M M Arif
14bca1f4c4 Merge pull request 'Adding more reliable calculation of label width.' (#393) from opyale/GitNex:label-width-calc into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/393
Reviewed-by: M M Arif <mmarif@swatian.com>
 2020-04-12 18:53:44 +00:00
opyale
a7213add30 Adding more reliable calculation of label width. 2020-04-12 20:33:41 +02:00
opyale
df2bc91e9f Setting Manrope as default font. (#379) 
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>
 2020-04-12 15:19:33 +00:00
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
M M Arif
adb8a8bf04 Fix fab hide scroll issue and clean up (#381) 
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>
 2020-04-11 20:17:24 +00:00
M M Arif
398cceed2f Merge pull request 'Close/reopen milestone' (#386) from 329-close-open-milestone into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/386
Reviewed-by: 6543 <6543@noreply.gitea.io>
 2020-04-11 06:59:40 +00:00
6543
1acbd7dc9f Merge branch 'master' into 329-close-open-milestone 2020-04-11 06:44:30 +00:00
M M Arif
f5d5264ef7 Implement auto switcher for light and dark theme (#388) 
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>
 2020-04-11 06:06:39 +00:00
M M Arif
0caaa63b06 Close/reopen milestone 2020-04-08 23:31:27 +05:00
M M Arif
79944241fe Merge pull request 'Minor improvement and fixes for repo info tab' (#382) from fixes-repo-info into master 
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/382
 2020-04-07 21:23:38 +00:00