Commit graph

10999 commits

Author SHA1 Message Date
Tobias Kaminsky
0bc7924232 daily dev 20180619 2018-06-19 00:32:49 +02:00
Nextcloud bot
7b88bd8a60
[tx-robot] updated from transifex 2018-06-18 00:46:43 +00:00
Nextcloud bot
81e73be7f0
[tx-robot] updated from transifex 2018-06-17 00:50:39 +00:00
Nextcloud bot
11989d47f9
[tx-robot] updated from transifex 2018-06-16 00:51:19 +00:00
Tobias Kaminsky
2d10e878a7 daily dev 20180616 2018-06-16 00:33:01 +02:00
Andy Scherzinger
c7ecc22269
Merge pull request #2716 from nextcloud/fixLib
fix wrong library from https://github.com/nextcloud/android/pull/2685
2018-06-15 13:23:15 +02:00
tobiasKaminsky
c95ca8a801
fix wrong library from https://github.com/nextcloud/android/pull/2685
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-15 12:39:30 +02:00
Tobias Kaminsky
9a5a6f5596
Merge pull request #2685 from nextcloud/versions
Add support for file versions
2018-06-15 11:56:17 +02:00
tobiasKaminsky
9d7f5b226e
fix unit test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-15 11:51:18 +02:00
Nextcloud bot
6657bb061b
[tx-robot] updated from transifex 2018-06-15 00:48:23 +00:00
tobiasKaminsky
818ec6473e
- removed m prefix
- in background for file deletion
- download new file version if file was previously downloaded
- show snackbar on success
- cleanup

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:19 +02:00
AndyScherzinger
ddde216a4c
use tools attribute for AS rendering close to real data 2018-06-14 23:44:19 +02:00
AndyScherzinger
de4c27aa2e
Minor CR changes 2018-06-14 23:44:19 +02:00
AndyScherzinger
cc0bdc726e
fix lint: remove unused string 2018-06-14 23:44:18 +02:00
AndyScherzinger
cf265e16d8
fix codacy 2018-06-14 23:44:18 +02:00
tobiasKaminsky
83f6dc0686
changes due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:17 +02:00
tobiasKaminsky
5b9c442139
changes due to codacy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:17 +02:00
tobiasKaminsky
25075069c9
c&p error
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:16 +02:00
tobiasKaminsky
529488a9af
show error message
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:16 +02:00
tobiasKaminsky
4da8a94a75
delete local file on restore
refresh file list / activity list on succesfull restore

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:15 +02:00
tobiasKaminsky
86da82f7b7
changes due to codacy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:15 +02:00
tobiasKaminsky
74b832c958
remove local copy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:14 +02:00
tobiasKaminsky
075b0f52b8
Add file version to activity stream
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:14 +02:00
tobiasKaminsky
941ab7c023
fix not needed try/catch blocks
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:13 +02:00
tobiasKaminsky
78055cbf21
add avatar icons on sharee list
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 23:44:13 +02:00
AndyScherzinger
7df8a18d6b
butterknife for details fragment + proper empty content handling 2018-06-14 23:44:12 +02:00
Andy Scherzinger
b3d3d3c047
Merge pull request #2700 from nextcloud/emailShare
Iteration 4 for File detail & new sharing - email share
2018-06-14 23:38:08 +02:00
Andy Scherzinger
5bb48d0a69
revert back to master lib 2018-06-14 23:34:17 +02:00
Andy Scherzinger
2f68a6ef85
Merge pull request #2706 from nextcloud/preferencesCrash
Crash on preferences: NPE check
2018-06-14 23:31:43 +02:00
Andy Scherzinger
2c4f859e6d
Merge pull request #2704 from nextcloud/changelog320
3.2.0 Changelog added
2018-06-14 23:31:15 +02:00
AndyScherzinger
4ac524e244
adjust javaDoc 2018-06-14 15:32:04 +02:00
AndyScherzinger
8d924a720e
display email icon for email addresses in the suggestions for share searches 2018-06-14 15:32:03 +02:00
AndyScherzinger
c0e116a298
simplify if-clauses 2018-06-14 15:32:03 +02:00
AndyScherzinger
16e6e75a45
codacy: organize imports 2018-06-14 15:32:02 +02:00
tobiasKaminsky
f8bc830f9b
user lib branch
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 15:32:02 +02:00
tobiasKaminsky
3a08be4406
add sharing to email
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-14 15:31:58 +02:00
Nextcloud bot
1fc02c03ff
[tx-robot] updated from transifex 2018-06-14 00:49:46 +00:00
tobiasKaminsky
57f901bee6
bump version to 3.3.0 alpha1
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-13 16:48:17 +02:00
tobiasKaminsky
82679c70f2
NPE check
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-13 16:39:20 +02:00
Andy Scherzinger
0bfdc45811
3.2.0 Changelog added 2018-06-13 12:42:24 +02:00
Nextcloud bot
d65050b303
[tx-robot] updated from transifex 2018-06-13 00:47:58 +00:00
Tobias Kaminsky
73091d7718 daily dev 20180613 2018-06-13 00:32:58 +02:00
Tobias Kaminsky
6c12b573ac
Merge pull request #2671 from nextcloud/fileDetails-3
Iteration 3 for file detail & new sharing
2018-06-12 09:27:40 +02:00
AndyScherzinger
62b85e49e2
revert to master lib branch 2018-06-12 08:31:55 +02:00
AndyScherzinger
29fcc56865
Fix CR 2018-06-12 08:28:46 +02:00
AndyScherzinger
1b22eadec0
fix save of share is_password_protected single share persistence 2018-06-12 08:28:46 +02:00
AndyScherzinger
3cbec23774
adding is_password_protected column for shares for initial DB setup 2018-06-12 08:28:45 +02:00
AndyScherzinger
62a53dc3e5
rewrite of sharing logic/persistence to store and use the fact if a share(mail) is password protected 2018-06-12 08:28:45 +02:00
AndyScherzinger
7e5655ce67
use lib branch with updated OCShare file 2018-06-12 08:28:35 +02:00
nextcloud-android-bot
0a087b7328 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2018-06-12 00:56:06 +00:00