ae0009f553
Merge remote-tracking branch 'remotes/main/master' into self-signed
...
# Conflicts:
# app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
2020-04-02 18:50:26 +02:00
7fe583c816
Move WebInterace Calls to own Interface ( #338 )
...
optimize imports
Merge branch 'master' into moveWebInteraceCalls-2-ownInterface
Merge branch 'master' into moveWebInteraceCalls-2-ownInterface
move WebInterface calls to own interface
rename WEB api for getting PullDiff
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/338
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-02 16:00:03 +00:00
70581cd330
Updates to settings screen
2020-04-02 20:49:26 +05:00
20ce31fed8
add eng mesage
2020-04-02 17:17:53 +02:00
f53f122a15
add saveUserName step on login
2020-04-02 17:17:00 +02:00
c6125f83c7
Merge remote-tracking branch 'remotes/main/master' into self-signed
...
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
# app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
2020-04-02 10:45:52 +02:00
8853b33c11
Merge pull request 'remove pointless if statements' ( #340 ) from 6543/GitNex:refactor1 into master
...
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/340
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-02 08:12:45 +00:00
733acd0e0b
Merge pull request 'Switch to bottomsheets for popup menus' ( #333 ) from 304-popup-menus-to-bottomsheets into master
...
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/333
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-02 08:05:56 +00:00
b9eee16294
Adding resources.
2020-04-02 03:12:44 +02:00
abdfe8d9d1
Adding option to delete certificates.
2020-04-02 02:59:00 +02:00
f4c4b837de
remove pointless if statements
2020-04-02 01:16:07 +02:00
ee0392e208
Very small improvements
2020-04-01 21:58:42 +02:00
b2f34f819c
Removing library and commenting out logger.
2020-04-01 18:58:52 +02:00
faaa4db88b
Removing option "ONCE"
2020-04-01 18:39:39 +02:00
4217db3e31
Add author to readme
2020-04-01 21:16:59 +05:00
d2f77cfcd0
Fix minor formattings, other improvements
2020-04-01 20:28:14 +05:00
9f6d8239f6
Adding author
2020-04-01 14:38:34 +02:00
0dda996444
Adding Picasso support for self-signed certificates.
2020-04-01 13:26:32 +02:00
c02d7f2df7
Merge branch 'master' of https://gitea.com/gitnex/GitNex into self-signed
2020-04-01 12:00:25 +02:00
9988649714
cleanup
2020-04-01 14:51:37 +05:00
1e52649b76
Added to labels, issue comment
2020-04-01 14:44:38 +05:00
ca37ad661d
Changed repos list menus to bottom sheets
2020-04-01 11:38:14 +05:00
11b8bb8d83
Merge pull request 'Add placeholders for images' ( #331 ) from improve-images-loading into master
...
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/331
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-01 06:09:02 +00:00
786ac3999a
Merge branch 'master' into improve-images-loading
2020-03-31 20:40:08 +00:00
e5a656ce57
Many improvements and bug fixes.
2020-03-31 22:09:42 +02:00
5fdbc98d6e
Text to resource.
2020-03-31 21:21:49 +02:00
b4996c0e6d
Even more reformatting.
2020-03-31 21:14:49 +02:00
28d97f2d67
Merge branch 'master' of https://gitea.com/gitnex/GitNex into self-signed
2020-03-31 21:10:47 +02:00
a53a5d55bf
Reformatting applied.
2020-03-31 21:04:53 +02:00
2125d38a66
Adding information at error and resetting button.
2020-03-31 21:04:08 +02:00
b46ad33dd3
Adjusting proportions of issue labels. ( #325 )
...
Merge remote-tracking branch 'remotes/main/master' into fab-issue
Adjusting sizes in LabelsAdapter
Adjusting proportions of issue labels.
Co-authored-by: anonTree1417 <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/325
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-03-31 18:53:36 +00:00
dd2339ec34
Small design changes ( #327 )
...
Merge remote-tracking branch 'remotes/main/master' into add-styling
Restoring branches_list.xml
Small design changes.
Co-authored-by: anonTree1417 <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/327
Reviewed-by: M M Arif <mmarif@swatian.com>
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-03-31 18:49:39 +00:00
0e365a6d49
Add placeholders for images
2020-03-31 23:46:42 +05:00
d1fe5bdda9
Merge branches 'add-styling', 'self-signed' and 'style-changes' of https://gitea.com/anonTree1417/GitNex into self-signed
2020-03-31 20:25:03 +02:00
5ee872dc6e
Merge remote-tracking branch 'remotes/main/master' into self-signed
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/res/values/strings.xml
2020-03-31 20:20:18 +02:00
d87bd3a8f7
Merge remote-tracking branch 'remotes/main/master' into add-styling
2020-03-31 20:09:06 +02:00
22010d953a
Adjusting sizes in LabelsAdapter
2020-03-31 18:43:52 +02:00
f12219ace7
Restoring branches_list.xml
2020-03-31 16:52:39 +02:00
d2190ad189
Moving classes to helpers/
2020-03-31 16:44:11 +02:00
e1ccb4e404
Fixed formatting.
2020-03-31 16:41:50 +02:00
39ad052ad5
Merge pull request 'Add Discord badge' ( #330 ) from 6543/GitNex:readme-discord into master
...
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/330
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-03-31 13:25:52 +00:00
0f9025f925
Merge pull request 'Repository Commits' ( #308 ) from 13-repo-commits into master
...
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/308
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-03-31 05:11:33 +00:00
60781ac4c3
Small design changes.
2020-03-31 05:14:24 +02:00
6b2be06eda
Adjusting proportions of issue labels.
2020-03-31 04:04:11 +02:00
c2505d66b5
Merge branch 'master' into 13-repo-commits
2020-03-30 23:12:07 +00:00
9f30299cfa
add Discord badge
2020-03-31 00:12:50 +02:00
2b6d22ed94
Modifying license headers.
2020-03-30 23:25:49 +02:00
aa697d11ad
Adding, customizing and modifying MemorizingTrustManager.
2020-03-30 23:01:54 +02:00
6e0880e6d8
Handle reserved names & patterns on repo creation ( #315 )
...
correct var names
working solution
code format ...
first draft
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/315
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-03-29 18:57:19 +00:00
0820dc3480
Merge branch 'master' into 13-repo-commits
...
# Conflicts:
# app/src/main/res/values/strings.xml
2020-03-29 19:27:56 +05:00
anonTree1417
6543
M M Arif
6543
anonTree1417