mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 00:34:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
4535 commits 220 branches 1588 tags 639 MiB
Commit graph

1841 commits

Author SHA1 Message Date
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
Jenkins for ownCloud
82f4123260 [tx-robot] updated from transifex 2015-07-25 01:13:46 -04:00
Jenkins for ownCloud
3d18b6b207 [tx-robot] updated from transifex 2015-07-24 01:14:12 -04:00
David A. Velasco
c21fa6c6e5 Merge pull request #1050 from owncloud/favourites_context_menu 
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
 2015-07-23 09:37:13 +02:00
Jenkins for ownCloud
650c4fd290 [tx-robot] updated from transifex 2015-07-23 01:13:51 -04:00
purigarcia
61e6191342 change the name of the method from keepInSync to favorite. Other changes commented in the review 2015-07-22 18:13:45 +02:00
Jenkins for ownCloud
1976dfe9a1 [tx-robot] updated from transifex 2015-07-20 01:14:05 -04:00
Jenkins for ownCloud
aab283a15b [tx-robot] updated from transifex 2015-07-18 01:14:06 -04:00
Jenkins for ownCloud
f173670351 [tx-robot] updated from transifex 2015-07-17 01:14:04 -04:00
Jenkins for ownCloud
48cd33ae2d [tx-robot] updated from transifex 2015-07-14 01:14:02 -04:00
Jenkins for ownCloud
05896ff491 [tx-robot] updated from transifex 2015-07-13 01:14:04 -04:00
Jenkins for ownCloud
00e6d45abb [tx-robot] updated from transifex 2015-07-12 01:14:02 -04:00
tobiasKaminsky
9ea3f7794f add missing checker pattern 2015-07-11 09:40:06 +02:00
tobiasKaminsky
0527754c50 add checker background pattern for all png images. 2015-07-11 09:18:26 +02:00
Jenkins for ownCloud
7bb1307a6b [tx-robot] updated from transifex 2015-07-11 01:14:06 -04:00
purigarcia
a3bfcdcd85 Merge branch 'develop' into favourites_context_menu 2015-07-10 08:44:56 +02:00
Jenkins for ownCloud
1e08c40f31 [tx-robot] updated from transifex 2015-07-10 01:14:03 -04:00
Jenkins for ownCloud
d32032fc96 [tx-robot] updated from transifex 2015-07-09 01:14:02 -04:00
purigarcia
7df9aa7310 add unfavorite option in context menu 2015-07-08 08:50:24 +02:00
purigarcia
ebe5a62f73 change the name from favorites to keep_up_to_date 2015-07-08 08:43:49 +02:00
purigarcia
e0efee57b4 add keep up to date option in the menu 2015-07-08 08:36:10 +02:00
Jenkins for ownCloud
7623a8af61 [tx-robot] updated from transifex 2015-07-08 01:14:04 -04:00
masensio
629cff2d3f Merge branch 'master' into develop 2015-07-07 13:15:35 +02:00
masensio
174fa1f36b delete values-tzl 2015-07-07 10:41:22 +02:00
Jenkins for ownCloud
cfe5b84573 [tx-robot] updated from transifex 2015-07-05 01:14:02 -04:00
Jenkins for ownCloud
d762a8747b [tx-robot] updated from transifex 2015-07-03 01:15:16 -04:00
Jenkins for ownCloud
491e8a0bb3 [tx-robot] updated from transifex 2015-07-01 01:14:53 -04:00
Jenkins for ownCloud
eaf860d7c1 [tx-robot] updated from transifex 2015-06-30 01:13:52 -04:00
Jenkins for ownCloud
9ab961aa88 [tx-robot] updated from transifex 2015-06-29 01:13:34 -04:00
Jenkins for ownCloud
93b6c37400 [tx-robot] updated from transifex 2015-06-28 01:13:41 -04:00
Jenkins for ownCloud
24c564ab5f [tx-robot] updated from transifex 2015-06-27 01:13:58 -04:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
Jenkins for ownCloud
b4c217b505 [tx-robot] updated from transifex 2015-06-25 01:13:56 -04:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b Support margins for API levels pre-17 2015-06-24 22:12:36 +02:00
Jenkins for ownCloud
4aed07aae1 [tx-robot] updated from transifex 2015-06-24 01:13:55 -04:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00
Jenkins for ownCloud
51a539f4ee [tx-robot] updated from transifex 2015-06-23 01:14:15 -04:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex 
Message with count of list(s) and folder(s) reestructured for better translations
 2015-06-22 14:14:36 +02:00
masensio
2fbd757d66 Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads 
Conflicts:
	owncloud-android-library
 2015-06-22 14:03:21 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
Jenkins for ownCloud
a860ff6f96 [tx-robot] updated from transifex 2015-06-22 01:13:55 -04:00
Jenkins for ownCloud
37b2991755 [tx-robot] updated from transifex 2015-06-21 01:13:57 -04:00
Jenkins for ownCloud
f6abd41e09 [tx-robot] updated from transifex 2015-06-20 01:14:01 -04:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Jenkins for ownCloud
f150ccd21c [tx-robot] updated from transifex 2015-06-19 01:13:55 -04:00
Jenkins for ownCloud
95bdfc0643 [tx-robot] updated from transifex 2015-06-18 01:14:01 -04:00
David A. Velasco
3febfa1e08 Merge pull request #1014 from owncloud/forbidden_characters_from_server 
Delegate check of forbidden characters on server, for OC >= 8.1
 2015-06-17 09:20:27 +02:00
Jenkins for ownCloud
122ee28b85 [tx-robot] updated from transifex 2015-06-17 01:13:57 -04:00
Jenkins for ownCloud
32470c97eb [tx-robot] updated from transifex 2015-06-16 01:14:07 -04:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
David A. Velasco
66f3a45d05 Merge branch 'develop' into navigationDrawer_basic 
Conflicts FIXED:
	res/layout/files.xml
 2015-06-15 13:43:17 +02:00
