Commit graph

6445 commits

Author SHA1 Message Date
Mario Danic
ca674dd8a0
Set proper message 2017-02-23 10:21:43 +01:00
Mario Danic
6a510d96c0
Work on a new approach 2017-02-23 10:21:42 +01:00
Mario Danic
ba0dace51f
Add icon 2017-02-23 10:21:42 +01:00
Andy Scherzinger
b83cbc20a9 Merge pull request #675 from nextcloud/renameBetaToNightly
Contributing.md: rename beta to nightly
2017-02-23 10:08:47 +01:00
Nextcloud bot
0e9ac45ee4
[tx-robot] updated from transifex 2017-02-23 01:31:21 +00:00
tobiasKaminsky
9f9df66a24
beta --> nightly 2017-02-22 17:41:44 +01:00
Nextcloud bot
22ed0385f1
[tx-robot] updated from transifex 2017-02-22 01:23:31 +00:00
Nextcloud bot
9767f16eb9
[tx-robot] updated from transifex 2017-02-21 01:20:15 +00:00
Mario Đanić
db090eff0c Merge pull request #662 from nextcloud/fix-broad
Set package name on all sticky intents
2017-02-20 20:21:03 +01:00
Mario Danic
bc0bbd7842
Revert "Update one more broadcast"
This reverts commit 7abc8f12469cead1394167abe63716cf5e24afe0.

# Conflicts:
#	src/com/owncloud/android/datamodel/FileDataStorageManager.java
2017-02-19 19:24:13 +01:00
Mario Danic
db0620bab4
Add missing ; 2017-02-19 19:24:13 +01:00
Mario Danic
f3c735050d
Update one more broadcast 2017-02-19 19:24:12 +01:00
Mario Danic
7529084f82
Set package name on all sticky intents 2017-02-19 19:24:12 +01:00
Andy Scherzinger
c905d7b3bf Merge pull request #663 from nextcloud/updateLabelAndBetaDesc
Renamed PR labels (#657)
2017-02-19 18:49:53 +01:00
Nextcloud bot
5de187076c
[tx-robot] updated from transifex 2017-02-17 01:19:23 +00:00
Nextcloud bot
d6fa224ffc
[tx-robot] updated from transifex 2017-02-16 01:19:20 +00:00
tobiasKaminsky
6c9d32fad0
- #657 renamed PR labels
- better description of beta process
2017-02-15 18:28:09 +01:00
Nextcloud bot
f8d54b47e6
[tx-robot] updated from transifex 2017-02-15 01:18:10 +00:00
Nextcloud bot
714b1602e2
[tx-robot] updated from transifex 2017-02-14 01:18:39 +00:00
Mario Đanić
7dc1fe40e3 Merge pull request #652 from nextcloud/rejectPR
A single rejection rejects the PR
2017-02-13 10:53:59 +01:00
Mario Đanić
bfb0fdf763 Merge pull request #649 from carstendev/rotation-crash-fix
Fix for #448. Rotation change in FolderPicker caused app crash.
2017-02-13 10:34:16 +01:00
tobiasKaminsky
4f51fe6c92
A single rejection rejects the PR 2017-02-13 09:03:31 +01:00
Nextcloud bot
52be815204
[tx-robot] updated from transifex 2017-02-13 01:17:51 +00:00
carstendev
d038fd7260 Fix for #448. Rotation change in FolderPicker caused app crash. 2017-02-12 04:48:10 +01:00
Nextcloud bot
5a9be795ae
[tx-robot] updated from transifex 2017-02-12 01:17:49 +00:00
Nextcloud bot
0acc0d8784
[tx-robot] updated from transifex 2017-02-11 01:18:09 +00:00
Nextcloud bot
19c61f6827
[tx-robot] updated from transifex 2017-02-09 01:17:41 +00:00
Nextcloud bot
59b280c86d
[tx-robot] updated from transifex 2017-02-07 01:20:00 +00:00
Tobias Kaminsky
0cce95efa8 Merge pull request #610 from nextcloud/backport-userinfo-lib-compatibility
Quick fix to work with new library updates
2017-02-06 19:52:14 +01:00
Nextcloud bot
0051b66acd
[tx-robot] updated from transifex 2017-02-06 01:17:08 +00:00
AndyScherzinger
e2a3da33ba
lib version 1.0.11 2017-02-05 22:17:17 +01:00
Mario Danic
75ba848999
Use master snapshot 2017-02-05 22:17:17 +01:00
Mario Danic
ba5dae93b4
Quick fix to work with new library updates 2017-02-05 22:17:13 +01:00
Andy Scherzinger
a81aad613b Merge pull request #401 from justin-sleep/upstream
Fix DavDroid integration (append necessary addition to mURI)
2017-02-05 22:08:48 +01:00
justin-sleep
b5ca2cdc90
Set DAV path in AccountUtils and retrieve it when calling DAVdroid 2017-02-05 21:45:20 +01:00
justin-sleep
66b6436d2b
Use proper API to get WebDAV path for DAVdroid URI correction 2017-02-05 21:45:19 +01:00
justin-sleep
ef1a56f844
Fix DavDroid integration (append necessary addition to mURI) 2017-02-05 21:45:14 +01:00
Nextcloud bot
7d8ee95467
[tx-robot] updated from transifex 2017-02-05 15:15:47 +00:00
Nextcloud bot
a121e70090
[tx-robot] updated from transifex 2017-02-05 01:17:30 +00:00
Nextcloud bot
1164fd1f40
[tx-robot] updated from transifex 2017-02-04 01:18:40 +00:00
Nextcloud bot
61d578ecc4
[tx-robot] updated from transifex 2017-02-03 18:55:43 +00:00
Nextcloud bot
80059c418b
[tx-robot] updated from transifex 2017-02-03 01:17:53 +00:00
Nextcloud bot
eaaa5dbcd8
[tx-robot] updated from transifex 2017-02-01 17:23:43 +00:00
Nextcloud bot
4c82c42209
[tx-robot] updated from transifex 2017-02-01 11:30:43 +00:00
Nextcloud bot
81482f03b4
[tx-robot] updated from transifex 2017-02-01 11:01:43 +00:00
Nextcloud bot
e215e665e2
[tx-robot] updated from transifex 2017-02-01 01:17:24 +00:00
Mario Đanić
bb22b9d50b Merge pull request #605 from nextcloud/bug_597
Don't restore from unknown state for migration. Fixes #597
2017-01-31 09:21:16 +01:00
Nextcloud bot
3a86512b99
[tx-robot] updated from transifex 2017-01-31 01:36:12 +00:00
Andy Scherzinger
668229a2ed Merge pull request #524 from mario/improvement-toggle-favourite-only-relevant-files
Avoid toggling favourite for all selected files
2017-01-30 20:23:22 +01:00
Bartosz Przybylski
5a647cf094 Don't restore from unknown state for migration. Fixes #597 2017-01-30 17:38:22 +01:00