Commit graph

7346 commits

Author SHA1 Message Date
Mario Đanić
45d305afd6 Merge pull request #982 from nextcloud/newLint
Use lint checker
2017-05-12 15:42:52 +02:00
Mario Đanić
5aaad6a723 Merge pull request #986 from nextcloud/sharingBug
Do nothing if sharee already exists
2017-05-12 15:41:46 +02:00
Mario Danic
6906eab645 Few fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-12 15:20:42 +02:00
Andy Scherzinger
b2405c4517 Merge pull request #987 from nextcloud/privacy
Privacy webview
2017-05-12 14:50:28 +02:00
tobiasKaminsky
854a3c026c
added privacy webview
restructured setup.xml
adapted modified/setup.xml to general/setup.xml
2017-05-12 12:43:36 +02:00
tobiasKaminsky
c341c8d204
workaround: do nothing if sharee already exists 2017-05-12 10:54:50 +02:00
Nextcloud bot
8ec2a1de46
[tx-robot] updated from transifex 2017-05-12 00:22:16 +00:00
tobiaskaminsky
141aac2862
sign 2017-05-11 20:19:58 +02:00
tobiaskaminsky
989c463b9c
enable tests again 2017-05-11 20:19:40 +02:00
nextcloud-android-bot
11212017fe Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-11 18:10:07 +00:00
Tobias Kaminsky
94bceebb06 Merge 4b2c5af73a into 2d94a9898c 2017-05-11 18:05:58 +00:00
tobiaskaminsky
4b2c5af73a
restart drone.io, again 2017-05-11 20:05:49 +02:00
tobiaskaminsky
2a78dad8bc
restart drone.io 2017-05-11 20:02:33 +02:00
tobiaskaminsky
bacb77257e
[skip ci] dummy change 4 2017-05-11 16:05:04 +02:00
tobiaskaminsky
cd32f58a2c
[skip ci] dummy change 3 2017-05-11 16:02:56 +02:00
tobiaskaminsky
579c7c6a3d
[skip ci] dummy change 2 2017-05-11 16:00:23 +02:00
tobiaskaminsky
a32f65371e
[skip ci] dummy change 2017-05-11 15:49:09 +02:00
nextcloud-android-bot
e78dfdb00a Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-11 13:25:12 +00:00
Tobias Kaminsky
97b9fa39c7 Merge c9498d66b8 into 2d94a9898c 2017-05-11 12:58:57 +00:00
tobiaskaminsky
c9498d66b8
push to right branch 2017-05-11 14:58:34 +02:00
tobiaskaminsky
8d1621bc44
travis -> drone 2017-05-11 14:47:06 +02:00
tobiaskaminsky
82784a8a54
use branch, user, pass 2017-05-11 14:42:29 +02:00
tobiaskaminsky
80dfc59d50
after all other flavours 2017-05-11 14:25:42 +02:00
tobiaskaminsky
5e1e5a88e6
use lint checker 2017-05-11 13:59:54 +02:00
Mario Đanić
2d94a9898c Merge pull request #977 from nextcloud/enable-folder-favorite-action
Add support for folder favorite action
2017-05-11 11:53:16 +02:00
Mario Danic
4e122a9124 Fix issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-11 11:50:46 +02:00
Mario Đanić
192e4d6213 Merge pull request #928 from nextcloud/fix_bug_previewmedia
Fix bug #888
2017-05-11 11:40:57 +02:00
tobiasKaminsky
39bf45da64
revert this, although it will get removed by a different PR 2017-05-11 11:36:41 +02:00
Mario Đanić
99114a2c72 Merge pull request #972 from nextcloud/hideContactsBackupFolder
Hide contacts backup folder
2017-05-11 11:32:15 +02:00
Tobias Kaminsky
888ee65b77 Merge pull request #978 from ka7/feature/spelling
spelling fixes
2017-05-11 09:36:36 +02:00
klemens
f30cbca78c spelling fixes 2017-05-10 21:04:47 +02:00
Mario Danic
d3ea3a8ccf Add support for folder favorite action
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-10 19:54:40 +02:00
Nextcloud bot
db7e5fae89
[tx-robot] updated from transifex 2017-05-10 00:24:22 +00:00
alejandro
e101785ce2 Show hidden files after enable it 2017-05-09 17:44:12 -05:00
alejandro
28dfecc6d9 Fix Issue #970 2017-05-09 17:43:00 -05:00
Mario Đanić
d897b38dd8 Merge pull request #958 from nextcloud/newDrone
use drone for all flavours
2017-05-09 14:01:58 +02:00
Mario Đanić
378fd9b8df Merge pull request #960 from nextcloud/preventUsingDestroyedActivity
prevent using destroyed activity
2017-05-09 14:01:28 +02:00
Nextcloud bot
e7fa4d24e5
[tx-robot] updated from transifex 2017-05-09 00:22:33 +00:00
Mario Danic
e90b3288f3 Fix push things
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-08 15:47:20 +02:00
Nextcloud bot
5dc5863af3
[tx-robot] updated from transifex 2017-05-08 00:21:53 +00:00
Nextcloud bot
db660e12d5
[tx-robot] updated from transifex 2017-05-07 00:21:47 +00:00
tobiasKaminsky
b8197ee993
prevent using destroyed activity 2017-05-06 12:25:05 +02:00
Nextcloud bot
ada1d9e9ab
[tx-robot] updated from transifex 2017-05-06 00:21:25 +00:00
tobiasKaminsky
6266937aff
use drone for all flavours
use only on master and PR push
use google stuff only on gplay, modified
2017-05-05 16:08:14 +02:00
Nextcloud bot
2705f3e116
[tx-robot] updated from transifex 2017-05-05 00:21:30 +00:00
Tobias Kaminsky
12ae31601a Merge pull request #950 from nextcloud/codacyCleanUps
further codacy clean ups
2017-05-04 15:53:29 +02:00
Tobias Kaminsky
d1a68cc834 Merge pull request #947 from nextcloud/externalStorage
Enhance external Sdcard usage
2017-05-04 15:51:03 +02:00
Mario Đanić
413147018f Merge pull request #951 from nextcloud/contactBackupReturn
ContactList: handle back press correct
2017-05-04 14:54:50 +02:00
Mario Đanić
9fb6b1ca37 Merge pull request #952 from nextcloud/wrongTitle
show correct title when switching to "on device"
2017-05-04 14:53:48 +02:00
tobiasKaminsky
89bc1552b9
Merge remote-tracking branch 'origin/externalStorage' into externalStorage2 2017-05-04 14:29:54 +02:00