mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 15:01:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
3395 commits 221 branches 1585 tags 637 MiB
Commit graph

1296 commits

Author SHA1 Message Date
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
jabarros
d3d0816ed7 Show a dialog to request username and password to the user on authentication request 2014-08-28 12:30:32 +02:00
Jenkins for ownCloud
06fc13164e [tx-robot] updated from transifex 2014-08-28 01:13:39 -04:00
jabarros
8188d4fa92 Update messages for moving files operation results 2014-08-27 10:01:28 +02:00
Jenkins for ownCloud
ffa670564e [tx-robot] updated from transifex 2014-08-27 01:13:36 -04:00
jabarros
622d78906b Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it 2014-08-26 18:44:14 +02:00
jabarros
a6afe6efd2 Add gestion for errors when moving files 2014-08-26 17:44:18 +02:00
Jenkins for ownCloud
8eb5694779 [tx-robot] updated from transifex 2014-08-26 01:13:33 -04:00
Jenkins for ownCloud
42368f2cef [tx-robot] updated from transifex 2014-08-25 01:13:29 -04:00
Jenkins for ownCloud
260b8ea7d6 [tx-robot] updated from transifex 2014-08-24 01:13:27 -04:00
Jenkins for ownCloud
5ff82b59c2 [tx-robot] updated from transifex 2014-08-23 01:13:32 -04:00
Jenkins for ownCloud
3e59c9419b [tx-robot] updated from transifex 2014-08-22 01:13:29 -04:00
Jenkins for ownCloud
d51ccc672f [tx-robot] updated from transifex 2014-08-21 01:13:29 -04:00
Jenkins for ownCloud
6ea9659485 [tx-robot] updated from transifex 2014-08-20 01:13:28 -04:00
Jenkins for ownCloud
6ba82feff8 [tx-robot] updated from transifex 2014-08-19 01:13:29 -04:00
Jenkins for ownCloud
65177ec552 [tx-robot] updated from transifex 2014-08-18 01:13:31 -04:00
Jenkins for ownCloud
4c0465717d [tx-robot] updated from transifex 2014-08-17 01:13:27 -04:00
Jenkins for ownCloud
1d9d7076a3 [tx-robot] updated from transifex 2014-08-16 01:13:32 -04:00
Jenkins for ownCloud
4ef8e9472f [tx-robot] updated from transifex 2014-08-15 01:13:35 -04:00
Jenkins for ownCloud
b810de2583 [tx-robot] updated from transifex 2014-08-14 01:13:33 -04:00
jabarros
dc984ec5bf Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders 2014-08-13 16:43:50 +02:00
Jenkins for ownCloud
5ea2e515fa [tx-robot] updated from transifex 2014-08-13 01:13:38 -04:00
David A. Velasco
0cc6b8a3ff Improved English wording 2014-08-12 09:27:23 +02:00
Jenkins for ownCloud
c635d4f023 [tx-robot] updated from transifex 2014-08-12 01:13:37 -04:00
jabarros
fbe0568883 Add into file_actions_menu xml the 'move' option 2014-08-11 14:39:44 +02:00
Jenkins for ownCloud
0de5929b5b [tx-robot] updated from transifex 2014-08-11 01:13:33 -04:00
Jenkins for ownCloud
814c668b21 [tx-robot] updated from transifex 2014-08-10 01:13:34 -04:00
Jenkins for ownCloud
3ef2d2ee1d [tx-robot] updated from transifex 2014-08-09 01:13:38 -04:00
purigarcia
7c26ffd64e Merge pull request #584 from owncloud/accounts_view 
Accounts view
 2014-08-08 09:19:59 +02:00
Jenkins for ownCloud
57784b1da5 [tx-robot] updated from transifex 2014-08-08 01:13:44 -04:00
jabarros
b154fba6ee Merge branch 'develop' into accounts_view 
Conflicts:
	res/values/strings.xml
 2014-08-07 17:34:15 +02:00
jabarros
c4359ce393 Remove classes not used more after changing the view of OC accounts 2014-08-07 16:23:42 +02:00
jabarros
b6a5c74d2d Merge pull request #582 from owncloud/unsecured_server_connection 
Unsecured server connection
 2014-08-07 16:04:10 +02:00
David A. Velasco
aa4709024e Updated message for warning about HTTPS -> HTTP redirection 2014-08-07 13:32:22 +02:00
Jenkins for ownCloud
135150c5a8 [tx-robot] updated from transifex 2014-08-07 01:13:36 -04:00
jabarros
8d8c9eb315 Include 'add account' button after last account listed 2014-08-06 09:25:25 +02:00
jabarros
471d64a16c Change the title of preference for adding new accounts and remove unused commented code 2014-08-06 09:23:21 +02:00
Jenkins for ownCloud
e9fa178abf [tx-robot] updated from transifex 2014-08-06 01:13:39 -04:00
jabarros
8ce8577fa7 Show all the active accounts on settings view and make behaviour of accounts checkbox similar to radio buttons 2014-08-05 15:05:03 +02:00
jabarros
5cba80a1ab Add new preference category on settings and list in it the accounts 2014-08-05 11:22:16 +02:00
Jenkins for ownCloud
05c43c4d0f [tx-robot] updated from transifex 2014-08-05 01:13:37 -04:00
jabarros
fcb556eb2d Show appropiate message and update library reference 2014-08-04 10:21:48 +02:00
Jenkins for ownCloud
d33df6f362 [tx-robot] updated from transifex 2014-08-04 01:13:38 -04:00
Jenkins for ownCloud
f97fedcd63 [tx-robot] updated from transifex 2014-08-03 01:13:35 -04:00
Jenkins for ownCloud
22d1398f43 [tx-robot] updated from transifex 2014-08-02 01:13:35 -04:00
jabarros
687331ec28 Change folder and rigth shared by link icons 2014-08-01 10:38:37 +02:00
Jenkins for ownCloud
a05b9a85a1 [tx-robot] updated from transifex 2014-08-01 01:13:34 -04:00
Jenkins for ownCloud
e3832c1cbf [tx-robot] updated from transifex 2014-07-31 01:13:40 -04:00
David A. Velasco
41666b2d6c Merge pull request #578 from owncloud/show_message_for_empty_list 
Show background message when list of files is empty
 2014-07-30 09:40:17 +02:00
