AndyScherzinger
|
7d4669a71f
|
don't clear list when adding next page of activities to make it an endless scrolling list
|
2017-12-12 09:31:39 +01:00 |
|
Joas Schilling
|
e58042d6aa
|
Load more activities when reaching the end of the stream
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-12-12 09:31:30 +01:00 |
|
Tobias Kaminsky
|
de2140c4c5
|
Merge pull request #1851 from nextcloud/signApk
dev version: use absolute paths due to cronjob
|
2017-12-12 08:01:01 +01:00 |
|
Tobias Kaminsky
|
74786b8429
|
Merge branch 'master' into signApk
|
2017-12-12 08:00:51 +01:00 |
|
tobiasKaminsky
|
33d84308e9
|
use absolute paths due to cronjob
|
2017-12-12 07:58:25 +01:00 |
|
Tobias Kaminsky
|
d69fd2a981
|
daily dev 20171212
|
2017-12-12 00:49:16 +01:00 |
|
Andy Scherzinger
|
5de4cbc825
|
Merge pull request #1830 from nextcloud/resizedImagesNewEndpoint
Get rid of gallery API and use internal one
|
2017-12-11 23:10:06 +01:00 |
|
tobiaskaminsky
|
aed532d408
|
get rid of gallery API and use internal one
|
2017-12-11 23:03:45 +01:00 |
|
Mario Đanić
|
3c45e99ca1
|
Merge pull request #1825 from nextcloud/setPictureAs
"set picture as" with resized images
|
2017-12-11 22:21:40 +01:00 |
|
tobiaskaminsky
|
297c6024bc
|
- replace Toast with Snackbar
- remove not used code
|
2017-12-11 21:57:54 +01:00 |
|
tobiaskaminsky
|
e93eb51ffe
|
"set picture as" with resized images
|
2017-12-11 21:57:51 +01:00 |
|
Andy Scherzinger
|
f58edc5a0e
|
Merge pull request #1831 from nextcloud/externalLinksProperHandling
Better handling when switching to an account with disabled external links
|
2017-12-11 21:55:14 +01:00 |
|
tobiaskaminsky
|
acdd470c95
|
proper handling when switching to an account with disabled external links
|
2017-12-11 21:47:02 +01:00 |
|
Mario Đanić
|
f04220e6af
|
Merge pull request #1815 from nextcloud/oldLoginTimeout
revert timeout to 60s
|
2017-12-11 19:47:32 +01:00 |
|
Mario Đanić
|
ee5e2843d2
|
Merge pull request #1826 from nextcloud/shareViaLinkUseDisplayName
Share via link use display name
|
2017-12-11 19:46:25 +01:00 |
|
Mario Đanić
|
3e7f1fd68a
|
Merge pull request #1828 from nextcloud/devVersionChangelog
Change changelog for dev version to master commits as we do not have …
|
2017-12-11 19:45:47 +01:00 |
|
Mario Đanić
|
2f222f168e
|
Merge pull request #1847 from nextcloud/alwaysLint
always push lint results
|
2017-12-11 19:40:59 +01:00 |
|
Mario Đanić
|
ec0d397269
|
Merge pull request #1822 from nextcloud/contentProvider
Further hardening of Content Provider
|
2017-12-11 19:40:36 +01:00 |
|
tobiaskaminsky
|
e7ad1ddb4b
|
further hardening of Content Provider
|
2017-12-11 19:17:17 +01:00 |
|
tobiaskaminsky
|
3fab8fa913
|
change changelog for dev version to master commits as we do not have any special changelog anylonger
|
2017-12-11 19:04:47 +01:00 |
|
Mario Đanić
|
b11a77c44e
|
Merge pull request #1834 from nextcloud/sqlBugfix
File content provider: if selection and selectionArgs are null, let them pass
|
2017-12-11 16:27:25 +01:00 |
|
Mario Đanić
|
286e2ec217
|
Merge pull request #1844 from nextcloud/improve-autoupload
CRC32 magic
|
2017-12-11 16:21:10 +01:00 |
|
tobiasKaminsky
|
f9628a5f26
|
only rewrite error code 2 -> 0
|
2017-12-11 16:08:45 +01:00 |
|
nextcloud-android-bot
|
c6e0b0e7b2
|
Drone: update Lint results to reflect reduced error/warning count [skip ci]
|
2017-12-11 15:01:05 +00:00 |
|
Tobias Kaminsky
|
4d07a6f068
|
Merge 28579d5a0e into f967d08298
|
2017-12-11 14:43:28 +00:00 |
|
tobiasKaminsky
|
28579d5a0e
|
reduce one warning to have an updated master
|
2017-12-11 15:43:09 +01:00 |
|
tobiasKaminsky
|
4c3b2e65a2
|
always push lint results, either as new master or for PR/master commit
|
2017-12-11 15:14:35 +01:00 |
|
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 |
|
AndyScherzinger
|
96a2dd8e71
|
fix log statement
|
2017-12-11 13:42:16 +01:00 |
|
Mario Danic
|
27954c4287
|
Fix for the fix xD
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-12-11 13:42:16 +01:00 |
|
Mario Danic
|
ce7dbb437f
|
CRC32 magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-12-11 13:42:16 +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 |
|