Commit graph

4509 commits

Author SHA1 Message Date
David A. Velasco
7931c321f2 Merge pull request #1461 from owncloud/manage_space_activity
Added own Activity to manage space instead of default "Clear data" button in device settings
2016-02-04 14:50:53 +01:00
masensio
7548964b37 Fix: App freezes when the data are cleared with an opened text file 2016-02-04 12:10:19 +01:00
David A. Velasco
b343896447 Fixed NullPointerException after clearing app data when left from image preview 2016-02-04 08:41:55 +01:00
Jenkins for ownCloud
9bfaaf3b8b [tx-robot] updated from transifex 2016-02-04 01:13:37 -05:00
David A. Velasco
a827cfa791 Merge pull request #1314 from owncloud/prefDetails
Renamed "security" category to "details" in app settings, for further use
2016-02-03 17:51:13 +01:00
masensio
9fd38ca0dd Changes from comments in Code Review: staring and NPE 2016-02-03 16:03:10 +01:00
masensio
dc2fdb9744 Changes from comments in Code Review: Strings and minor things 2016-02-03 14:28:12 +01:00
masensio
71d7c52e12 Use PassCode static values instead of literal strings 2016-02-03 13:50:43 +01:00
masensio
14530aa7b8 Changes from comments in PR Code Review 2016-02-03 13:45:53 +01:00
masensio
9e83827cc4 Delete settings in Clear Data method 2016-02-03 13:37:48 +01:00
masensio
3d623ca911 Review string manage_space_description 2016-02-03 13:37:47 +01:00
masensio
491a8b71a2 Fix crash when Clear App Data and try to access 2016-02-03 13:37:45 +01:00
masensio
96ce49707b Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity 2016-02-03 13:37:45 +01:00
masensio
d6653ef684 Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java 2016-02-03 13:37:43 +01:00
Jenkins for ownCloud
c8dcf8b7ac [tx-robot] updated from transifex 2016-02-03 01:13:37 -05:00
tobiasKaminsky
145eb20a3d Merge remote-tracking branch 'remotes/upstream/master' into cancelUploadOnWlanExit_2 2016-02-02 21:50:50 +01:00
tobiasKaminsky
49f6d9c986 according to CR 2016-02-02 21:50:33 +01:00
tobiasKaminsky
0e89c1f01b solved bug 2016-02-02 21:13:41 +01:00
tobiasKaminsky
da0d98629c Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master 2016-02-02 21:05:16 +01:00
tobiasKaminsky
5b7f44e0f7 renamed security category to details for further use
moved position
2016-02-02 17:45:01 +01:00
David A. Velasco
9761b34c76 Merge pull request #1439 from owncloud/wording-fixes
Wording fixes, simplify some strings and fix capitalization
2016-02-02 17:33:25 +01:00
Jenkins for ownCloud
9c18126bf0 [tx-robot] updated from transifex 2016-02-02 01:13:41 -05:00
David A. Velasco
831de4534e Merge pull request #1296 from owncloud/bug_1251
Don't allow to remove passcode without entering it, nor set it incomplete
2016-02-01 12:52:36 +01:00
Jenkins for ownCloud
3951b2db95 [tx-robot] updated from transifex 2016-02-01 01:13:31 -05:00
Jenkins for ownCloud
73d327a407 [tx-robot] updated from transifex 2016-01-31 01:13:30 -05:00
Jenkins for ownCloud
52d043be21 [tx-robot] updated from transifex 2016-01-30 01:13:40 -05:00
Jenkins for ownCloud
2795750c55 [tx-robot] updated from transifex 2016-01-29 01:13:33 -05:00
David A. Velasco
988cf7f57e Merge pull request #1378 from owncloud/updateToJava7
Force ant and android studio to use Java7
2016-01-28 10:33:19 +01:00
Jenkins for ownCloud
8bf14931b0 [tx-robot] updated from transifex 2016-01-28 01:13:39 -05:00
David A. Velasco
f014fbe20e Merge pull request #1453 from owncloud/share_permissions__fix_unintended_browse_back
Removed automatic back-browse; error codes from server do not disting…
2016-01-27 13:40:15 +01:00
David A. Velasco
a4e336acc2 Removed automatic back-browse; error codes from server do not distinguish between excess of permissions, removed share or removed file 2016-01-27 13:13:23 +01:00
Maria Asensio
2e074864a2 Merge pull request #1451 from owncloud/share__edit_privileges
Share  edit privileges
2016-01-27 11:28:16 +01:00
David A. Velasco
c9017a2b0a Fixed operation of app after SAML expired sessions while editing share permissions 2016-01-27 11:09:24 +01:00
David A. Velasco
2681f8c22b Improved navigation after errors due to removal of shares, files or users from a separate client 2016-01-25 11:08:28 +01:00
David A. Velasco
6ac53bc1ba Grant that UI is correctly refreshed on rotations 2016-01-25 09:42:02 +01:00
David A. Velasco
2f1084012f Tweaked UI behaviour for resharing folders with partial edit permissions 2016-01-25 08:25:24 +01:00
tobiasKaminsky
1023aa1eba update todo 2016-01-24 08:39:10 +01:00
tobiasKaminsky
cc637a61c6 add lastMod 2016-01-24 08:33:36 +01:00
Jenkins for ownCloud
f1fcab8e18 [tx-robot] updated from transifex 2016-01-24 01:13:30 -05:00
Jenkins for ownCloud
2818c41641 [tx-robot] updated from transifex 2016-01-23 01:13:36 -05:00
Andy Scherzinger
cc8df75355 fix NPR (Uploader doesn't have a progressbar, so we can't set a status for it (!) 2016-01-22 22:16:03 +01:00
Jenkins for ownCloud
6a72d01d0e [tx-robot] updated from transifex 2016-01-22 01:13:32 -05:00
Jenkins for ownCloud
e909f8b625 [tx-robot] updated from transifex 2016-01-21 01:13:38 -05:00
David A. Velasco
628e713268 Update model changed: permission updates are requested to the server as soon as the user changes any value 2016-01-20 18:18:14 +01:00
David A. Velasco
0d4c9b9961 Show error message from server when update of permissions fail 2016-01-20 12:22:24 +01:00
David A. Velasco
83092452a2 Dynamic retrieval of maximum permissions allowed to reshare is not trustful - removed 2016-01-20 11:57:53 +01:00
Jenkins for ownCloud
e3d882b386 [tx-robot] updated from transifex 2016-01-20 01:13:33 -05:00
Jenkins for ownCloud
9c59c5fb4c [tx-robot] updated from transifex 2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt
61a1d97abc wording fixes, simplify some strings and fix capitalization 2016-01-18 15:10:50 +01:00
David A. Velasco
3b4b8ceadd Dinamycally find out the maximum permissions to reshare 2016-01-18 14:08:38 +01:00