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
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
Andy Scherzinger
71a44db0dd
CR changes
2016-07-20 14:24:03 +02:00
Andy Scherzinger
2af26edb0b
Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew
...
Conflicts:
res/values-ca/strings.xml
res/values-he/strings.xml
res/values-hu-rHU/strings.xml
res/values-ja-rJP/strings.xml
res/values-ko/strings.xml
res/values-lb/strings.xml
res/values-lt-rLT/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-th-rTH/strings.xml
res/values-tr/strings.xml
2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da
proper status bar coloring for multi select mode, cleanup logging
2016-07-20 13:09:56 +02:00
Nextcloud bot
22b9ad807c
[tx-robot] updated from transifex
2016-07-20 00:33:48 +00:00
Andy Scherzinger
a6bd6030d2
Replace Log.wtf calls with Log.e
2016-07-19 14:36:41 +02:00
Kenny Root
b7295e5f09
Replace Log.wtf calls with Log.e
...
This will prevent crashing when running on a userdebug phone. Log#wtf
should only be used when the program can not go on because a critical
assertion fails. These all don't seem to meet that criteria.
Fixes #1603
Conflicts:
src/com/owncloud/android/ui/activity/FileActivity.java
2016-07-19 14:33:01 +02:00
Nextcloud bot
7f9cf817a7
[tx-robot] updated from transifex
2016-07-19 00:33:47 +00:00
Andy Scherzinger
2bfb1b6903
fixed overlay bug with toolbar
2016-07-18 17:38:02 +02:00
Tobias Kaminsky
0484d4aa06
Merge pull request #130 from nextcloud/129_authoritiesFillPath
...
#129 Add authorities prefixes to providers
2016-07-18 17:35:42 +02:00
Nextcloud bot
5ef50c6658
[tx-robot] updated from transifex
2016-07-18 13:28:56 +00:00
Andy Scherzinger
3ea6c22ae6
Merge pull request #132 from nextcloud/accountDeletionFix
...
Fix NPE on last account deletion
2016-07-18 10:58:32 +02:00
Bartosz Przybylski
a4d30e88e5
update authority to match authority in java files
2016-07-17 23:38:36 +02:00
Tobias Kaminsky
64f3fa9290
Merge pull request #134 from nextcloud/textPreviewSelectable
...
textPreview is selectable
2016-07-17 13:20:30 +02:00
tobiasKaminsky
e714707754
textPreview is selectable
2016-07-16 09:08:52 +02:00
tobiasKaminsky
dfae9cfc27
fix NPE
2016-07-16 08:11:30 +02:00
tobiasKaminsky
ff32763024
update to master
2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a
Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew
2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc
Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail
2016-07-15 18:05:05 +02:00
Bartosz Przybylski
a4900f9bfa
Add authorities prefixes to providers
2016-07-15 00:42:33 +02:00
Andy Scherzinger
f2939a01fd
Merge pull request #116 from nextcloud/confirmAccountDeletion
...
Add confirmation dialog on account deletion
2016-07-14 23:59:49 +02:00