jabarros
ac18a468e8 Changes after CR 2014-07-30 09:35:31 +02:00
David A. Velasco
5756dd8ac4 Merge pull request #575 from owncloud/images_gallery_zoom 
Pinch-to-zoom in preview of images
 2014-07-30 09:13:57 +02:00
Jenkins for ownCloud
c150f33958 [tx-robot] updated from transifex 2014-07-30 01:13:34 -04:00
jabarros
5335975717 Fixed bug. It is not possible to refresh folder when it is empty 2014-07-29 15:04:06 +02:00
jabarros
20bb37701c Use Extended view pager and set onTouchListener into image forshow/hide the action bar 2014-07-29 08:26:10 +02:00
Jenkins for ownCloud
794267ba85 [tx-robot] updated from transifex 2014-07-29 01:13:34 -04:00
jabarros
a8c4271673 Change element ImageView of preview image fragment for TouchImageView in order to allow make zoom on the image 2014-07-28 11:11:28 +02:00
Jenkins for ownCloud
d7103316eb [tx-robot] updated from transifex 2014-07-28 01:13:32 -04:00
Jenkins for ownCloud
2e7473451f [tx-robot] updated from transifex 2014-07-27 01:13:32 -04:00
Jenkins for ownCloud
a7edc8f045 [tx-robot] updated from transifex 2014-07-26 01:13:37 -04:00
jabarros
89e7ad9e67 Show message when the file list is being loading and when it is empty 2014-07-25 13:13:58 +02:00
jabarros
2b21d67791 Add case for when trying to download a file that is no longer available on the server 2014-07-25 09:11:21 +02:00
jabarros
61c8f7f083 Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity 2014-07-25 09:11:20 +02:00
jabarros
a28fa921c9 Update ErrorMessageAdapter class to generate appropiate error messages for operations failed due to lack of permissions (ResultCode.FORBIDDEN) 2014-07-25 09:10:26 +02:00
Jenkins for ownCloud
843a47ebd0 [tx-robot] updated from transifex 2014-07-25 01:13:41 -04:00
jabarros
fb1a4bad59 Add message when LocalFileList and OCFileLIst are empty 2014-07-24 18:34:12 +02:00
David A. Velasco
9953a942ea Merge branch 'master' into develop 2014-07-24 09:30:11 +02:00
Jenkins for ownCloud
3dd7015ebb [tx-robot] updated from transifex 2014-07-24 01:13:37 -04:00
Jenkins for ownCloud
707f00b8d4 [tx-robot] updated from transifex 2014-07-22 01:13:32 -04:00
Jenkins for ownCloud
3a1a294f79 [tx-robot] updated from transifex 2014-07-20 01:13:36 -04:00
Jenkins for ownCloud
825c593e40 [tx-robot] updated from transifex 2014-07-18 01:13:35 -04:00
Jenkins for ownCloud
4367efcffc [tx-robot] updated from transifex 2014-07-17 01:13:33 -04:00
jabarros
04ddaaef6b Fixed bug. Changed icon for 'send' option in file actions menu 2014-07-15 12:45:28 +02:00
jabarros
b0eeca0e80 Fixed bug. Changed icons for 'open file with' and 'rename' file options 2014-07-15 10:09:33 +02:00
jabarros
055be96386 Remove InstantUploadActivity and related resources 2014-07-14 08:40:16 +02:00
Jenkins for ownCloud
edc743a15a [tx-robot] updated from transifex 2014-07-12 01:13:34 -04:00
Jenkins for ownCloud
3765e677f5 [tx-robot] updated from transifex 2014-07-10 03:57:16 -04:00
jabarros
ab5e9250d2 Fixed bug. The size of a file is moved to the left when it is shared by link 2014-07-09 17:52:52 +02:00
jabarros
64a94f351d Fixed bug. Icons are not shown correctly in the file list 2014-07-09 17:26:20 +02:00
David A. Velasco
49c69609ea Merge branch 'develop' into release-1.5.8 2014-07-09 12:27:35 +02:00
jabarros
df5fe2d648 Change the star and downloaded/downloading/uploading icons in list_item layout desing 2014-07-09 09:09:37 +02:00
Jenkins for ownCloud
666634ec7c [tx-robot] updated from transifex 2014-07-09 01:13:35 -04:00
jabarros
96e2d198e0 Merge branch 'develop' into release-1.5.8 2014-07-08 13:03:09 +02:00
David A. Velasco
4c4a0cb023 Merge pull request #555 from owncloud/update_shared_folder_icon 
Updated icon for folder publicly shared.
 2014-07-08 12:57:19 +02:00