Jenkins for ownCloud
42da742d5e [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
Jenkins for ownCloud
f4f0750b1a [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
Jenkins for ownCloud
96f64863d1 [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
Jenkins for ownCloud
d094ea108d [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
Jenkins for ownCloud
486ad08e79 [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
Jenkins for ownCloud
2075255313 [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
masensio
33fae4d071 Merge pull request #978 from owncloud/automationTest 
Automation test
 2015-06-08 12:53:15 +02:00
Jenkins for ownCloud
d93eb752a1 [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
purigarcia
23af1d2310 Merge branch 'develop' into automationTest 2015-06-05 10:32:37 +02:00
Jenkins for ownCloud
e93502657c [tx-robot] updated from transifex 2015-06-05 01:13:53 -04:00
Jenkins for ownCloud
7194818bc0 [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
Jenkins for ownCloud
9bf27e63a6 [tx-robot] updated from transifex 2015-06-03 01:13:53 -04:00
masensio
febe1fef89 Add new string message for forbidden characters controlled by the server 2015-06-02 11:07:34 +02:00
Jenkins for ownCloud
ed10941085 [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
Jenkins for ownCloud
c74164ecd9 [tx-robot] updated from transifex 2015-05-31 01:13:34 -04:00
Jenkins for ownCloud
b1a99c83f6 [tx-robot] updated from transifex 2015-05-30 01:13:45 -04:00
purigarcia
916bd5c6ca Merge branch 'develop' into automationTest 2015-05-29 14:17:52 +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
Jenkins for ownCloud
a544613d75 [tx-robot] updated from transifex 2015-05-28 01:13:53 -04: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
purigarcia
c775fa0691 Merge branch 'develop' into automationTest 2015-05-14 10:18:12 +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
purigarcia
2d95a83959 Merge branch 'develop' into automationTest 2015-05-11 08:16:43 +02: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
purigarcia
6a9dfdb330 Merge branch 'develop' into automationTest 2015-05-06 19:05:03 +02: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
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
purigarcia
606834980c Merge branch 'develop' into automationTest 2015-05-04 09:10:45 +02:00
Jenkins for ownCloud
3b08f9f5af [tx-robot] updated from transifex 2015-05-04 01:13:48 -04:00
Jenkins for ownCloud
be12aea5ce [tx-robot] updated from transifex 2015-05-02 01:13:50 -04:00
masensio
ce9f67ba14 Merge branch 'develop' into fix_upload_fails_sending_another_app 2015-04-30 13:23:37 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
Jenkins for ownCloud
f2f9fbf264 [tx-robot] updated from transifex 2015-04-30 02:30:10 -04:00
Jenkins for ownCloud
c847e97e31 [tx-robot] updated from transifex 2015-04-29 01:13:49 -04:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
Jenkins for ownCloud
3489fa1ccb [tx-robot] updated from transifex 2015-04-25 01:13:48 -04:00
Jenkins for ownCloud
25f488cfe1 [tx-robot] updated from transifex 2015-04-24 01:13:45 -04:00
Jenkins for ownCloud
3dc60cd6f7 [tx-robot] updated from transifex 2015-04-23 01:13:49 -04:00
Jenkins for ownCloud
d5ea104e99 [tx-robot] updated from transifex 2015-04-19 01:13:33 -04:00
Jenkins for ownCloud
2f196c54d6 [tx-robot] updated from transifex 2015-04-18 01:13:48 -04:00
Jenkins for ownCloud
65b2da31cc [tx-robot] updated from transifex 2015-04-17 01:13:50 -04:00
purigarcia
68b9744a9c Merge branch 'develop' into automationTest 2015-04-16 09:10:59 +02:00
Jenkins for ownCloud
15512f8d63 [tx-robot] updated from transifex 2015-04-15 01:13:36 -04:00
Jenkins for ownCloud
3fa86ebe5b [tx-robot] updated from transifex 2015-04-10 01:13:49 -04:00
masensio
558a3af1eb Merge branch 'master' into develop 2015-04-09 16:57:09 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
purigarcia
1d613754d6 Merge branch 'develop' into automationTest 2015-04-08 09:49:32 +02:00
Jenkins for ownCloud
ffa503fa76 [tx-robot] updated from transifex 2015-04-06 01:13:38 -04:00
Jenkins for ownCloud
0ba1d7e65d [tx-robot] updated from transifex 2015-04-05 01:13:38 -04:00
Jenkins for ownCloud
bf6e03b0b6 [tx-robot] updated from transifex 2015-04-04 01:13:38 -04:00
Jenkins for ownCloud
8ebf88a31b [tx-robot] updated from transifex 2015-04-03 01:13:39 -04:00
Jenkins for ownCloud
daed811588 [tx-robot] updated from transifex 2015-04-02 01:13:45 -04:00
Jenkins for ownCloud
fc644a03fd [tx-robot] updated from transifex 2015-04-01 01:13:47 -04:00
Jenkins for ownCloud
b6392f7f90 [tx-robot] updated from transifex 2015-03-31 01:13:37 -04:00
Jenkins for ownCloud
7606afa9d6 [tx-robot] updated from transifex 2015-03-29 01:13:47 -04:00
Jenkins for ownCloud
b727c1ef44 [tx-robot] updated from transifex 2015-03-28 01:13:35 -04:00
Jenkins for ownCloud
66159f83f3 [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
purigarcia
d8e954d2d3 add id and contentdescription to a layout 2015-03-25 18:54:10 +01:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
David A. Velasco
30b72638a6 Merge pull request #923 from owncloud/create_folder_during_upload_pr_701_with_develop 
Create folder during upload  (PR#701) and bug fixes
 2015-03-25 09:29:13 +01:00
Jenkins for ownCloud
f1884e807d [tx-robot] updated from transifex 2015-03-25 01:13:49 -04:00
masensio
e18de547c8 Update user agent string 2015-03-24 14:53:53 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
898957f9e7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-24 12:26:24 +01:00
Jenkins for ownCloud
d61c021ba4 [tx-robot] updated from transifex 2015-03-24 01:13:40 -04:00
masensio
ae440a5fa7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-23 14:29:25 +01:00
Jenkins for ownCloud
360ffadac0 [tx-robot] updated from transifex 2015-03-23 01:13:36 -04:00
Jenkins for ownCloud
556f846e9c [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
Jenkins for ownCloud
2b0e8eddda [tx-robot] updated from transifex 2015-03-21 01:13:36 -04:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
Jenkins for ownCloud
205bd47325 [tx-robot] updated from transifex 2015-03-20 01:13:42 -04:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
Jenkins for ownCloud
1a39af3e95 [tx-robot] updated from transifex 2015-03-19 01:13:50 -04:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
Jenkins for ownCloud
4fedf76cb0 [tx-robot] updated from transifex 2015-03-18 01:13:35 -04:00
Jenkins for ownCloud
b7796c99f6 [tx-robot] updated from transifex 2015-03-17 01:13:40 -04:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
Jenkins for ownCloud
3c55631bee [tx-robot] updated from transifex 2015-03-15 01:13:34 -04:00
Jenkins for ownCloud
8b900a6410 [tx-robot] updated from transifex 2015-03-14 01:13:43 -04:00
Jenkins for ownCloud
67ecc0f262 [tx-robot] updated from transifex 2015-03-13 01:13:37 -04:00
Jenkins for ownCloud
311f0bd332 [tx-robot] updated from transifex 2015-03-12 01:13:34 -04:00
Jenkins for ownCloud
3826462073 [tx-robot] updated from transifex 2015-03-11 01:13:43 -04:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
purigarcia
151c70c443 Merge branch 'develop' into share_password_support 2015-03-09 09:21:38 +01:00
Jenkins for ownCloud
eac3e1ddf1 [tx-robot] updated from transifex 2015-03-09 01:13:33 -04:00
Jenkins for ownCloud
c404060351 [tx-robot] updated from transifex 2015-03-08 01:13:33 -05:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
David A. Velasco
eafaf80dd4 Merge pull request #912 from owncloud/review_license 
Reviewed license text in source files.
 2015-03-06 09:45:56 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
690341af68 Create layout for password 2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
Jenkins for ownCloud
664ee08a3c [tx-robot] updated from transifex 2015-03-05 01:13:45 -05:00
Jenkins for ownCloud
a349906e77 [tx-robot] updated from transifex 2015-03-04 01:13:41 -05:00
Jenkins for ownCloud
3cab8a4986 [tx-robot] updated from transifex 2015-03-03 01:13:33 -05:00
Jenkins for ownCloud
3d66b4ccc0 [tx-robot] updated from transifex 2015-03-01 01:13:35 -05:00
Jenkins for ownCloud
0f3af9c0ef [tx-robot] updated from transifex 2015-02-28 01:13:44 -05:00
Jenkins for ownCloud
c1efe4304b [tx-robot] updated from transifex 2015-02-27 01:13:37 -05:00
Jenkins for ownCloud
62bbe70290 [tx-robot] updated from transifex 2015-02-26 01:13:46 -05:00
Jenkins for ownCloud
72bd1c17a5 [tx-robot] updated from transifex 2015-02-25 01:13:42 -05:00
masensio
759b5e3e72 Merge pull request #888 from owncloud/enable_cookies 
Enable cookies
 2015-02-24 14:05:54 +01:00
Jenkins for ownCloud
4c964b7dcb [tx-robot] updated from transifex 2015-02-24 01:13:38 -05:00
Jenkins for ownCloud
6a88d7a9f4 [tx-robot] updated from transifex 2015-02-22 01:13:32 -05:00
Jenkins for ownCloud
099b32fc42 [tx-robot] updated from transifex 2015-02-21 01:13:31 -05:00
Jenkins for ownCloud
fd8e590ea0 [tx-robot] updated from transifex 2015-02-20 01:13:38 -05:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-02-19 13:02:53 +01:00
David A. Velasco
ec6b9d7c70 Merge branch 'master' into develop 2015-02-19 11:01:00 +01:00
Jenkins for ownCloud
ae1bd1b6a1 [tx-robot] updated from transifex 2015-02-18 01:13:36 -05:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
Jenkins for ownCloud
7fa529d328 [tx-robot] updated from transifex 2015-02-17 01:13:43 -05:00
Jenkins for ownCloud
effee70675 [tx-robot] updated from transifex 2015-02-15 01:13:29 -05:00
Jenkins for ownCloud
5e1048b343 [tx-robot] updated from transifex 2015-02-14 01:13:32 -05:00
Jenkins for ownCloud
754c277fdd [tx-robot] updated from transifex 2015-02-13 01:13:30 -05:00
Jenkins for ownCloud
f149a9cf77 [tx-robot] updated from transifex 2015-02-12 01:13:31 -05:00
Jenkins for ownCloud
c4110d4be7 [tx-robot] updated from transifex 2015-02-11 01:13:30 -05:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
Jenkins for ownCloud
6162271dff [tx-robot] updated from transifex 2015-02-10 01:13:32 -05:00
Jenkins for ownCloud
62c54ac2ad [tx-robot] updated from transifex 2015-02-09 01:13:30 -05:00
Jenkins for ownCloud
7d8cbde64f [tx-robot] updated from transifex 2015-02-08 01:13:31 -05:00
Jenkins for ownCloud
fa0b91d7fb [tx-robot] updated from transifex 2015-02-07 01:13:34 -05:00
Jenkins for ownCloud
b047882001 [tx-robot] updated from transifex 2015-02-06 01:13:31 -05:00
Jenkins for ownCloud
f8c91b0458 [tx-robot] updated from transifex 2015-02-05 01:13:34 -05:00
Jenkins for ownCloud
8bc75d54b4 [tx-robot] updated from transifex 2015-02-04 01:14:14 -05:00
David A. Velasco
936d8466c6 Updated with fixes in Spanish translation 2015-02-03 14:01:59 +01:00
David A. Velasco
1726a9352a Updated translations after new format string for subject in sharing e-mail 2015-02-03 13:37:22 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
David A. Velasco
e4e50d44c4 Corrections from my own comments 2015-02-03 09:52:22 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
Jenkins for ownCloud
8bf624ff8f [tx-robot] updated from transifex 2015-02-01 01:13:30 -05:00
Jenkins for ownCloud
2210ce961a [tx-robot] updated from transifex 2015-01-31 01:13:34 -05:00
masensio
42b5a1e28f Update some icons 2015-01-30 14:37:16 +01:00
masensio
7f6c5bd3b2 Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop 2015-01-30 12:10:15 +01:00
masensio
700318fec0 Update some icons 2015-01-30 11:00:14 +01:00
Jenkins for ownCloud
9d491f71ed [tx-robot] updated from transifex 2015-01-30 01:13:31 -05:00
Jenkins for ownCloud
16b36d0418 [tx-robot] updated from transifex 2015-01-29 01:13:38 -05:00
masensio
d3b0747dde Merge pull request #866 from owncloud/download_folder 
Download a folder
 2015-01-28 09:31:25 +01:00
masensio
0b8f3db914 Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon 2015-01-28 08:59:57 +01:00
Jenkins for ownCloud
da67575522 [tx-robot] updated from transifex 2015-01-28 01:13:45 -05:00
masensio
8ebaba45e7 Show status icons in gridview 2015-01-27 13:51:44 +01:00
masensio
051265620c Add share icons and localFileIndicator to grid_image and grid_item layout 2015-01-27 09:46:19 +01:00
Jenkins for ownCloud
97386bdb87 [tx-robot] updated from transifex 2015-01-26 01:13:30 -05:00
jabarros
7d21a9ec5d Merge pull request #825 from owncloud/SettingsGreyedOut 
Instant Upload settings hide/show
 2015-01-23 09:29:11 +01:00
jabarros
0470de47e0 Fixed. Line behind the folder is not shown in the upload view 2015-01-22 09:29:36 +01:00
jabarros
38ea01dc1e Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/ 2015-01-21 17:51:16 +01:00
jabarros
9b1b5f5e3b Fixed. Footer message should be showed in the list view mode. Also added in grid view mode. 2015-01-21 11:08:15 +01:00
Jenkins for ownCloud
9fcb1612fe [tx-robot] updated from transifex 2015-01-21 01:13:32 -05:00
jabarros
f01156527a Fix. Uploads view is not shown correctly 2015-01-20 14:38:32 +01:00
jabarros
d751df3daa Add Scrollview in list fragment layout for showing text message 2015-01-20 10:43:39 +01:00
jabarros
451783be22 Merge branch 'develop' into imageGrid 2015-01-20 09:56:45 +01:00
jabarros
d0cee8be85 Merge branch 'develop' into SettingsGreyedOut 2015-01-20 09:25:20 +01:00
Jenkins for ownCloud
99276bae85 [tx-robot] updated from transifex 2015-01-20 01:13:34 -05:00
tobiasKaminsky
3c79991b12 Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
 2015-01-19 22:24:33 +01:00
tobiasKaminsky
b5fdba576f changes as requested 2015-01-19 22:13:45 +01:00
tobiasKaminsky
d4e0f3bdb1 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-19 21:02:37 +01:00
jabarros
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
Jenkins for ownCloud
880ffab34c [tx-robot] updated from transifex 2015-01-19 01:13:30 -05:00
tobiasKaminsky
6d5c6f86e5 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-18 17:00:29 +01:00
Jenkins for ownCloud
bdb959f2e2 [tx-robot] updated from transifex 2015-01-18 01:13:30 -05:00
Jenkins for ownCloud
46427dad18 [tx-robot] updated from transifex 2015-01-17 01:13:31 -05:00
Jenkins for ownCloud
86f9d43e8a [tx-robot] updated from transifex 2015-01-15 01:13:33 -05:00
Jenkins for ownCloud
369fb6a0be [tx-robot] updated from transifex 2015-01-14 01:13:29 -05:00
Jenkins for ownCloud
f206d8c674 [tx-robot] updated from transifex 2015-01-13 01:13:31 -05:00
jabarros
e9016281bd Add contentDescription tag into main menu items 2015-01-12 13:25:07 +01:00
David A. Velasco
b894a0a4f9 Removed ... from content description 2015-01-12 09:44:00 +01:00
Jenkins for ownCloud
26403abd0a [tx-robot] updated from transifex 2015-01-12 01:13:29 -05:00
Jenkins for ownCloud
acd19c911b [tx-robot] updated from transifex 2015-01-10 01:13:30 -05:00
tobiasKaminsky
d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-01-08 22:41:41 +01:00
jabarros
3929f1e740 Add content description tag into EditText in account_setup 2015-01-08 13:07:54 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
Jenkins for ownCloud
f670cfad8f [tx-robot] updated from transifex 2015-01-07 01:13:30 -05:00
Jenkins for ownCloud
464db6b4c5 [tx-robot] updated from transifex 2015-01-06 01:13:30 -05:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
Jenkins for ownCloud
ea101df8f5 [tx-robot] updated from transifex 2015-01-05 01:13:29 -05:00
Jenkins for ownCloud
c8dc970121 [tx-robot] updated from transifex 2015-01-04 01:13:31 -05:00
Jenkins for ownCloud
57a840c92e [tx-robot] updated from transifex 2015-01-03 01:13:28 -05:00
Jenkins for ownCloud
c03ea61704 [tx-robot] updated from transifex 2015-01-02 01:13:30 -05:00
tobiasKaminsky
cb725acdf3 - removed whitespaces 
- renamed pin description
 2015-01-01 13:06:25 +01:00
Jenkins for ownCloud
2fb89a9238 [tx-robot] updated from transifex 2015-01-01 01:13:33 -05:00
Jenkins for ownCloud
410bb307e1 [tx-robot] updated from transifex 2014-12-31 01:13:30 -05:00
tobiasKaminsky
74bd1d8d78 - clarify pin description 2014-12-30 09:35:48 +01:00
Jenkins for ownCloud
04631b6313 [tx-robot] updated from transifex 2014-12-30 01:13:30 -05:00
tobiasKaminsky
0e061f6f06 - fix #47 2014-12-29 22:36:15 +01:00
Jenkins for ownCloud
56459b1da2 [tx-robot] updated from transifex 2014-12-29 01:13:29 -05:00
Jenkins for ownCloud
4f2a917933 [tx-robot] updated from transifex 2014-12-28 01:13:30 -05:00
tobiasKaminsky
9b61fc9af6 - fixes #674, #198 2014-12-27 09:08:11 +01:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Jenkins for ownCloud
b64e5ff65b [tx-robot] updated from transifex 2014-12-26 01:13:28 -05:00
Jenkins for ownCloud
db3c9440fb [tx-robot] updated from transifex 2014-12-25 01:13:29 -05:00
Jenkins for ownCloud
64c3c9d53c [tx-robot] updated from transifex 2014-12-24 01:13:31 -05:00
Keith Abdulla
150050aeb0 fix tab indent 2014-12-23 09:38:38 -08:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
Jenkins for ownCloud
a11f951ed7 [tx-robot] updated from transifex 2014-12-23 01:13:30 -05:00
Jenkins for ownCloud
29eba16031 [tx-robot] updated from transifex 2014-12-22 01:13:44 -05:00
Jenkins for ownCloud
68e8a942a1 [tx-robot] updated from transifex 2014-12-21 01:13:29 -05:00
Jenkins for ownCloud
167c86b4ac [tx-robot] updated from transifex 2014-12-20 01:13:31 -05:00
Jenkins for ownCloud
78c1a484e7 [tx-robot] updated from transifex 2014-12-19 01:13:38 -05:00
jabarros
6f11fa1c09 Added content description tag in 'account setup' layout elements 2014-12-18 12:22:07 +01:00
Jenkins for ownCloud
f8acc67eb7 [tx-robot] updated from transifex 2014-12-18 01:13:30 -05:00
Jenkins for ownCloud
b23d33b737 [tx-robot] updated from transifex 2014-12-17 01:13:32 -05:00
Jenkins for ownCloud
2c48adc760 [tx-robot] updated from transifex 2014-12-16 01:13:32 -05:00
Jenkins for ownCloud
3772a9d78e [tx-robot] updated from transifex 2014-12-15 01:13:29 -05:00
Jenkins for ownCloud
c6ce747d8a [tx-robot] updated from transifex 2014-12-14 01:13:29 -05:00
Jenkins for ownCloud
885e76abb1 [tx-robot] updated from transifex 2014-12-13 01:13:30 -05:00
Jenkins for ownCloud
9cdcea64ee [tx-robot] updated from transifex 2014-12-12 01:13:36 -05:00
David A. Velasco
1f796350b0 Merge pull request #781 from owncloud/fix_logs_change_orientation 
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
 2014-12-11 10:21:41 +01:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
jabarros
0df8f178de Merge pull request #754 from owncloud/RadioListOnAccounts 
Account list is now a radiobutton list
 2014-12-10 08:45:12 +01:00
Keith Abdulla
3d8174a73e fix tab 2014-12-09 23:01:48 -08:00
Jenkins for ownCloud
d0ec8b4ea3 [tx-robot] updated from transifex 2014-12-10 01:13:40 -05:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
Jenkins for ownCloud
cd883c67f7 [tx-robot] updated from transifex 2014-12-08 01:13:29 -05:00
Jenkins for ownCloud
dac3ced86d [tx-robot] updated from transifex 2014-12-07 01:13:35 -05:00
Jenkins for ownCloud
940f0cc89c [tx-robot] updated from transifex 2014-12-06 01:13:30 -05:00
Jenkins for ownCloud
c7c53c93ba [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
Jenkins for ownCloud
da691e0bfd [tx-robot] updated from transifex 2014-12-04 01:13:37 -05:00
Jorge Antonio Diaz-Benito Soriano
49e8dafac0 Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-12-03 15:08:45 +01:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
jabarros
0a0c808e3b Merge pull request #662 from tobiasKaminsky/fileCount 
File count
 2014-12-02 08:31:54 +01:00
Jorge Antonio Diaz-Benito Soriano
d5566ce0a3 Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 2014-11-29 21:12:51 +01:00
Jenkins for ownCloud
37713d798b [tx-robot] updated from transifex 2014-11-28 01:13:32 -05:00
David A. Velasco
44c0d86ede Merge pull request #752 from owncloud/instant_uploads_set_path 
Better UI for settings path of instant uploads
 2014-11-26 13:10:04 +01:00
jabarros
5c0e9ca5f2 Changes after CR 2014-11-26 09:05:23 +01:00
tobiasKaminsky
611905a5d0 - Account list is now a radiobutton list 2014-11-25 17:42:41 +01:00
Jorge Antonio Diaz-Benito Soriano
10a12fb960 Merge branch 'gradleWithInternalDependency' into us4_view_text_files 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-11-24 12:57:02 +01:00
Jenkins for ownCloud
137105a38a [tx-robot] updated from transifex 2014-11-24 01:13:31 -05:00
Jenkins for ownCloud
2d66aa1dd7 [tx-robot] updated from transifex 2014-11-22 01:13:44 -05:00
tobiasKaminsky
ae6b686775 Merge remote-tracking branch 'upstream/develop' into fileCount 2014-11-21 17:59:51 +01:00
David A. Velasco
e901b609ba Merge pull request #740 from owncloud/revert-669-master 
Revert "Add "select all" option to photo (or other) upload screen"
 2014-11-21 12:23:27 +01:00
Luke Owncloud
8de07698d9 integrating @davivels remarks 2014-11-20 13:46:54 +01:00
Jenkins for ownCloud
ddfe992cbf [tx-robot] updated from transifex 2014-11-20 01:13:29 -05:00
jabarros
1435e8c406 Merge branch 'develop' into instant_uploads_set_path 2014-11-19 18:40:06 +01:00
jabarros
a2de2f28ab Add new preference on settings for setting the upload video path 2014-11-19 10:14:27 +01:00
tobiasKaminsky
bdd46fd811 cleanup 2014-11-19 09:11:44 +01:00
Jenkins for ownCloud
bb8a10f735 [tx-robot] updated from transifex 2014-11-19 01:13:30 -05:00
tobiasKaminsky
4867bb32c3 Merge remote-tracking branch 'upstream/develop' into imageGrid 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-11-18 18:08:28 +01:00
jabarros
87b242019c Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long 2014-11-18 14:57:19 +01:00
jabarros
dc8a495e55 Remove files_move layout after creating files_folder_picker one 2014-11-18 14:53:41 +01:00
jabarros
00a8eb415a Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend 2014-11-18 14:51:49 +01:00
jabarros
12b4b0397f Add view for selecting upload path folder browsing through local file list in preferences view 2014-11-18 11:01:55 +01:00
Jenkins for ownCloud
d3bfbb8568 [tx-robot] updated from transifex 2014-11-18 01:13:34 -05:00
Jorge Antonio Diaz-Benito Soriano
da2702129f Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files 2014-11-17 14:10:55 +01:00
Jenkins for ownCloud
3f5b3f0d1d [tx-robot] updated from transifex 2014-11-17 01:13:35 -05:00
Jenkins for ownCloud
1dbd577166 [tx-robot] updated from transifex 2014-11-15 01:13:35 -05:00
David A. Velasco
1b36e1ca08 Merge pull request #685 from tobiasKaminsky/beautifyTimestamps 
Relative time stamps in the list of files.
 2014-11-13 12:21:49 +01:00
Jenkins for ownCloud
02a11c3b91 [tx-robot] updated from transifex 2014-11-13 01:13:37 -05:00
David A. Velasco
17afcb0251 Merge pull request #683 from tobiasKaminsky/videoFullsize 
Bugfix: video is now playing in fullscreen
 2014-11-12 09:29:28 +01:00
tobiasKaminsky
79cb6106fd Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps 
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
 2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4 < 60 seconds -> "seconds ago" 2014-11-12 08:56:53 +01:00
Jenkins for ownCloud
1efefbd22c [tx-robot] updated from transifex 2014-11-12 01:13:41 -05:00
Jenkins for ownCloud
3c19c59d9e [tx-robot] updated from transifex 2014-11-11 01:13:34 -05:00
tobiasKaminsky
4560776ecc - use match_parent instead 2014-11-10 20:14:45 +01:00
Jenkins for ownCloud
54b814a604 [tx-robot] updated from transifex 2014-11-10 01:13:34 -05:00
Jenkins for ownCloud
ae67bbb648 [tx-robot] updated from transifex 2014-11-09 01:13:35 -05:00
Jenkins for ownCloud
2f058ad70e [tx-robot] updated from transifex 2014-11-08 01:13:37 -05:00
Jenkins for ownCloud
4ab6d85c47 [tx-robot] updated from transifex 2014-11-07 01:13:38 -05:00
Jenkins for ownCloud
5b37b99af3 [tx-robot] updated from transifex 2014-11-06 01:13:41 -05:00
tobiasKaminsky
f331120a14 Merge remote-tracking branch 'upstream/develop' into imageGrid 
Conflicts:
	owncloud-android-library
	res/layout/list_item.xml
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
 2014-11-05 22:07:11 +01:00
jabarros
eb77fe1da1 Merge pull request #700 from owncloud/remember_last_share_location_fixed 
Remember last share location
 2014-11-05 08:36:16 +01:00
Jenkins for ownCloud
02b8ac0d91 [tx-robot] updated from transifex 2014-11-05 01:13:37 -05:00
David A. Velasco
183cd732d0 Merge pull request #687 from owncloud/thumbnails_from_server 
Get remote thumbnails from server (OC8)
 2014-11-03 13:38:58 +01:00
David A. Velasco
a09a837585 Adjust the thumbnails size to the size used on screen 2014-11-03 11:27:51 +01:00
tobiasKaminsky
ccdf0f1b96 - adding possibility to create folder during upload 2014-11-01 13:41:06 +01:00
Jenkins for ownCloud
8de92ba3b0 [tx-robot] updated from transifex 2014-11-01 01:13:35 -04:00
David A. Velasco
0bedcb9128 Merge branch 'remember_last_share_location' into remember_last_share_location_fixed 2014-10-31 15:23:59 +01:00
Jenkins for ownCloud
ca0eac841a [tx-robot] updated from transifex 2014-10-31 01:13:34 -04:00
Luke Owncloud
035fc24a17 allow user to save choice of app for sending log 
warn user if no app for sending log available
 2014-10-30 09:53:24 +01:00
grecep
31ffae0093 Revert "Add "select all" option to photo (or other) upload screen" 2014-10-29 22:37:45 +01:00
grecep
fd7a940dee Merge pull request #669 from grecep/master 
Add "select all" option to photo (or other) upload screen
 2014-10-29 22:29:38 +01:00
Luke Owncloud
5caa8d25a0 use chooser for sendmail (remove explicit gmail) in LogHistory 2014-10-29 12:39:44 +01:00
Jenkins for ownCloud
068b826b32 [tx-robot] updated from transifex 2014-10-29 01:13:41 -04:00
Jorge Antonio Diaz-Benito Soriano
093bf4fb5c Reverted the text preview system to a single TextView 2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano
0c384167c1 Added some margins. 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
3877ddf85a Minor updates 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
65e82bff36 Removed any remains of list appearance 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
ec9f1c7eb8 Reworked the text file preview system to avoid UI freezes with large text files 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
7cc88a22d1 Added text file preview 2014-10-28 19:11:30 +01:00
Jenkins for ownCloud
5acc314524 [tx-robot] updated from transifex 2014-10-28 01:13:38 -04:00
Jenkins for ownCloud
495c812671 [tx-robot] updated from transifex 2014-10-27 01:13:33 -04:00
Jenkins for ownCloud
3507ff8003 [tx-robot] updated from transifex 2014-10-26 01:13:34 -04:00
tobiasKaminsky
b18fabe9d7 - bugfix: video is now playing in fullscreen 2014-10-25 18:55:15 +02:00
Jenkins for ownCloud
27bcd4de0a [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
tobiasKaminsky
fbc3d970c5 Merge remote-tracking branch 'upstream/develop' into fileCount 
Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-24 18:18:06 +02:00
David A. Velasco
01f1f62d2c Merge pull request #676 from owncloud/sorting_files 
Added sorting by name or date
 2014-10-24 13:24:35 +02:00
Jenkins for ownCloud
8a77b0be15 [tx-robot] updated from transifex 2014-10-24 01:13:37 -04:00
jabarros
3bd60c2b0f Fixed. In devices with Android 2.x 'Sort' option in menu has not icon related 2014-10-23 18:05:28 +02:00
jabarros
6970560d2f Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99 Merge branch 'develop' into sorting_files_2 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-23 10:18:20 +02:00
Jenkins for ownCloud
832a98f47c [tx-robot] updated from transifex 2014-10-23 01:13:40 -04:00
Jenkins for ownCloud
2e6410e771 [tx-robot] updated from transifex 2014-10-22 01:14:52 -04:00
Magnus Sjoqvist
52bf54a00d Removes remember last share location setting 2014-10-21 17:27:47 +02:00
Magnus Sjoqvist
2b1865d1d0 Removes translations 2014-10-21 16:17:00 +02:00
Jenkins for ownCloud
7dc7e85df8 [tx-robot] updated from transifex 2014-10-21 01:15:22 -04:00
tobiasKaminsky
c1f920cc75 - update folder_public name 2014-10-20 19:46:10 +02:00
jabarros
3a8ff76d0a Merge branch 'master' into develop 
Conflicts:
	owncloud-android-library
 2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
844790057b Merge with develop 2014-10-20 14:38:13 +02:00
David A. Velasco
6ed394195d Merge pull request #658 from owncloud/instant_upload_path_chooseable 
Instant upload path chooseable
 2014-10-20 13:56:18 +02:00
Jenkins for ownCloud
8be4bb14a3 [tx-robot] updated from transifex 2014-10-20 01:14:34 -04:00
tobiasKaminsky
635394f2a2 - minor design changes 2014-10-19 08:56:57 +02:00
tobiasKaminsky
4e960eafeb added "x folders and y files" to end of list 2014-10-18 10:47:08 +02:00
Magnus Sjoqvist
b6c7719415 Merge with develop 2014-10-17 11:06:30 +02:00
Jenkins for ownCloud
95a02855ee [tx-robot] updated from transifex 2014-10-17 01:13:52 -04:00
Jenkins for ownCloud
475dff85c6 [tx-robot] updated from transifex 2014-10-16 01:14:37 -04:00
jabarros
016bdfac1f Fixed. Upload path is not place correctly in setting view 2014-10-15 08:21:23 +02:00
Jenkins for ownCloud
1ffa6e969a [tx-robot] updated from transifex 2014-10-15 01:13:34 -04:00
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
Jenkins for ownCloud
ea04e197c7 [tx-robot] updated from transifex 2014-10-14 01:13:35 -04:00
Jenkins for ownCloud
a2d4800df5 [tx-robot] updated from transifex 2014-10-12 01:13:37 -04:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size 
calculation
 2014-10-11 09:14:14 +02:00
tobiasKaminsky
5da452c47e - images 2014-10-11 09:03:43 +02:00
Jenkins for ownCloud
d645343671 [tx-robot] updated from transifex 2014-10-11 01:13:34 -04:00
tobiasKaminsky
b452c1711f - removed german translation 2014-10-10 17:13:08 +02:00
grecep
df4f60dda4 select all / deselect all file in upload menu 2014-10-10 14:05:49 +02:00
David A. Velasco
ca3e73065d Merge branch 'develop' into instant_upload_path_chooseable 2014-10-10 11:04:37 +02:00
Jenkins for ownCloud
1a52095f01 [tx-robot] updated from transifex 2014-10-10 04:18:14 -04:00
Jenkins for ownCloud
73959beb7a [tx-robot] updated from transifex 2014-10-10 01:13:33 -04:00
jabarros
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-09 17:26:02 +02:00
jabarros
95639df3ae Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation 2014-10-09 17:07:50 +02:00
Jenkins for ownCloud
3068752b02 [tx-robot] updated from transifex 2014-10-08 01:13:40 -04:00
Jenkins for ownCloud
a63e9b16f4 [tx-robot] updated from transifex 2014-10-07 01:13:42 -04:00
jabarros
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
Jenkins for ownCloud
ad518e318c [tx-robot] updated from transifex 2014-10-06 01:13:33 -04:00
Jenkins for ownCloud
45031a321f [tx-robot] updated from transifex 2014-10-05 01:13:36 -04:00
tobiasKaminsky
8ae90ee5e5 - new icons 2014-10-04 11:56:43 +02:00
Jenkins for ownCloud
0c7438de16 [tx-robot] updated from transifex 2014-10-04 01:13:31 -04:00
Jenkins for ownCloud
54dc2756b8 [tx-robot] updated from transifex 2014-10-03 01:13:33 -04:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
Jenkins for ownCloud
d81c19c963 [tx-robot] updated from transifex 2014-10-01 19:22:04 -04:00
Jenkins for ownCloud
b7674b49e9 [tx-robot] updated from transifex 2014-10-01 06:54:48 -04:00
jabarros
b35f0f0af2 Merge pull request #632 from wakeup/patch-1 
fix owncloud capitalization
 2014-10-01 11:40:16 +02:00
Javier Gonzalez
ab61008c9d Merge pull request #642 from owncloud/remove_values_fil_folder 
Fix. Remove 'values-fil' folder for allowing the project compilation
 2014-09-30 14:15:31 +02:00
jabarros
52ddd7ebdd Fix. Remove 'values-fil' for allow the project compilation 2014-09-30 14:04:52 +02:00
Jenkins for ownCloud
40ed6e4195 [tx-robot] updated from transifex 2014-09-30 01:13:36 -04:00
Jenkins for ownCloud
99ca27e87e [tx-robot] updated from transifex 2014-09-29 01:13:33 -04:00
Jenkins for ownCloud
ea87065c8d [tx-robot] updated from transifex 2014-09-28 01:13:32 -04:00
Jenkins for ownCloud
8cdd84f204 [tx-robot] updated from transifex 2014-09-27 01:13:32 -04:00
Jenkins for ownCloud
1d2cc1bdc7 [tx-robot] updated from transifex 2014-09-25 01:13:37 -04:00
Jenkins for ownCloud
622b27bc71 [tx-robot] updated from transifex 2014-09-24 01:13:39 -04:00
loripino21
30726d2cfa Update preferences.xml 2014-09-23 10:09:02 +02:00
loripino21
47d1a5e3e4 Update strings.xml 2014-09-23 10:08:40 +02:00
loripino21
63187c7555 Update preferences.xml 2014-09-23 10:04:54 +02:00
loripino21
72c6e981c5 Update strings.xml 2014-09-23 10:03:56 +02:00
Jenkins for ownCloud
b38599d1e5 [tx-robot] updated from transifex 2014-09-23 01:48:41 -04:00
tobiasKaminsky
9bdebfa88f - switch to 72dp 
- sharedWithMe default invisible
 2014-09-22 17:52:52 +02:00
jabarros
cf97936b76 Add customize Imageview and TouchImageView for fixing problem of seeing big pictures on nexus 7 
:q
exit
:q
 2014-09-22 09:27:23 +02:00
tobiasKaminsky
07e4eaac9a changed do 64x64 filetype icons 2014-09-21 19:19:25 +02:00
Jenkins for ownCloud
4d2ab04d69 [tx-robot] updated from transifex 2014-09-21 01:13:31 -04:00
Jenkins for ownCloud
4b354fa02b [tx-robot] updated from transifex 2014-09-20 01:13:34 -04:00
Volkan Gezer
863c0145be fix owncloud capitalization 2014-09-19 18:10:20 +02:00
Jenkins for ownCloud
278b356f56 [tx-robot] updated from transifex 2014-09-19 01:13:43 -04:00
tobiasKaminsky
5434504486 - renamed ImageViews 
- switch to 80x80px filetype icon
 2014-09-18 21:36:43 +02:00
David A. Velasco
aa354e5d73 Merge branch 'develop' into release-1.6.0 2014-09-18 14:27:13 +02:00
David A. Velasco
5a54bfdc4d Merge pull request #631 from owncloud/new_shared_by_link_icons 
Change shared-by-link folder icon and right badge
 2014-09-18 14:17:03 +02:00
jabarros
33c171e6d4 Update string auth_redirect_non_secure_connection_title 2014-09-18 10:57:51 +02:00
jabarros
c3e3160727 Fixed bug. When downloading two files, it is not possible to come back to the file list. Bars does not appear. 2014-09-18 09:36:35 +02:00
David A. Velasco
ea5c4760c2 Fixed conflict - Merge branch 'develop' into better_loggin_system 2014-09-18 09:31:24 +02:00
Jenkins for ownCloud
9224d35adc [tx-robot] updated from transifex 2014-09-18 01:13:34 -04:00
tobiasKaminsky
3cab2038a3 3row Grid 2014-09-17 17:21:26 +02:00
jabarros
74c29e1ce1 Changes after CR 2014-09-17 16:46:11 +02:00
jabarros
2ef886af31 Merge branch 'develop' into better_loggin_system 2014-09-17 09:47:34 +02:00
Jenkins for ownCloud
c20c9100e5 [tx-robot] updated from transifex 2014-09-17 01:13:45 -04:00
Jenkins for ownCloud
2878d39b05 [tx-robot] updated from transifex 2014-09-16 01:13:34 -04:00
tobiasKaminsky
ca59c75371 - GridLayout 2014-09-15 19:12:12 +02:00
tobiasKaminsky
a622b1dcfb - Only three orders: A-Z, Big-Small, New-Old. 
- Folder size is computed locally (therefore only downloaded files are
obeyed)
 2014-09-15 16:04:46 +02:00
tobiasKaminsky
c98f2b56c6 Renamed sorting labels 2014-09-15 11:42:27 +02:00
tobiasKaminsky
4f1b50795c Beginning gridView 2014-09-15 09:41:54 +02:00
Jenkins for ownCloud
041bc26842 [tx-robot] updated from transifex 2014-09-15 01:13:31 -04:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +02:00
Jenkins for ownCloud
e630b8a342 [tx-robot] updated from transifex 2014-09-14 01:13:32 -04:00
Jenkins for ownCloud
98a9442219 [tx-robot] updated from transifex 2014-09-13 05:15:57 -04:00
David A. Velasco
cbdb5d3ff0 Fixed mess created with b9eaffd 2014-09-12 13:49:37 +02:00
Jenkins for ownCloud
1d292aa224 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
jabarros
4599553545 Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity 2014-09-11 18:26:52 +02:00
David A. Velasco
b9eaffdecd Fixed typo in strings.xml 2014-09-11 17:18:54 +02:00
jabarros
c8fe95b914 Set maximum file size for logs and format logs info 2014-09-11 12:39:24 +02:00
Jenkins for ownCloud
bb1177074c [tx-robot] updated from transifex 2014-09-11 01:13:35 -04:00
jabarros
ba6c6375cf Merge branch 'develop' into ADFS_auth_support 
Conflicts:
	res/values/strings.xml
 2014-09-09 13:17:41 +02:00
Jenkins for ownCloud
84d640e0c9 [tx-robot] updated from transifex 2014-09-09 01:13:38 -04:00
Jenkins for ownCloud
40f331dbd1 [tx-robot] updated from transifex 2014-09-07 01:13:35 -04:00
Jenkins for ownCloud
bf003e6c44 [tx-robot] updated from transifex 2014-09-06 01:13:43 -04:00
jabarros
12d64c769f Merge pull request #608 from owncloud/move_files_and_folders 
Added capability to move files (and folders)
 2014-09-05 14:20:54 +02:00
Jenkins for ownCloud
85eb7dd8b9 [tx-robot] updated from transifex 2014-09-05 01:13:41 -04:00
jabarros
499c691707 Changes after CR 2014-09-04 18:23:39 +02:00
jabarros
2ada53c99b Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached. 2014-09-04 09:06:14 +02:00
Jenkins for ownCloud
2e9a926626 [tx-robot] updated from transifex 2014-09-04 01:13:34 -04:00
Jenkins for ownCloud
e073ef1489 [tx-robot] updated from transifex 2014-09-03 01:13:33 -04:00
David A. Velasco
1dbba08c7b Improved messages for operations on files not existing anymore in the server 2014-09-02 10:13:14 +02:00
Jenkins for ownCloud
01599dde3d [tx-robot] updated from transifex 2014-09-02 01:13:29 -04:00
loripino21
b221772982 Update preferences.xml 2014-09-01 11:56:38 +02:00
Jenkins for ownCloud
0f47ef4605 [tx-robot] updated from transifex 2014-08-31 13:01:27 -04:00
Jenkins for ownCloud
328969aba4 [tx-robot] updated from transifex 2014-08-30 01:13:34 -04:00
Jenkins for ownCloud
3535c8c577 [tx-robot] updated from transifex 2014-08-29 01:13:35 -04:00
jabarros
622523b3e3 Show alert message when user or password in authentication is not correct 2014-08-28 16:03:03 +02:00
jabarros
28614af18d Merge branch 'develop' into move_files_and_folders 2014-08-28 12:32:39 +02:00