Commit graph

6575 commits

Author SHA1 Message Date
Divay Prakash
4bd89dc626
Fix magic numbers in account_setup.xml #12 2016-10-07 04:58:38 +05:30
Divay Prakash
e7114a2c35
Fix magic numbers in account_item.xml #12 2016-10-07 04:42:22 +05:30
Divay Prakash
1da94ff82a
Fix magic numbers in account_action.xml #12 2016-10-07 04:33:53 +05:30
AndyScherzinger
ccb16b7cc4
initial wip implementation of config element click listeners 2016-10-06 23:22:56 +02:00
AndyScherzinger
4796633bcd
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 22:47:02 +02:00
Andy Scherzinger
07c0cafadd Merge pull request #316 from nextcloud/tuneUploadGrid
tune grid view of images
2016-10-06 22:10:22 +02:00
AndyScherzinger
6a4649467a
license header added 2016-10-06 22:03:32 +02:00
AndyScherzinger
0ab5d0f6b9
missed to push ViewType enum 2016-10-06 21:52:10 +02:00
AndyScherzinger
00a2f103b6
tune grid view of images
Resolves: #311
2016-10-06 21:37:03 +02:00
Tobias Kaminsky
92c01f027e Merge pull request #312 from nextcloud/fixVideoCharging
Fix instant video waiting for charging
2016-10-06 21:09:01 +02:00
tobiasKaminsky
7a5965dd3f wrong method called :/ 2016-10-06 20:39:00 +02:00
Tobias Kaminsky
7525088db2 Merge pull request #301 from apicellaj/master
add grid view option when choosing a file from within the app
2016-10-06 20:29:21 +02:00
AndyScherzinger
c4c1b6b450
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 20:02:49 +02:00
Tobias Kaminsky
166b8262d3 Merge pull request #206 from nextcloud/descendIntoFolder
descend into folder after creating it in uploader
2016-10-06 19:25:31 +02:00
Tobias Kaminsky
45f09e85e5 Merge pull request #253 from nextcloud/magicUrl
Provisioning Links to launch and prefill app with login data
2016-10-06 19:24:02 +02:00
AndyScherzinger
b607a770f2
minor layout optimization 2016-10-06 18:25:23 +02:00
AndyScherzinger
d7f461a0f0
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 10:17:50 +02:00
Andy Scherzinger
4df036940c
code review changes 2016-10-06 09:08:11 +02:00
Andy Scherzinger
25a7b6ed48
downgrade to only support cloud://login 2016-10-06 09:08:11 +02:00
Andy Scherzinger
4f5554861a
move connection (re) init from start to onResume and restore server checked flag 2016-10-06 09:08:10 +02:00
Andy Scherzinger
442e85a8b5
wip server check 2016-10-06 09:08:10 +02:00
Andy Scherzinger
1cd1abbc9c
focus check 2016-10-06 09:08:10 +02:00
Andy Scherzinger
845e84133b
fix url mapping 2016-10-06 09:08:10 +02:00
Andy Scherzinger
5977fed28d
MagicUrls for Login + Unit tests for the parser 2016-10-06 09:08:10 +02:00
tobiasKaminsky
97059873f1
add change to subfolder 2016-10-06 09:07:16 +02:00
tobiasKaminsky
0e5b0f383d
descend into folder after creating it in uploader 2016-10-06 09:07:05 +02:00
Nextcloud bot
ab6e0019e7
[tx-robot] updated from transifex 2016-10-06 00:32:49 +00:00
Andy Scherzinger
6ebbf0ce98 Merge pull request #302 from ryanwr/master
Sorts favourite files first in list
2016-10-05 22:49:34 +02:00
Andy Scherzinger
461b1c86b3 Merge pull request #298 from zmatsuo/openUrlFile
Add open URL file feature
2016-10-05 22:38:02 +02:00
AndyScherzinger
a634be95ca
fixed null check 2016-10-05 22:30:12 +02:00
Tobias Kaminsky
08b8eca02c Merge pull request #309 from nextcloud/fixDroneLink
new CI server address
2016-10-05 20:29:40 +02:00
Tobias Kaminsky
bb64481c65 Merge pull request #241 from nextcloud/LukeOwncloud-patch-remove-failed
fix remove failed
2016-10-05 20:28:37 +02:00
Tobias Kaminsky
66f909291f Merge pull request #281 from nextcloud/dismissDialogFragment
fix crash in dismissLoadingDialog #279
2016-10-05 19:30:05 +02:00
Tobias Kaminsky
6c06147f4e Merge pull request #284 from nextcloud/logSendCrash
Crash when sending non-existing log
2016-10-05 19:28:33 +02:00
Tobias Kaminsky
a2eb1af4fa Merge pull request #290 from nextcloud/201_fixExpandableUploadListAdapter
Fix NPE in ExpandableUploadListAdapter...setText
2016-10-05 19:27:05 +02:00
Tobias Kaminsky
8bd58a24ea Merge pull request #293 from nextcloud/wordingDavdroid
change wordings for davdroid integration
2016-10-05 19:24:33 +02:00
Tobias Kaminsky
85bb93871b Merge pull request #295 from florian-f/master
Fix NullPointerException in PreviewMediaFragment.
2016-10-05 19:22:53 +02:00
Tobias Kaminsky
56b3f3f88d Merge pull request #306 from nextcloud/cursorFix
put cursor close in finally block to make sure no resource leak occurrs
2016-10-05 19:15:35 +02:00
matsuo
29002e5a24 close() in finally block 2016-10-06 00:49:13 +09:00
Nextcloud bot
05a2583259
[tx-robot] updated from transifex 2016-10-05 00:32:48 +00:00
Joe Apicella
3aa00bc53b fix GridView layout 2016-10-04 16:53:53 -07:00
Joe Apicella
0b7e7848ba fix issue with menu label not persisting 2016-10-04 16:53:28 -07:00
AndyScherzinger
afa274accf
new CI server address
Resolves: #308
2016-10-04 22:57:02 +02:00
Andy Scherzinger
e6ba8a7e53
bugfix for NPE #201 2016-10-04 14:12:45 +02:00
Andy Scherzinger
0fa58f2aa5
removed unnecessary else part 2016-10-04 14:07:23 +02:00
LukeOwncloud
a82ab8e50f
return false if remove failed
if OCFile is null --> cannot delete ==> return false.
2016-10-04 14:07:23 +02:00
tobiasKaminsky
28053a4612
change wordings for davdroid integration 2016-10-04 14:00:42 +02:00
Andy Scherzinger
4a774a8099
IndexOutOfBounds check #283 2016-10-04 13:58:15 +02:00
Andy Scherzinger
00684cd339
fix crash in dismissLoadingDialog #279 2016-10-04 13:50:35 +02:00
Andy Scherzinger
1dd27dda88
fix crash in dismissLoadingDialog #279 2016-10-04 13:50:35 +02:00