jabarros
0bca42bcd8 Remove unused class FailedUploadActivity and related resources 2014-07-07 13:52:13 +02:00
jabarros
df8e9fa2c3 Merge pull request #541 from owncloud/fix_issue_540 
Fix issue 540
 2014-07-07 13:02:42 +02:00
jabarros
ed909e45f3 Remove duplicate ic_action_create_dir and ic_action_upload icons 2014-07-07 12:27:09 +02:00
jabarros
0b8cf52626 Add folder public icon 2014-07-07 10:48:13 +02:00
jabarros
19e0f950e0 Show left side icons in the list of files with size 32x32 dp instead of the current 20x20 dp 2014-07-07 09:22:12 +02:00
Jenkins for ownCloud
90e8f0670b [tx-robot] updated from transifex 2014-07-07 01:13:33 -04:00
Jenkins for ownCloud
8c68242a07 [tx-robot] updated from transifex 2014-07-05 01:13:32 -04:00
Jenkins for ownCloud
8b0640ccaf [tx-robot] updated from transifex 2014-07-04 01:13:34 -04:00
Jenkins for ownCloud
21cd516854 [tx-robot] updated from transifex 2014-07-03 01:13:40 -04:00
rperezb
0238522c54 Merge pull request #551 from owncloud/add_cookie_based_session_support 
Added cookie based session support
 2014-07-02 10:14:03 +02:00
Jenkins for ownCloud
8209626380 [tx-robot] updated from transifex 2014-07-02 01:13:37 -04:00
David A. Velasco
dacc14a882 Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support 2014-07-01 14:21:26 +02:00
David A. Velasco
fe4fc7a612 Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library 2014-07-01 09:59:38 +02:00
jabarros
5dcc9f8de4 Change order of showing 'shared link' and 'shared with me' icons when both visibles 2014-07-01 09:59:36 +02:00
jabarros
be0990baac Hide 'shared with me' icon when file does not have 'S' permission 2014-07-01 09:59:31 +02:00
jabarros
1e8337fbce Update class FileListAdapter to show new icon for a file and folder that includes 'S' in the permission property. Changed list item layout for showing 'sharedlink' and 'shared with me' icons. 2014-07-01 09:59:30 +02:00
jabarros
fc579b9221 Replace old sharelink icon for new one. Add 'shared with me' new icons 2014-07-01 09:59:29 +02:00
Jenkins for ownCloud
2e6605be8b [tx-robot] updated from transifex 2014-06-30 01:13:36 -04:00
Jenkins for ownCloud
984cc1e31b [tx-robot] updated from transifex 2014-06-29 01:13:33 -04:00
Jenkins for ownCloud
a9ef6b0350 [tx-robot] updated from transifex 2014-06-28 01:13:35 -04:00
Jenkins for ownCloud
3128e5f504 [tx-robot] updated from transifex 2014-06-27 01:13:35 -04:00
David A. Velasco
1958964f56 Added lost string for previous commit 2014-06-26 11:33:51 +02:00
Jenkins for ownCloud
6ac17711c5 [tx-robot] updated from transifex 2014-06-26 01:13:35 -04:00
Jenkins for ownCloud
00937b388d [tx-robot] updated from transifex 2014-06-25 06:30:41 -04:00
David A. Velasco
c266cccb23 Fixed lost pronoun 2014-06-24 14:51:39 +02:00
Jenkins for ownCloud
1e0df5838f [tx-robot] updated from transifex 2014-06-24 01:13:38 -04:00
David A. Velasco
bcfd1f63bd Merge remote-tracking branch 'origin/develop' into develop 2014-06-23 08:49:06 +02:00
David A. Velasco
7c34300268 Improved message 2014-06-23 08:48:42 +02:00
Jenkins for ownCloud
670b22fb69 [tx-robot] updated from transifex 2014-06-22 01:13:33 -04:00
Jenkins for ownCloud
663060241b [tx-robot] updated from transifex 2014-06-21 01:13:36 -04:00
Jenkins for ownCloud
41d75060c1 [tx-robot] updated from transifex 2014-06-19 01:13:33 -04:00
Jenkins for ownCloud
4e8448cb5f [tx-robot] updated from transifex 2014-06-18 01:13:34 -04:00
Jenkins for ownCloud
fd0c35337b [tx-robot] updated from transifex 2014-06-17 01:13:35 -04:00
masensio
f2320691b3 Update branding: instead of specific option, make that using SAML authentication implies enabling the SingleSessionManager. 2014-06-16 13:18:29 +02:00
Jenkins for ownCloud
56404834db [tx-robot] updated from transifex 2014-06-16 01:13:35 -04:00
masensio
1863b75785 Update ic_action_create_dir and ic_action_upload in drawable folders, to show them on actionBar (dark grey --> light gray) 2014-06-13 13:50:18 +02:00
Jenkins for ownCloud
839c7d0bfa [tx-robot] updated from transifex 2014-06-13 01:13:34 -04:00
David A. Velasco
d70e5b37c2 Updated setup file 2014-06-12 09:10:43 +02:00
Jenkins for ownCloud
f108b7dc82 [tx-robot] updated from transifex 2014-06-12 01:13:33 -04:00
Jenkins for ownCloud
2cfdeaccb2 [tx-robot] updated from transifex 2014-06-11 01:13:32 -04:00
Jenkins for ownCloud
0d94e2f199 [tx-robot] updated from transifex 2014-06-09 01:13:33 -04:00
Jenkins for ownCloud
485dab7a25 [tx-robot] updated from transifex 2014-06-07 01:13:33 -04:00
Jenkins for ownCloud
7c2f5e6f64 [tx-robot] updated from transifex 2014-06-06 01:13:33 -04:00
Jenkins for ownCloud
e617a98f29 [tx-robot] updated from transifex 2014-06-05 01:13:35 -04:00
David A. Velasco
edb8c54e3f Merge pull request #526 from owncloud/pull_down_refresh 
Pull down to refresh in list of files.
 2014-06-04 08:46:41 +02:00
