Commit graph

1300 commits

Author SHA1 Message Date
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
David A. Velasco
41b5eb13b1 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16 Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
35eb4dbfcf Update main_menu.xml 2015-05-27 16:53:35 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-05-27 14:19:30 +02:00
masensio
e7493203de Merge branch 'develop' into remove_ActionBarSherlock 2015-05-27 13:10:15 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
0238727d13 Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
Jenkins for ownCloud
973aa26b5d [tx-robot] updated from transifex 2015-05-26 01:13:51 -04:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
Jenkins for ownCloud
f22c19a28d [tx-robot] updated from transifex 2015-05-25 01:13:49 -04:00
Jenkins for ownCloud
6e8fab5503 [tx-robot] updated from transifex 2015-05-24 01:13:52 -04:00
Jenkins for ownCloud
9f094c8946 [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
Jenkins for ownCloud
24a6dfda9e [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
2015-05-21 09:46:59 +02:00
Jenkins for ownCloud
07acad20b5 [tx-robot] updated from transifex 2015-05-21 01:13:53 -04:00
masensio
288c148b51 Merge pull request #955 from owncloud/thumbnailOOM
HOTFIX: prevent OOM when scrolling Thumbnails
2015-05-20 11:07:14 +02:00
masensio
25718e7992 Merge branch 'develop' into navigation_drawer 2015-05-18 15:04:15 +02:00
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
Jenkins for ownCloud
2c37b73a55 [tx-robot] updated from transifex 2015-05-18 01:13:50 -04:00
masensio
d43fbbac6b [DEV] Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-15 11:24:14 +02:00
Jenkins for ownCloud
efefb3bf2d [tx-robot] updated from transifex 2015-05-14 01:13:58 -04:00
Jenkins for ownCloud
48d356d817 [tx-robot] updated from transifex 2015-05-13 01:13:51 -04:00
Jenkins for ownCloud
d8f6448977 [tx-robot] updated from transifex 2015-05-11 01:13:48 -04:00
Jenkins for ownCloud
50c079d646 [tx-robot] updated from transifex 2015-05-10 01:13:53 -04:00
Jenkins for ownCloud
4475dcdf7b [tx-robot] updated from transifex 2015-05-09 01:13:55 -04:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app
Make share feature configurable
2015-05-08 14:55:07 +02:00
David A. Velasco
fb6047a72c Rename the flag to show my wish that someday the app will allow to share with other users too 2015-05-08 11:17:39 +02:00
Jenkins for ownCloud
ea62e966fa [tx-robot] updated from transifex 2015-05-08 01:13:55 -04:00
David A. Velasco
94f4a072ed Replaced 'pass code' with 'passcode' 2015-05-07 12:07:44 +02:00
Jenkins for ownCloud
bfde0855c0 [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
David A. Velasco
8882fb2dbd Merge pull request #967 from owncloud/fix_upload_fails_sending_another_app
Fixed fail in upload sent from the private storage of other app
2015-05-05 13:51:46 +02:00
David A. Velasco
dcd8dde864 Merge branch 'develop' into pinEnhancement 2015-05-05 13:43:01 +02:00
David A. Velasco
fdc1216471 Prevent that input fields are maximized in landscape 2015-05-05 12:27:57 +02:00
David A. Velasco
4f0cc76a12 Removed unneeded toggling on cursor visibility 2015-05-05 09:54:49 +02:00
David A. Velasco
510c00f66d Cleaned code in PassCodeActivity 2015-05-05 00:07:24 +02:00
masensio
a41c0b39f2 Add option to turn off share in setup.xml 2015-05-04 14:29:17 +02:00