Commit graph

9185 commits

Author SHA1 Message Date
Tobias Kaminsky
f967d08298
Update lint-up-wrapper.sh
lint is currently not updating master.html, so adding this to debug.
2017-12-11 14:59:17 +01:00
Andy Scherzinger
05c9a3cf9c
Merge pull request #1843 from nextcloud/fix-service-start
Only retry jobs if we cn do it
2017-12-11 13:36:48 +01:00
Mario Danic
dcc31bb7ca
Simplify
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-11 12:49:29 +01:00
Mario Danic
f74f9a1061
Update
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-11 12:49:28 +01:00
Mario Danic
ed93595112
Only retry jobs if we cn do it
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-11 12:49:28 +01:00
Tobias Kaminsky
34143f4e0f
Merge pull request #1846 from nextcloud/resizedImages_walledGarden
Fix walledGarden with resized images
2017-12-11 10:35:15 +01:00
tobiasKaminsky
05dbcab908
fix walledGarden with resized images 2017-12-11 09:48:41 +01:00
Nextcloud bot
88b24c391b
[tx-robot] updated from transifex 2017-12-11 08:40:51 +00:00
Tobias Kaminsky
dcf6c286fe
Merge pull request #1845 from nextcloud/translation
re-add translation
2017-12-11 07:55:34 +01:00
nextcloud-android-bot
39edf01d3a Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-12-11 06:46:22 +00:00
Tobias Kaminsky
7590afbbdf Merge 54e973e58c into 0f97af26b9 2017-12-11 06:41:38 +00:00
tobiasKaminsky
54e973e58c
re-add translation 2017-12-11 07:39:49 +01:00
Nextcloud bot
0f97af26b9
[tx-robot] updated from transifex 2017-12-11 01:38:42 +00:00
Tobias Kaminsky
4ab3d540e5 daily dev 20171211 2017-12-11 00:48:57 +01:00
Andy Scherzinger
a4bab355d7
Merge pull request #1823 from nextcloud/removeUnusedTranslations
Remove unused translations from values/strings.xml
2017-12-10 22:18:38 +01:00
Nextcloud bot
7a9f4d0de1
[tx-robot] updated from transifex 2017-12-09 01:38:13 +00:00
Tobias Kaminsky
76495fd01c daily dev 20171209 2017-12-09 00:44:11 +01:00
Nextcloud bot
9ed0f5a64c
[tx-robot] updated from transifex 2017-12-08 14:01:44 +00:00
Tobias Kaminsky
7602761673
Update buildDev
forgot push after commit
2017-12-08 11:39:48 +01:00
Tobias Kaminsky
3e0aef488c daily dev 20171208 2017-12-08 11:30:38 +01:00
Nextcloud bot
4d92a3fd0f
[tx-robot] updated from transifex 2017-12-08 01:37:21 +00:00
Nextcloud bot
59801bb551
[tx-robot] updated from transifex 2017-12-07 01:38:06 +00:00
Andy Scherzinger
f043232af0
Merge pull request #1672 from nextcloud/detect-walled-garden
Detect walled garden
2017-12-06 19:03:18 +01:00
Andy Scherzinger
00104aa263
Merge pull request #1655 from nextcloud/fix-syncing
Fix syncing
2017-12-06 18:56:48 +01:00
tobiaskaminsky
303ef83c4e
use latest stable lib 2017-12-06 14:07:29 +01:00
tobiaskaminsky
2e4c49202f
fixed it for plain http connections 2017-12-06 13:13:03 +01:00
Mario Danic
c3889f2afc
Fix casting
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-06 13:13:03 +01:00
tobiaskaminsky
626f2b68a2
use own route for NC13 and parse status.php for NC12 2017-12-06 13:13:03 +01:00
Mario Danic
cbea9bde94
Fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-06 13:12:46 +01:00
Mario Danic
9924bcc50e
Fix bug
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-06 13:12:46 +01:00
Mario Danic
ca348a6880
Fix a typo
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-06 13:12:46 +01:00
Mario Danic
d190b21cae
Detect walled garden
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-06 13:12:45 +01:00
Nextcloud bot
8a8e8428e2
[tx-robot] updated from transifex 2017-12-06 01:38:40 +00:00
Tobias Kaminsky
44fdff8c4c
Update CONTRIBUTING.md
no dev version, built from master
2017-12-05 12:11:33 +01:00
Andy Scherzinger
f4a481140f
Merge pull request #1675 from nextcloud/update-android-job-again
Update Android job
2017-12-05 11:42:05 +01:00
Tobias Kaminsky
d41a9bec8d
Merge branch 'master' into update-android-job-again 2017-12-05 11:19:19 +01:00
Nextcloud bot
445b3a1c2b
[tx-robot] updated from transifex 2017-12-05 01:38:28 +00:00
nextcloud-android-bot
573c11d7bb Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-12-04 18:13:46 +00:00
Mario Đanić
6dd47b2dc5 Merge 7159838b41 into bffa619b28 2017-12-04 18:08:59 +00:00
AndyScherzinger
7159838b41
fix lint warnings 2017-12-04 19:08:11 +01:00
AndyScherzinger
7aaf4954bc
Update android gradle to 3.0.1 2017-12-04 19:08:10 +01:00
AndyScherzinger
f08675382a
Fix Imports from UploadUtils to PowerUtils 2017-12-04 19:08:10 +01:00
Mario Danic
ba7ee747d3
NPE fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:10 +01:00
Mario Danic
2d5d8cc1ca
Fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:09 +01:00
Mario Danic
803bf2194e
Oh well
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:09 +01:00
Mario Danic
61cbe88bd0
Fix the way we schedule stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:09 +01:00
Mario Danic
8253595b8a
Fix stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:08 +01:00
Mario Danic
d12af2a342
Update Android job
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-12-04 19:08:00 +01:00
Andy Scherzinger
bffa619b28
Merge pull request #1820 from nextcloud/sql
Prevent sql injections
2017-12-04 09:19:24 +01:00
Tobias Kaminsky
4f9c397ea4 daily dev 20171204 2017-12-04 09:09:06 +01:00