Jenkins for ownCloud
18c1b4abfc [tx-robot] updated from transifex 2014-06-04 01:13:35 -04:00
masensio
19978340c1 Merge branch 'develop' into pull_down_refresh 2014-06-03 10:23:47 +02:00
Jenkins for ownCloud
445c3dc9ac [tx-robot] updated from transifex 2014-06-01 06:08:26 -04:00
Jenkins for ownCloud
0325e6a0a2 [tx-robot] updated from transifex 2014-06-01 01:13:34 -04:00
Jenkins for ownCloud
efee32876e [tx-robot] updated from transifex 2014-05-31 01:13:38 -04:00
masensio
ca555b2cd8 Merge branch 'develop' into pull_down_refresh 2014-05-30 14:16:33 +02:00
masensio
abbf2252a3 Maintain the loading visibility on action bar instead of the pull refresh animation 2014-05-30 14:16:08 +02:00
masensio
17c9af3541 Merge branch 'master' into develop 2014-05-30 09:30:05 +02:00
masensio
aa9c09372d Merge branch 'develop' into pull_down_refresh 2014-05-30 08:35:19 +02:00
Jenkins for ownCloud
42f4659609 [tx-robot] updated from transifex 2014-05-30 01:13:36 -04:00
masensio
6451222f8d Select the animation for the SwipeRefreshLayout 2014-05-29 17:07:16 +02:00
masensio
88d855e49c Modify list_fragment.xml, adding SwipePrefreshLayout 2014-05-29 15:51:38 +02:00
Jenkins for ownCloud
902bc3d9cd [tx-robot] updated from transifex 2014-05-29 01:13:34 -04:00
masensio
9fa747d3d1 Update failed_upload_load_more_images string 2014-05-28 17:16:20 +02:00
David A. Velasco
4bb658fe88 Fixed typo in strings 2014-05-28 14:55:18 +02:00
masensio
a3a5cd4eb7 Merge branch 'develop' into release-1.5.6 2014-05-27 13:18:41 +02:00
masensio
476bfba9e4 Update file images, add new mimetypes to show: spreadsheets, impress, rar, rtf and 3gp 2014-05-27 13:16:16 +02:00
masensio
ba1a428964 Modify strings: can not --> cannot, remove space before ? 2014-05-27 09:08:10 +02:00
masensio
bcab40c535 Use ErrorMessageAdapter to access the error string when an error in a finished foreground operation occurs 2014-05-26 14:56:51 +02:00
masensio
db43531874 Add specific message(s) for network error(s) in strings.xml 2014-05-26 13:00:22 +02:00
masensio
f849570b0a Merge branch 'develop' into more_concrete_error_messages_session_expires 2014-05-26 08:52:38 +02:00
Jenkins for ownCloud
f6fec8bfdd [tx-robot] updated from transifex 2014-05-26 01:13:38 -04:00
Jenkins for ownCloud
2546b69f91 [tx-robot] updated from transifex 2014-05-25 01:13:33 -04:00
Jenkins for ownCloud
7848298c38 [tx-robot] updated from transifex 2014-05-24 01:13:34 -04:00
masensio
0a7f748902 Define strings for failes uploads/downloads with credentials errors 2014-05-23 09:40:09 +02:00
Jenkins for ownCloud
600dd05778 [tx-robot] updated from transifex 2014-05-22 01:13:36 -04:00
masensio
57fe5e08fd Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-20 12:16:16 +02:00
Jenkins for ownCloud
50da978c29 [tx-robot] updated from transifex 2014-05-20 01:13:35 -04:00
masensio
c39e851f5e Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-19 08:29:28 +02:00
Jenkins for ownCloud
1c5f333104 [tx-robot] updated from transifex 2014-05-18 01:13:32 -04:00
Jenkins for ownCloud
1d65d58a29 [tx-robot] updated from transifex 2014-05-17 01:13:34 -04:00
David A. Velasco
dfdc713a15 Created new dialog classes for file renaming and folder creations 2014-05-16 14:57:19 +02:00
Jenkins for ownCloud
061b3fc3c0 [tx-robot] updated from transifex 2014-05-16 01:13:34 -04:00
masensio
e373f0c3b1 Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-15 08:52:11 +02:00
Jenkins for ownCloud
ce5701437e [tx-robot] updated from transifex 2014-05-15 01:13:33 -04:00
masensio
491780ad1d Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-14 08:58:04 +02:00
Jenkins for ownCloud
581da955c5 [tx-robot] updated from transifex 2014-05-13 01:14:31 -04:00
masensio
c1eb0ee621 Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-12 12:57:11 +02:00
David A. Velasco
1ced3ca77b Moved 'see details' to the last position of menu 2014-05-12 12:17:57 +02:00
Jenkins for ownCloud
bb3f01b2ed [tx-robot] updated from transifex 2014-05-12 01:14:30 -04:00
Jenkins for ownCloud
a8e5885272 [tx-robot] updated from transifex 2014-05-11 01:14:25 -04:00
Jenkins for ownCloud
78f719d404 [tx-robot] updated from transifex 2014-05-10 01:14:32 -04:00
Jenkins for ownCloud
c8997bd194 [tx-robot] updated from transifex 2014-05-09 01:14:31 -04:00
Jenkins for ownCloud
409c40834d [tx-robot] updated from transifex 2014-05-08 01:14:30 -04:00
Jenkins for ownCloud
e802d7b740 [tx-robot] updated from transifex 2014-05-07 01:14:31 -04:00
Jenkins for ownCloud
20a15a8de2 [tx-robot] updated from transifex 2014-05-04 01:14:33 -04:00
Jenkins for ownCloud
7de62fe300 [tx-robot] updated from transifex 2014-05-03 01:14:34 -04:00
Jenkins for ownCloud
4dbbbea943 [tx-robot] updated from transifex 2014-05-01 01:13:49 -04:00
Jenkins for ownCloud
9dcc5ce524 [tx-robot] updated from transifex 2014-04-30 01:13:45 -04:00
Jenkins for ownCloud
05abbd857f [tx-robot] updated from transifex 2014-04-28 01:13:44 -04:00
Jenkins for ownCloud
3769851ef6 [tx-robot] updated from transifex 2014-04-26 01:13:45 -04:00
Jenkins for ownCloud
c2a523f8d1 [tx-robot] updated from transifex 2014-04-25 01:13:45 -04:00
Jenkins for ownCloud
6c332a15c0 [tx-robot] updated from transifex 2014-04-24 01:13:43 -04:00
Jenkins for ownCloud
1bf039dfbd [tx-robot] updated from transifex 2014-04-23 01:13:48 -04:00
Javier Gonzalez
d60ddd81a0 Merge pull request #149 from owncloud/videoInstandUploads 
Issue #136  [Feature] Instant upload of videos
 2014-04-22 12:47:26 +02:00
