mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
8604 commits 219 branches 1587 tags 639 MiB
Commit graph

8604 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
59dd036bfc
[tx-robot] updated from transifex 2017-09-06 00:28:00 +00:00
Andy Scherzinger
e0ebbec0a1 Merge pull request #1485 from srkunze/srkunze-patch-1 
Update SETUP.md
 2017-09-05 21:01:47 +02:00
Sven R. Kunze
71ab131bfe Update SETUP.md 2017-09-05 19:50:06 +02:00
Andy Scherzinger
0d332f3e7f Merge pull request #1489 from nextcloud/updateDarkThemeComputing 
Update dark theme computing
 2017-09-05 12:12:56 +02:00
Andy Scherzinger
ffe526d670 Merge pull request #1470 from nextcloud/PullApproveResetByPushFalse 
don't reset approvals on push
 2017-09-05 10:02:29 +02:00
Andy Scherzinger
3bc6d8d00c Merge pull request #1473 from nextcloud/200RC6 
Release 2.0.0RC6
 2017-09-05 09:56:25 +02:00
Andy Scherzinger
8e9a633d22
don't reset approvals on push 2017-09-05 09:49:52 +02:00
Mario Đanić
be1e087a6c Merge pull request #1480 from nextcloud/fixEmptyMessageOnRefresh 
resolves #1477 properly showing empty message after refresh when all …
 2017-09-05 09:32:32 +02:00
AndyScherzinger
d5446d56d9
release 2.0.0RC6 2017-09-05 09:23:20 +02:00
tobiaskaminsky
da4ad3fc25
update dark theme computing 2017-09-05 08:06:30 +02:00
AndyScherzinger
1fa2148d19
resolves #1477 2017-09-05 07:55:58 +02:00
Tobias Kaminsky
deb8af7323 Merge pull request #1492 from nextcloud/docker-image-23 
Bump docker image
 2017-09-05 07:50:09 +02:00
tobiaskaminsky
8f48c9eed8
bump docker image 2017-09-05 07:34:30 +02:00
Nextcloud bot
3c174d12d5
[tx-robot] updated from transifex 2017-09-05 00:27:36 +00:00
Mario Đanić
d57319fd64 Merge pull request #1488 from nextcloud/gradle300beta4 
Update to gradle:3.0.0-beta4
 2017-09-04 16:32:06 +02:00
AndyScherzinger
603fc616f7
update to gradle:3.0.0-beta4 2017-09-04 10:02:09 +02:00
Nextcloud bot
f726f022ab
[tx-robot] updated from transifex 2017-09-04 00:27:59 +00:00
Sven R. Kunze
35e7b85ded Update SETUP.md 
couldn't pull upstream:

Permission denied (publickey).
fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
 2017-09-03 19:59:47 +02:00
Nextcloud bot
beedd5b05a
[tx-robot] updated from transifex 2017-09-02 00:28:27 +00:00
Tobias Kaminsky
fd80852685 Merge pull request #1476 from nextcloud/comradekingu-patch-1 
Fix duplicate string in contribute UI
 2017-09-01 15:31:05 +02:00
Allan Nordhøy
dd80e534f6
Fix duplicate string in contribute UI 2017-09-01 09:15:20 +02:00
Nextcloud bot
c33c275470
[tx-robot] updated from transifex 2017-09-01 00:28:42 +00:00
Andy Scherzinger
53a870b5a5 Merge pull request #1465 from nextcloud/avoidMasterUpdates 
Lint: only upload new master on decrease of warning/error
 2017-08-31 15:37:54 +02:00
tobiaskaminsky
6c7e240f44
only upload new master on decrease of warning/error 2017-08-31 14:10:07 +02:00
Andy Scherzinger
bb24a1f4b9 Merge pull request #1467 from nextcloud/userInfo 
Use same String for Intent
 2017-08-31 14:08:59 +02:00
tobiaskaminsky
b499bce225
use same String for Intent 2017-08-31 13:38:10 +02:00
Andy Scherzinger
07bc07d4d9 Merge pull request #1462 from nextcloud/NpeInVirtuals 
Fix NPE in virtuals
 2017-08-31 13:32:18 +02:00
tobiaskaminsky
d3754d156a
revert creating object in loop 2017-08-31 13:03:40 +02:00
tobiaskaminsky
853350221f
- use nullable 
- only add non-null object to list
 2017-08-31 13:03:40 +02:00
Tobias Kaminsky
ac58ee007b Merge pull request #1463 from nextcloud/fixSnackbarOnWebLogin 
Fix Snackbar on wrong login with old server
 2017-08-31 12:58:26 +02:00
tobiaskaminsky
9174397939
- switch if branch for easier readability 
- show snackbar only for webview (for old login there is a decent error warning)
 2017-08-31 09:37:31 +02:00
Tobias Kaminsky
43747c8e76 Update lint-results.txt 
Manually changed lint as google released new support lib and thus 3 new warnings occur.
 2017-08-31 09:08:04 +02:00
Nextcloud bot
713fd35aaf
[tx-robot] updated from transifex 2017-08-31 00:28:43 +00:00
Nextcloud bot
7799336a79
[tx-robot] updated from transifex 2017-08-30 00:28:59 +00:00
Nextcloud bot
0007fbe795
[tx-robot] updated from transifex 2017-08-29 00:29:36 +00:00
tobiasKaminsky
16584da0ed also extract this one... 2017-08-28 14:54:31 +02:00
tobiasKaminsky
6447eebb3d extract string ressource 2017-08-28 14:54:31 +02:00
tobiasKaminsky
4acbeee05f show snackbar after 60s to redirect to old login 2017-08-28 14:54:31 +02:00
tobiasKaminsky
d04da84a16 url returned by new weblogin flow is url encoded 2017-08-28 14:54:31 +02:00
tobiasKaminsky
081525bc9e restart weblogin flow if auth failed 2017-08-28 14:54:31 +02:00
Nextcloud bot
7818cbfca3
[tx-robot] updated from transifex 2017-08-28 11:02:48 +00:00
Nextcloud bot
de74c6b974
[tx-robot] updated from transifex 2017-08-28 10:52:46 +00:00
AndyScherzinger
a89a46a417 resolves #1398 fix NPE if error occurs retrieving the parents from the server 2017-08-28 12:40:57 +02:00
Mario Đanić
d94274c8a7 Merge pull request #1437 from nextcloud/fixDialogBadTokenException 
Fix dialog bad token exception
 2017-08-28 10:34:07 +02:00
Mario Đanić
89d6e6ab6c Merge pull request #1438 from nextcloud/allowBackButtonCancelDialog 
Add ability to cancel dialog via back button
 2017-08-28 10:32:09 +02:00
Mario Đanić
b0489d70db Merge pull request #1440 from nextcloud/fixUserInfoUIThreadCrash 
RunUI operations in the UI thread
 2017-08-28 10:31:26 +02:00
Mario Đanić
1c5b9cc53f Merge pull request #1446 from srkunze/patch-1 
Update SETUP.md
 2017-08-28 10:30:08 +02:00
Sven R. Kunze
07fe6e50d1 Update SETUP.md 
typo
 2017-08-27 11:08:55 +02:00
AndyScherzinger
d5db3d43ff
resolves #1439 - by runnign the UI operations in the UI thread (anything else will crash, like seen on GPlay) 2017-08-26 19:46:42 +02:00
AndyScherzinger
164711f40b
resolves #1434 - adding the ability to cancel the dialog via calncel-button and HW/SW-back-button 2017-08-26 19:20:16 +02:00