Commit graph

8516 commits

Author SHA1 Message Date
Nextcloud bot
bd09a09fbe
[tx-robot] updated from transifex 2017-08-22 00:28:46 +00:00
Nextcloud bot
9a9f40f1fb
[tx-robot] updated from transifex 2017-08-21 18:11:44 +00:00
Andy Scherzinger
8c5f5ced8b Merge pull request #1394 from nextcloud/fix-charging-req
Fix upload requirements
2017-08-21 19:58:00 +02:00
Mario Danic
5d9c7c4c6a Fix upload requirements
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-21 19:35:19 +02:00
Andy Scherzinger
93de4bdebd Merge pull request #1390 from nextcloud/npeContext
if context is null, try to get set it
2017-08-21 18:58:59 +02:00
tobiasKaminsky
964f463f43
if context is null, try to get set it 2017-08-21 18:40:09 +02:00
Andy Scherzinger
1ecf056967 Merge pull request #1388 from nextcloud/fixSyncedFolderPreferencesDialogFragment
Adding a fallback when setting the span text crashes
2017-08-21 18:34:09 +02:00
AndyScherzinger
dcece32f72
resolves #1387 by adding a fallback when setting the span text doesn't work 2017-08-21 14:04:23 +02:00
Andy Scherzinger
d975c420cb Merge pull request #1372 from nextcloud/hardenDBupgrade
Harden database upgrade
2017-08-21 12:54:45 +02:00
tobiaskaminsky
4284ce8c34
harden database upgrade 2017-08-21 11:46:39 +02:00
Nextcloud bot
30af2f8b67
[tx-robot] updated from transifex 2017-08-21 09:45:50 +00:00
Nextcloud bot
ff7aaa147d
[tx-robot] updated from transifex 2017-08-21 09:27:45 +00:00
Andy Scherzinger
7f72c786fa Merge pull request #1381 from nextcloud/comradekingu-patch-1
Spelling: Android, comma
2017-08-21 11:24:28 +02:00
AndyScherzinger
26fad60280
bump version to 2.0.0RC4 2017-08-21 10:00:01 +02:00
Allan Nordhøy
13a6aea2c4
Spelling: Android, comma 2017-08-21 09:50:38 +02:00
Andy Scherzinger
e1f82dd3f7 Merge pull request #1384 from nextcloud/hardenPopulateUserInfoUi
Hardening of UserInfoActivity.populateUserInfoUi
2017-08-21 09:49:50 +02:00
nextcloud-android-bot
9cf7a40ef7 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-21 07:08:03 +00:00
Andy Scherzinger
9798550cc8 Merge bda4d84fa2 into b18f6b394c 2017-08-21 06:56:43 +00:00
nextcloud-android-bot
bda4d84fa2
Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-21 08:56:21 +02:00
AndyScherzinger
d6bcb576e0
resolves #1382 #1383 by using ThemeUtils implementation 2017-08-21 08:56:13 +02:00
Nextcloud bot
b18f6b394c
[tx-robot] updated from transifex 2017-08-21 00:28:22 +00:00
Nextcloud bot
1a43b8f683
[tx-robot] updated from transifex 2017-08-20 00:28:10 +00:00
Nextcloud bot
29bfc1abeb
[tx-robot] updated from transifex 2017-08-19 00:29:16 +00:00
Nextcloud bot
fe093cc7d0
[tx-robot] updated from transifex 2017-08-18 14:29:51 +00:00
Tobias Kaminsky
44f2205552 Merge pull request #1375 from nextcloud/removeUnusedStrings
lint fixing
2017-08-18 16:27:49 +02:00
nextcloud-android-bot
553ae4d96b Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-18 14:17:41 +00:00
Andy Scherzinger
4123883db9 Merge 0e4d50347d into 99979abaf7 2017-08-18 13:43:51 +00:00
AndyScherzinger
0e4d50347d
revert visibility test change 2017-08-18 15:43:42 +02:00
AndyScherzinger
dc9c1cfbd4
lint: remove unused strings 2017-08-18 15:38:07 +02:00
AndyScherzinger
fcf132c529
lint: fix descriptions on user info graphics 2017-08-18 13:54:01 +02:00
Nextcloud bot
99979abaf7
[tx-robot] updated from transifex 2017-08-18 08:18:44 +00:00
Nextcloud bot
9ecc1a7710
[tx-robot] updated from transifex 2017-08-18 08:10:47 +00:00
Nextcloud bot
be0caadd67
[tx-robot] updated from transifex 2017-08-18 08:01:13 +00:00
Andy Scherzinger
efc0e0d119 Merge pull request #1368 from nextcloud/libBump
bump to newest lib .25
2017-08-18 09:57:57 +02:00
Tobias Kaminsky
efdcf47b11 Merge pull request #1360 from nextcloud/removeGCMagain
Add GCM to gplay/modified
2017-08-18 09:46:37 +02:00
Tobias Kaminsky
33af68536a Merge branch 'master' into removeGCMagain 2017-08-18 09:46:03 +02:00
Andy Scherzinger
91a948a8ce Merge pull request #1354 from nextcloud/statusIcons
Update to latest status icon design and fix syncronizing/failed icons
2017-08-18 09:42:22 +02:00
tobiaskaminsky
880d688340
bump to newest lib 2017-08-18 09:37:52 +02:00
nextcloud-android-bot
22ddf91154
Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-18 09:26:12 +02:00
AndyScherzinger
7be05b5e6a
update to latest status icon design and fix syncronizing and failed state icons 2017-08-18 09:25:47 +02:00
Tobias Kaminsky
7718a95990 Merge pull request #1346 from nextcloud/releaseBadge
Add release badge
2017-08-18 09:23:46 +02:00
Tobias Kaminsky
85a355ed07 Merge pull request #1362 from nextcloud/handleForeignBroadcast
Handle foreign broadcast
2017-08-18 09:22:52 +02:00
Tobias Kaminsky
d8b4393787 Merge pull request #1361 from nextcloud/untrustedCerts
Fix rare case: ssl cert is ok for checkServer, but not for webview
2017-08-18 09:22:35 +02:00
Tobias Kaminsky
c76f862ddf Merge pull request #1355 from nextcloud/mediaFolderNPE
Prevent NPE on absolutePath
2017-08-18 09:21:35 +02:00
tobiaskaminsky
7d69fe5552
removed a random warning 2017-08-18 09:19:33 +02:00
Tobias Kaminsky
c68ed60b59 Merge branch 'master' into handleForeignBroadcast 2017-08-18 09:05:43 +02:00
Tobias Kaminsky
ebccea21f7 Merge branch 'master' into untrustedCerts 2017-08-18 09:05:26 +02:00
Tobias Kaminsky
bad6f34829 Merge pull request #1356 from nextcloud/deleteCookiesException
CookieManager.getInstance() can throw an Exception without saying so
2017-08-18 09:04:37 +02:00
Tobias Kaminsky
371a09c572 Merge branch 'master' into mediaFolderNPE 2017-08-18 09:04:14 +02:00
Tobias Kaminsky
312208462b Merge pull request #1352 from nextcloud/userInfoCrash
Check if background string is empty
2017-08-18 09:02:56 +02:00