Jenkins for ownCloud
f5b6a68b62 [tx-robot] updated from transifex 2014-04-22 01:13:43 -04:00
David A. Velasco
68f4ceb5a7 Separate options to enable & disable instant upload of new pictures and new videos 2014-04-21 10:49:31 +02:00
Jenkins for ownCloud
780c7e89a0 [tx-robot] updated from transifex 2014-04-21 01:14:57 -04:00
Jenkins for ownCloud
cc95c1321b [tx-robot] updated from transifex 2014-04-20 01:14:56 -04:00
David A. Velasco
33b0909e7b Merge branch 'develop' into videoInstandUploads 2014-04-16 19:31:27 +02:00
Mr. Jenkins
97d4975bc5 [tx-robot] updated from transifex 2014-04-16 01:15:02 -04:00
Mr. Jenkins
0004094313 [tx-robot] updated from transifex 2014-04-14 01:14:06 -04:00
Mr. Jenkins
43446e359f [tx-robot] updated from transifex 2014-04-13 01:14:05 -04:00
Mr. Jenkins
53840ec422 [tx-robot] updated from transifex 2014-04-11 01:14:08 -04:00
Mr. Jenkins
ebc4f59abd [tx-robot] updated from transifex 2014-04-10 01:14:08 -04:00
masensio
1a33e4cf65 Merge branch 'develop' into videoInstandUploads 2014-04-09 08:42:30 +02:00
Mr. Jenkins
0e133984d4 [tx-robot] updated from transifex 2014-04-09 01:14:36 -04:00
masensio
3351db6527 Merge branch 'develop' into videoInstandUploads 2014-04-08 12:50:50 +02:00
Mr. Jenkins
69d40e505e [tx-robot] updated from transifex 2014-04-08 04:59:00 -04:00
masensio
119c61dcf4 Merge pull request #458 from owncloud/operations_service 
Operations started by AuthenticatorActivity are run in OperationsService, and end of operations is granted to be dispatched.
 2014-04-08 09:17:47 +02:00
Mr. Jenkins
9cc8efc369 [tx-robot] updated from transifex 2014-04-08 01:15:33 -04:00
masensio
af45cabf35 Merge branch 'develop' into operations_service 2014-04-07 08:49:01 +02:00
Mr. Jenkins
903bf0286e [tx-robot] updated from transifex 2014-04-07 01:15:11 -04:00
Mr. Jenkins
e573a7066e [tx-robot] updated from transifex 2014-04-06 01:15:09 -04:00
Mr. Jenkins
e0d4f3cab7 [tx-robot] updated from transifex 2014-04-05 01:15:10 -04:00
David A. Velasco
7cf05f3647 Internal refactorization of AccountAuthenticatorActivity (and related dependencies) 2014-04-04 14:18:42 +02:00
Mr. Jenkins
a391f987ae [tx-robot] updated from transifex 2014-04-04 01:15:17 -04:00
David A. Velasco
5611205f1d Merge branch 'develop' into operations_service 2014-04-03 11:27:44 +02:00
masensio
bd8e442d3a Merge branch 'develop' into improve_action_bar_pr_392_with_develop 2014-04-03 11:11:13 +02:00
masensio
7a9149a66a Merge pull request #392 from pmarasse/pullup 
Modified actionbar to allow display of icon+text on tablets
 2014-04-03 11:02:54 +02:00
