David A. Velasco
5fcb70beee
Added fragment to edit share permissions with basic layout
2016-01-11 12:17:08 +01:00
masensio
2181239c6d
Merge branch 'master' into reliable_uploads_actions_uploads_view
2016-01-08 11:21:23 +01:00
tobiasKaminsky
6bd7065c73
wip
2016-01-05 11:16:00 +01:00
masensio
a840e67a68
Add 'Uploads' option into NavigationDrawer
2015-12-11 08:43:33 +01:00
masensio
dc0aea30f0
Merge branch 'master' into reliable_uploads
...
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/utils/FileStorageUtils.java
2015-12-10 17:18:52 +01:00
Maria Asensio
896e4859c0
Merge pull request #1168 from owncloud/avoidDuplicateFiles
...
Avoid duplicate files
2015-12-09 09:27:54 +01:00
masensio
59442c80ea
Update string
2015-12-03 12:58:22 +01:00
tobiasKaminsky
04fc2e3cc2
changed according to latest discussion
2015-12-01 22:00:53 +01:00
masensio
e08513a762
Delete any rest of old public share/unshare flow
2015-11-25 09:32:26 +01:00
David A. Velasco
729a9b7c77
Set or clear password to protect public link in ShareFileFragment
2015-11-25 09:32:19 +01:00
David A. Velasco
f1b3208f1a
Updated ShareFileFragment layout with extra section for public shares
2015-11-25 09:32:15 +01:00
tobiasKaminsky
2aac1e5270
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
2015-11-21 08:48:40 +01:00
Maria Asensio
19cce9c90f
Merge pull request #1184 from Wikinaut/show-certificate-digest
...
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
2015-11-06 11:23:30 +01:00
masensio
d1294ca584
Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group
2015-10-30 16:50:49 +01:00
David A. Velasco
33a9d1f447
Get rid of dependency on Context in CreateShareOperation
2015-10-30 16:41:59 +01:00
masensio
fcdef568ea
Remove share_group_indicator string
2015-10-30 16:39:23 +01:00
masensio
ceffbc4aa8
Remove unshare with users/groups option from the menu
2015-10-30 16:39:21 +01:00
David A. Velasco
305536f8c2
Users and groups retrieved from server to fill search suggestions
2015-10-30 16:31:08 +01:00
masensio
1fbc44b574
Add new string for share_groups_indicator
2015-10-30 16:28:41 +01:00
David A. Velasco
e3d509a451
Complete search widget to send search requests to parent activity
2015-10-30 16:28:35 +01:00
David A. Velasco
bc5687b74a
Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)
2015-10-30 15:23:00 +01:00
masensio
c6c5b732c7
Add get list of users in the library
2015-10-30 15:22:12 +01:00
masensio
f28faf0c26
Show the layout to hsare with user in phone and tablet
2015-10-30 15:21:48 +01:00
masensio
8e3d7bdc8f
Create the layout to share with a user
2015-10-30 15:10:42 +01:00
masensio
3a527a8fe4
Add 'Share with users/groups' to long press menu
2015-10-30 15:04:34 +01:00
masensio
b9ef747a0b
Merge branch 'master' into sync_full_folder
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
2015-10-27 08:52:17 +01:00
tobiasKaminsky
e92297ccaf
split "on charging" to photo and video
2015-10-18 12:51:08 +02:00
tobiasKaminsky
e5caabd104
Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
2015-10-18 12:50:54 +02:00
tobiasKaminsky
1db620124a
update according to jan
2015-10-18 10:21:29 +02:00
Andy Scherzinger
8f0ea82efd
Fix for #1182 on Android 5
2015-10-05 18:44:50 +02:00
Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
David A. Velasco
056b7c964d
Updated error message for failed folder synchronization ('download' not anymore)
2015-09-25 15:13:59 +02:00
David A. Velasco
9b5506f81e
Join cancelation of downloads and uploads in 'cancel sync', both for files and folders
2015-09-25 15:13:41 +02:00
David A. Velasco
ac685690a2
Extend SyncFolderOperation to check local changes of all files and trigger uploads
2015-09-25 15:13:35 +02:00
tobiasKaminsky
5034e42928
extracted hard-coded string to string resource
2015-09-23 19:49:01 +02:00
tobiasKaminsky
2b6a61ddae
#819 part3: When uploading from filesystem inside the owncloud app, show question
2015-09-21 09:45:20 +02:00
tobiasKaminsky
4b8a5a9c92
#819 , part 2: Instant uploads, depends on setting
2015-09-19 14:33:29 +02:00
David A. Velasco
1ff57e0665
HOT FIX: recovered lost strings
2015-09-07 10:07:54 +02:00
David A. Velasco
e6be60679f
Merge branch 'master' into copy
...
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
2015-09-01 18:35:51 +02:00
masensio
efb3989ee6
Merge branch 'develop' into uploadWhenCharging
...
Conflicts:
res/values-fr/strings.xml
res/xml/preferences.xml
2015-09-01 16:51:40 +02:00
masensio
3e6bcda9a4
Merge branch 'develop' into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
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/ExtendedListFragment.java
2015-08-20 16:37:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76
Added error messages for copy action. English only.
2015-08-18 17:04:47 +02:00
masensio
e5e5b3638c
Merge branch 'develop' into reliable_uploads
...
Conflicts:
SETUP.md
owncloud-android-library
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/db/DbHandler.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ComponentsGetter.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-08-18 15:14:37 +02:00
Andy Scherzinger
e79f92f566
Conflict Dialog Fix
2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94
Added error messages for copy action. English only.
2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8
Added copy action
2015-08-18 13:35:28 +02:00
Andy Scherzinger
60e0f09278
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
2015-08-13 15:41:59 +02:00
Andy Scherzinger
9d9efd1c1d
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
...
Conflicts:
owncloud-android-library
2015-08-06 17:23:02 +02:00
purigarcia
91000ba405
change the subject
2015-08-06 10:23:27 +02:00
David A. Velasco
156cb5e81b
Updated conflict message (same as in web app)
2015-08-04 17:29:42 +02:00
tobiasKaminsky
1327ce7315
renamed string values
2015-08-04 12:39:56 +02:00
AndyScherzinger
d474239b21
initial material design changes for the action bar
2015-07-26 01:49:27 +02: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
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
David A. Velasco
8107d9dc4f
Fixed wrong format of files & folder count
2015-06-23 14:40:51 +02: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
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
masensio
e7710e7383
Update string subject_token and update library reference
2015-06-19 15:11:49 +02: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
masensio
febe1fef89
Add new string message for forbidden characters controlled by the server
2015-06-02 11:07:34 +02: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
purigarcia
916bd5c6ca
Merge branch 'develop' into automationTest
2015-05-29 14:17:52 +02:00
masensio
cf535b70f1
Disable 'Accounts' in Navigation Drawer
2015-05-29 11:32:36 +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
masensio
015eb6fee9
Disable On Device option in Navigation Drawer
2015-05-26 00:01:39 +02:00
tobiasKaminsky
6d4207a06b
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
2015-05-21 21:12:44 +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
purigarcia
2d95a83959
Merge branch 'develop' into automationTest
2015-05-11 08:16:43 +02:00
David A. Velasco
94f4a072ed
Replaced 'pass code' with 'passcode'
2015-05-07 12:07:44 +02: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
9593b580b7
Replaced 'PIN code' by 'pass code'
2015-05-04 11:41:09 +02:00
masensio
7d5c573766
Show Waiting dialog, while copy temporal file async task is working
2015-04-30 13:04:51 +02: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
purigarcia
d8e954d2d3
add id and contentdescription to a layout
2015-03-25 18:54:10 +01:00
masensio
c0da8a93f2
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
2015-03-20 14:55:48 +01: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
masensio
876204faf0
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
2015-03-16 11:15:27 +01: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
03b5cb9dd6
When no enter a password, message should be 'You must enter a password'
2015-03-09 11:38:36 +01:00
masensio
b08e9e35e6
Create password dialog: SharePasswordDialog.java
2015-03-05 17:54:03 +01:00
David A. Velasco
b5d70ad8e7
App updated to OwnCloudAccount with deferred load of credentials
2015-02-10 10:29:51 +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
masensio
7f6c5bd3b2
Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
2015-01-30 12:10:15 +01:00
David A. Velasco
b894a0a4f9
Removed ... from content description
2015-01-12 09:44:00 +01: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
tobiasKaminsky
0ae80926ac
update
2015-01-05 19:53:40 +01:00
tobiasKaminsky
cb725acdf3
- removed whitespaces
...
- renamed pin description
2015-01-01 13:06:25 +01:00
tobiasKaminsky
74bd1d8d78
- clarify pin description
2014-12-30 09:35:48 +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
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
jabarros
6f11fa1c09
Added content description tag in 'account setup' layout elements
2014-12-18 12:22:07 +01:00
Luke Owncloud
61de793925
hide empty upload groups
2014-12-10 14:33:47 +01:00
jabarros
c34646aed3
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
2014-12-10 14:13:32 +01:00
Keith Abdulla
3d8174a73e
fix tab
2014-12-09 23:01:48 -08:00
Keith Abdulla
1704c4f788
move subject message strings into strings.xml
2014-12-09 17:51:10 -08:00
Luke Owncloud
2d0c347bc4
Merge remote-tracking branch 'upstream/develop' into HEAD
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
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/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-12-08 16:24:10 +01:00
David A. Velasco
50e39f044f
Merge branch 'master' into develop
2014-12-03 11:31:49 +01:00
Luke Owncloud
9445692878
fix cancel upload
...
add remove single upload from list
add retry upload
2014-11-28 14:01:19 +01:00
tobiasKaminsky
fa99fbe2d9
- Instant upload only when charging
2014-11-22 13:48:03 +01:00
tobiasKaminsky
ae6b686775
Merge remote-tracking branch 'upstream/develop' into fileCount
2014-11-21 17:59:51 +01:00
Luke Owncloud
8de07698d9
integrating @davivels remarks
2014-11-20 13:46:54 +01:00
jabarros
a2de2f28ab
Add new preference on settings for setting the upload video path
2014-11-19 10:14:27 +01:00
jabarros
00a8eb415a
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
2014-11-18 14:51:49 +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
tobiasKaminsky
ccdf0f1b96
- adding possibility to create folder during upload
2014-11-01 13:41:06 +01: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
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
Luke Owncloud
5caa8d25a0
use chooser for sendmail (remove explicit gmail) in LogHistory
2014-10-29 12:39:44 +01: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
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
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
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
jabarros
016bdfac1f
Fixed. Upload path is not place correctly in setting view
2014-10-15 08:21:23 +02: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
tobiasKaminsky
706a769e30
- disabled sort by size until server supports server-side folder size
...
calculation
2014-10-11 09:14:14 +02: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
1e7e893321
Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
2014-10-06 14:58:34 +02:00
jabarros
2e472998c1
Merge branch 'develop' into release-1.6.0
2014-10-02 09:04:11 +02:00
loripino21
47d1a5e3e4
Update strings.xml
2014-09-23 10:08:40 +02:00
loripino21
72c6e981c5
Update strings.xml
2014-09-23 10:03:56 +02:00
Volkan Gezer
863c0145be
fix owncloud capitalization
2014-09-19 18:10:20 +02:00
David A. Velasco
aa354e5d73
Merge branch 'develop' into release-1.6.0
2014-09-18 14:27:13 +02:00
jabarros
33c171e6d4
Update string auth_redirect_non_secure_connection_title
2014-09-18 10:57:51 +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
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
20cd00b22c
Added sorting by name, date or size ascending/descending
2014-09-14 15:51:09 +02:00
David A. Velasco
cbdb5d3ff0
Fixed mess created with b9eaffd
2014-09-12 13:49:37 +02: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
jabarros
ba6c6375cf
Merge branch 'develop' into ADFS_auth_support
...
Conflicts:
res/values/strings.xml
2014-09-09 13:17:41 +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
David A. Velasco
1dbba08c7b
Improved messages for operations on files not existing anymore in the server
2014-09-02 10:13:14 +02: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
