Commit graph

5745 commits

Author SHA1 Message Date
Andy Scherzinger
4c6f1c0faa correct search view UI-behavior 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
Tobias Kaminsky
d828395d3a Merge pull request #180 from nextcloud/NPEonEmptyLocalFolder
prevents NPE when selecting empty local folder
2016-08-03 18:01:19 +02:00
Tobias Kaminsky
67001d4a13 Merge pull request #161 from nextcloud/meteredWiFi
delay instant upload when metered wifi is used
2016-08-03 18:00:52 +02:00
Tobias Kaminsky
7816f21179 Merge pull request #167 from nextcloud/protect_password_field_agains_autocompletion_suggestions
Disable suggestions in password field, trim username input
2016-08-03 18:00:25 +02:00
Nextcloud bot
a05957125c
[tx-robot] updated from transifex 2016-08-03 00:33:53 +00:00
David A. Velasco
a62cbd0cd8 Username trimmed in log-in view 2016-08-02 19:50:54 +02:00
David A. Velasco
9905e5c393 Add flag to disable suggestions in password field, no matter if visible or not 2016-08-02 19:50:54 +02:00
tobiasKaminsky
c5159e9246 delay instant upload when metered wifi is used 2016-08-02 16:01:28 +02:00
Andy Scherzinger
b502872e00 fix compile error 2016-08-02 10:13:46 +02:00
Nextcloud bot
9bdf13e801
[tx-robot] updated from transifex 2016-08-02 00:33:56 +00:00
Andy Scherzinger
fc8601dffc Fix start logging 2016-08-01 17:03:16 +02:00
Andy Scherzinger
faf77cbce5 bump Nc Android lib version 2016-08-01 16:57:45 +02:00
Andy Scherzinger
8b29b0e34c Merge pull request #153 from nextcloud/djvu
djvu is not an image
2016-08-01 16:20:59 +02:00
tobiasKaminsky
99852c1bc8 djvu is not an image 2016-08-01 14:49:56 +02:00
Andy Scherzinger
9ce3297f65 Merge pull request #162 from nextcloud/renameInstantUploadPath
rename instant upload path
2016-08-01 14:47:07 +02:00
Nextcloud bot
b5cf7ab074
[tx-robot] updated from transifex 2016-08-01 00:33:52 +00:00
tobiasKaminsky
d533b5f2d9 prevents NPE when selecting empty local folder 2016-07-31 12:33:35 +02:00
Nextcloud bot
7c2c537bad
[tx-robot] updated from transifex 2016-07-31 00:33:50 +00:00
tobiasKaminsky
ac695b7444 fix sharing for beta 2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-07-30 16:56:44 +02:00
Nextcloud bot
6bf6981a41
[tx-robot] updated from transifex 2016-07-30 00:33:42 +00:00
Nextcloud bot
9e406be4ff
[tx-robot] updated from transifex 2016-07-29 00:33:48 +00:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
Andy Scherzinger
c827ea5580 Merge pull request #164 from nextcloud/release120
Release 1.2.0
2016-07-28 17:00:34 +02:00
Andy Scherzinger
fde5660371 1.2.0 release preparation 2016-07-27 09:13:45 +02:00
Andy Scherzinger
871ce5307b 1.2.0 release preparation 2016-07-27 09:12:31 +02:00
Nextcloud bot
0626040e7b
[tx-robot] updated from transifex 2016-07-27 00:33:55 +00:00
Nextcloud bot
6c887b41b4
[tx-robot] updated from transifex 2016-07-26 00:33:52 +00:00
Nextcloud bot
5cfaa5ec02
[tx-robot] updated from transifex 2016-07-25 00:33:45 +00:00
Tobias Kaminsky
c405859be1 Merge pull request #148 from nextcloud/145_no_go_back_alternative
#145 Alternative fix for drawer navigation fix in upload activity
2016-07-24 06:54:39 +02:00
Nextcloud bot
8876f52c4d
[tx-robot] updated from transifex 2016-07-24 00:33:49 +00:00
Nextcloud bot
ca0e550059
[tx-robot] updated from transifex 2016-07-23 00:33:47 +00:00
Andy Scherzinger
7d0e65f109 1.2.0 RC2 preparations 2016-07-22 19:01:30 +02:00
Andy Scherzinger
58f86500ad generalization in super class 2016-07-22 18:50:22 +02:00
Andy Scherzinger
20d33737cc javaDoc 2016-07-22 17:52:28 +02:00
Andy Scherzinger
16b1a95cc5 #145 Let user go back from upload activity 2016-07-22 17:40:19 +02:00
Nextcloud bot
00d4403326
[tx-robot] updated from transifex 2016-07-22 00:33:50 +00:00
Andy Scherzinger
655bb6335b Merge pull request #138 from nextcloud/fixSamlCrash
Fix crash when adding a saml account
2016-07-21 14:06:32 +02:00
Andy Scherzinger
e865658f62 corrected paddings/margin to material design 16/8 dp 2016-07-21 13:45:43 +02:00
Andy Scherzinger
40788c7b5d 1.2.0 RC1 preparations 2016-07-21 13:27:28 +02:00
Andy Scherzinger
8487793056 fix compile error after merge 2016-07-21 13:13:55 +02:00
jabarros
1a1d50f8b6 Fix crash when adding a saml account 2016-07-21 13:13:54 +02:00
Andy Scherzinger
2e3d3a1aa0 Merge pull request #137 from nextcloud/userDebugPhone
Log.wtf() should not be used unless an assertion fails
2016-07-21 13:03:11 +02:00
Andy Scherzinger
55c0dcc3b0 Merge pull request #61 from nextcloud/multiSelectNew
Multi Select
2016-07-21 13:02:27 +02:00
Nextcloud bot
9ef0c18e81
[tx-robot] updated from transifex 2016-07-21 00:33:56 +00:00
Andy Scherzinger
9474658bcd bumped support lib to latest version of 23 2016-07-20 15:55:11 +02:00
Andy Scherzinger
573f95d110 fixes after merge 2016-07-20 15:33:08 +02:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail
Video thumbnail
2016-07-20 15:20:26 +02:00