masensio
d164646e28 On any device, any orientation, show the icons for Upload and New folder directly in the bar. 2014-04-03 10:08:57 +02:00
Mr. Jenkins
9587c90abf [tx-robot] updated from transifex 2014-04-03 01:15:14 -04:00
David A. Velasco
0024569aff AuthenticatorActivity clean up: removed commented code and warnings 2014-04-02 12:46:54 +02:00
masensio
6fead9dd7f Add different action bar configuration for landscape and portrait 2014-04-02 11:19:42 +02:00
masensio
c3da11d244 Revert "Add different action bar configuration for landscape and portrait" 
This reverts commit 6dde4ddd3a.
 2014-04-02 11:19:08 +02:00
masensio
6dde4ddd3a Add different action bar configuration for landscape and portrait 2014-04-02 11:15:05 +02:00
masensio
b50072b019 Merge branch 'develop' into improve_action_bar_pr_392_with_develop 2014-04-02 10:45:52 +02:00
Mr. Jenkins
1037fd1b08 [tx-robot] updated from transifex 2014-04-02 01:15:13 -04:00
masensio
5ac1a1ebbb Merge branch 'develop' into operations_service 2014-04-01 14:18:32 +02:00
Mr. Jenkins
8a0f4fc032 [tx-robot] updated from transifex 2014-04-01 01:15:10 -04:00
masensio
f7bc72f21d Replace 'directory' by 'folder' in strings.xml 2014-03-31 10:36:56 +02:00
masensio
5f4b46015f Update string: 'New folder' instead of 'Create directory' 2014-03-31 10:32:49 +02:00
masensio
0b42d2e626 Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop 2014-03-31 09:46:05 +02:00
Mr. Jenkins
c2d4999fa7 [tx-robot] updated from transifex 2014-03-30 01:14:43 -04:00
Mr. Jenkins
b975a0b4f0 [tx-robot] updated from transifex 2014-03-29 01:14:45 -04:00
David A. Velasco
565875d753 AuthenticatorActivity is bound to OperationsService when created 2014-03-28 12:55:07 +01:00
Mr. Jenkins
0f455203a6 [tx-robot] updated from transifex 2014-03-28 01:14:44 -04:00
Mr. Jenkins
ae16937a09 [tx-robot] updated from transifex 2014-03-27 01:14:47 -04:00
masensio
c9a68d67e9 Merge branch 'master' into develop 2014-03-26 12:44:55 +01:00
Mr. Jenkins
b232d15607 [tx-robot] updated from transifex 2014-03-26 01:14:43 -04:00
David A. Velasco
41f86353da Updated notification icon for Android 2.x 2014-03-24 13:17:46 +01:00
masensio
b63fb51226 Update notification icons 2014-03-24 10:46:48 +01:00
David A. Velasco
d2ff7d4755 Merge branch 'develop' into release-1.5.5 2014-03-24 10:23:05 +01:00
masensio
1bda7e1e87 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-24 09:31:43 +01:00
Mr. Jenkins
8a1bcd8159 [tx-robot] updated from transifex 2014-03-24 01:14:32 -04:00
David A. Velasco
a3bf6883fc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-21 11:02:36 +01:00
masensio
7ed3179100 Merge branch 'develop' into improve_notifications_pr_400_with_develop 2014-03-21 10:37:11 +01:00
masensio
2d6826fe8b Merge pull request #400 from tommyd3mdi/develop 
Notification improvements
 2014-03-21 10:32:49 +01:00
masensio
c6f0847866 Changes from comments in PR#443 2014-03-20 16:15:59 +01:00
David A. Velasco
41614a81c1 Added notification icons with dark background to fix contrast in Android 2.x and 3.x 2014-03-20 14:04:09 +01:00
David A. Velasco
8a9f504138 Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +01:00
David A. Velasco
604abaf3b4 Grant that progress bar in notifications is shown in Android 2.x and 3.x devices 2014-03-20 10:43:06 +01:00
masensio
b0cfec7a00 Add auth_unsupported_basic_auth string 2014-03-20 09:08:02 +01:00
masensio
09cc36272b Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-20 09:02:29 +01:00
Mr. Jenkins
53fbd428af [tx-robot] updated from transifex 2014-03-20 01:14:32 -04:00
masensio
432d696432 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-19 17:57:56 +01:00
David A. Velasco
f5a9c9600e Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop 
Allow multiline preferences, not just checkboxes
 2014-03-19 16:59:24 +01:00
David A. Velasco
68482e5f66 Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-19 16:58:10 +01:00
masensio
a9c0d1c62b Update auth_fail_get_user_name string 2014-03-19 10:31:18 +01:00
masensio
71e049394e OC-3390: Shows message about 'not support authentication' under server address 2014-03-19 10:07:56 +01:00
masensio
3e108163bc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-19 08:55:37 +01:00
Mr. Jenkins
d3980d480f [tx-robot] updated from transifex 2014-03-19 01:14:34 -04:00
masensio
1fff2077a0 OC-3311: Update background color of image preview to black 2014-03-18 14:52:05 +01:00
masensio
b124167f50 Merge pull request #395 from dontcallmedom/master 
allow multi-line checkbox for preferences with long titles
 2014-03-18 14:28:17 +01:00
masensio
3806916a48 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-18 14:21:26 +01:00
masensio
6e86dfb001 OC-3376: 'manage account' field is multiline, in preferences 2014-03-18 13:36:16 +01:00
Mr. Jenkins
ee28694a31 [tx-robot] updated from transifex 2014-03-18 01:14:30 -04:00
Philippe MARASSE
28ef4217e5 updated menu from github comments 2014-03-17 22:15:41 +01:00
masensio
7c19578421 OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear 2014-03-17 14:04:18 +01:00
masensio
9284d44907 Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-17 13:44:32 +01:00
masensio
92c9049091 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-17 13:40:11 +01:00
masensio
d01e065586 OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method 2014-03-17 13:39:03 +01:00
Mr. Jenkins
1c5754ef51 [tx-robot] updated from transifex 2014-03-15 01:18:34 -04:00
Mr. Jenkins
c7eb56b0f0 [tx-robot] updated from transifex 2014-03-14 01:14:51 -04:00
masensio
9b2e4a6063 Merge branch 'pr/400' into improve_notifications_pr_400_with_develop 2014-03-13 15:49:17 +01:00
masensio
2ab9496b6e Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-13 10:39:22 +01:00
Mr. Jenkins
7f40c50f6a [tx-robot] updated from transifex 2014-03-13 01:14:57 -04:00
masensio
834c98644b Remove some import warnings 2014-03-12 10:53:32 +01:00
David A. Velasco
5338b93604 Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it 2014-03-12 10:32:05 +01:00
masensio
41efad3804 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-12 08:44:56 +01:00
Mr. Jenkins
a4362b2535 [tx-robot] updated from transifex 2014-03-12 01:20:34 -04:00
Thomas Keller
5eccd08bc7 Notification improvements: 
- use NotificationCompat.Builder from the support library and remove the custom progressbar layout; this will give platform users the expected look and feel of a notificati
- remove OCNotificationManager (it contained the old layout references, but was unused)
- add new notification icons that follow the Android style guidelines (http://developer.android.com/design/style/iconography.html#notification)
 2014-03-12 00:08:51 +01:00
masensio
207a52f422 OC-3242: Add new error message for fail in GetUserName. No changes in library reference 2014-03-11 14:43:48 +01:00
masensio
660f97baab Revert "OC-3242: Add new error message for fail in GetUserName" 
This reverts commit 564bbf7bb8.
 2014-03-11 14:40:38 +01:00
masensio
564bbf7bb8 OC-3242: Add new error message for fail in GetUserName 2014-03-11 13:56:41 +01:00
masensio
65d590b8e7 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-11 10:54:10 +01:00
Mr. Jenkins
340fd98c0c [tx-robot] updated from transifex 2014-03-11 01:14:12 -04:00
masensio
101cbbe492 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-10 11:08:42 +01:00
masensio
45bc02fbe5 OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient 2014-03-10 10:53:11 +01:00
Mr. Jenkins
6695b9442e [tx-robot] updated from transifex 2014-03-09 01:14:15 -05:00
Mr. Jenkins
cf91037016 [tx-robot] updated from transifex 2014-03-08 01:14:22 -05:00
masensio
9cac3b60a5 Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview 2014-03-07 15:11:59 +01:00
David A. Velasco
e3be24b472 Fix buttons out of screen in SSL warning dialogs for small screens in landspace 2014-03-07 14:54:04 +01:00
masensio
6944503874 OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one 2014-03-07 14:48:42 +01:00
David A. Velasco
a2be11ad54 Improved view of certificate details for SSL dialog based on SslCertificate 2014-03-07 14:39:30 +01:00
masensio
348c24b7ed Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-07 09:42:23 +01:00
masensio
c86d3cedec Merge branch 'develop' into send_file_pr311_with_develop 2014-03-07 08:53:24 +01:00
Mr. Jenkins
62e62bb062 [tx-robot] updated from transifex 2014-03-07 01:14:59 -05:00
masensio
8e1a2573b9 OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly 2014-03-06 18:26:35 +01:00
Mr. Jenkins
444ec398ba [tx-robot] updated from transifex 2014-03-06 01:14:55 -05:00
Mr. Jenkins
6d8cb3f5e5 [tx-robot] updated from transifex 2014-03-05 01:14:55 -05:00
masensio
56853acff0 Won't Fix: 
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"

This reverts commit df4d0355f2.
 2014-03-04 13:28:07 +01:00
masensio
df4d0355f2 OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file 2014-03-04 11:58:30 +01:00
masensio
c492555b1b Merge branch 'develop' into send_file_pr311_with_develop 2014-03-03 08:46:26 +01:00
Mr. Jenkins
410e4ac373 [tx-robot] updated from transifex 2014-03-02 01:14:29 -05:00
Mr. Jenkins
fc0eea1d59 [tx-robot] updated from transifex 2014-03-01 01:14:31 -05:00
masensio
32ee961d02 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-28 08:30:54 +01:00
Mr. Jenkins
2805dc76d6 [tx-robot] updated from transifex 2014-02-28 01:14:30 -05:00
masensio
ac836eddb7 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-27 08:40:17 +01:00
Mr. Jenkins
0641afc93d [tx-robot] updated from transifex 2014-02-27 01:14:38 -05:00
masensio
54d99ee9f6 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-26 10:15:37 +01:00
Mr. Jenkins
1948d435d7 [tx-robot] updated from transifex 2014-02-26 01:14:35 -05:00
masensio
e183acd650 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-25 11:12:48 +01:00
Mr. Jenkins
e8cb4a594e [tx-robot] updated from transifex 2014-02-25 01:14:46 -05:00
masensio
af1f880b27 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-24 13:33:23 +01:00
masensio
271078a403 Merge branch 'master' into develop 2014-02-24 13:16:57 +01:00
masensio
4852ca8dd4 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-24 13:02:10 +01:00
Mr. Jenkins
d7b3f42664 [tx-robot] updated from transifex 2014-02-22 01:14:58 -05:00
masensio
4172b5824f Merge branch 'develop' into send_file_pr311_with_develop 2014-02-21 09:22:32 +01:00
Mr. Jenkins
1d5087d736 [tx-robot] updated from transifex 2014-02-20 02:29:39 -05:00
David A. Velasco
42fc189367 Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends 2014-02-19 18:00:49 +01:00
Mr. Jenkins
0f2787afeb [tx-robot] updated from transifex 2014-02-19 09:43:23 -05:00
masensio
8db07c67b6 OC-3016: Add option 'send_files_to_other_apps' with default value 'on' 2014-02-19 10:33:27 +01:00
David A. Velasco
0f99af779e Merge branch 'share_link__unshare_file' into release-1.5.4 2014-02-18 11:16:22 +01:00
masensio
c6d4f4980b Merge branch 'develop' into send_file_pr311_with_develop 2014-02-18 10:32:28 +01:00
Mr. Jenkins
c28ab3aec8 [tx-robot] updated from transifex 2014-02-18 04:21:22 -05:00
masensio
6cf78042b0 OC-2968: Filter out ownCloud from the list of apps able to receive the file 2014-02-17 13:54:02 +01:00
masensio
85db28795d OC-2982: Update Settings 2014-02-17 13:11:28 +01:00
masensio
a5db2c2f68 HotFix to add Send File option, after PR#311 2014-02-17 09:16:29 +01:00
masensio
99686805e1 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-17 08:45:52 +01:00
Mr. Jenkins
29318f128d [tx-robot] updated from transifex 2014-02-17 02:25:08 -05:00
Mr. Jenkins
b5f8f72eaa [tx-robot] updated from transifex 2014-02-16 01:20:41 -05:00
Mr. Jenkins
e87fdb87e8 [tx-robot] updated from transifex 2014-02-15 06:19:59 -05:00
masensio
7ead9a0fe4 Merge pull request #311 from tobiasKaminsky/develop 
Added support for sharing files:
 2014-02-14 14:59:24 +01:00
David A. Velasco
fd0b92e9f2 Merge branch 'develop' into release-1.5.4 2014-02-14 14:54:47 +01:00
masensio
7309ea39a6 Merge pull request #401 from owncloud/share_link__unshare_file 
Share link  unshare file
 2014-02-14 14:47:19 +01:00
masensio
42834b213a OC-2966: Change name of the action from 'Share' to 'Send' 2014-02-14 12:38:38 +01:00
masensio
065a9c0046 OC-2966: Change name of the action from 'Share' to 'Send' 2014-02-14 12:13:58 +01:00
masensio
296df1bb65 Merge branch 'pr/311' into pull_request_311_with_develop 2014-02-14 10:59:26 +01:00
Mr. Jenkins
3afa50db27 [tx-robot] updated from transifex 2014-02-14 04:20:44 -05:00
Dominique Hazael-Massieux
59fdac1d26 using longtitle checkboxes 2014-02-13 19:08:26 +01:00
Mr. Jenkins
472169d692 [tx-robot] updated from transifex 2014-02-13 03:06:51 -05:00
Mr. Jenkins
036304a96b [tx-robot] updated from transifex 2014-02-12 01:17:23 -05:00
masensio
c68012235a Merge branch 'develop' into share_link__unshare_file 2014-02-11 10:56:31 +01:00
Mr. Jenkins
34ac94ab4a [tx-robot] updated from transifex 2014-02-11 01:15:14 -05:00
David A. Velasco
28ef1bcf62 Merge branch 'develop' into release-1.5.4 2014-02-10 14:46:26 +01:00
masensio
5462271de8 Merge branch 'develop' into share_link__unshare_file 2014-02-10 13:49:12 +01:00
masensio
659fda0475 Merge branch 'develop' into share_link__unshare_file 2014-02-10 13:48:02 +01:00
Mr. Jenkins
bd58ddb532 [tx-robot] updated from transifex 2014-02-10 06:13:43 -05:00
Mr. Jenkins
2b27144b0c [tx-robot] updated from transifex 2014-02-09 04:17:42 -05:00
Philippe MARASSE
24356ea250 Modified actionbar to allow display of icon+text on tablets 2014-02-08 22:19:54 +01:00
Mr. Jenkins
2d17077936 [tx-robot] updated from transifex 2014-02-08 01:23:03 -05:00
masensio
eb7bbebc08 OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown 2014-02-07 12:54:52 +01:00
masensio
ebbc1793e2 Merge branch 'develop' into share_link__unshare_file 2014-02-07 12:02:38 +01:00
David A. Velasco
cba8baa98d Merge branch 'share_link__new_share' into release-1.5.4 2014-02-07 09:23:40 +01:00
masensio
3662fda2de Merge pull request #388 from owncloud/setup_additions 
Setup additions
 2014-02-06 18:42:33 +01:00
David A. Velasco
62c382b1dc Merge branch 'develop' into share_link__new_share 2014-02-06 15:13:40 +01:00
David A. Velasco
4db5295f56 Merge branch 'share_link__new_share' into setup_additions 2014-02-06 13:58:41 +01:00