Commit Graph

1643 Commits

Author SHA1 Message Date
Vincent Petry 58c7042e70 Added error message for when target folder was removed
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
Jan-Christoph Borchardt d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Vincent Petry e6f93fc841 Fix warnings in logs when renaming over the web UI
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
Morris Jobke cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
VicDeo 0a77d41178 Merge pull request #6965 from owncloud/unused-free-space
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
Robin Appelman b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Morris Jobke 0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt 6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
Jan-Christoph Borchardt c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Morris Jobke dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
Pellaeon Lin 19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke 1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Vincent Petry c6695bbd76 Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry 0671c58e36 Fixed filelist unit tests hidden params
Also added dummy table
2014-01-24 13:19:44 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry 4734146580 Fixed max upload size input field style
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00
Jan-Christoph Borchardt 799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt 809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
Thomas Müller f950ce82ae Merge branch 'master' into mobile-style
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Morris Jobke cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
Thomas Müller 23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Myles McNamara 9555305565 change publicUploadButtonMock to public_upload
Changed jQuery selector for public preview to public_upload to correctly show preview
2014-01-20 11:58:01 -05:00
Morris Jobke f88360eba3 Merge pull request #6827 from rnveach/fix_6730
Fix 6730
2014-01-20 01:44:34 -08:00
raghunayyar 9edbd142a2 Removes Bogus Styles. 2014-01-18 00:46:06 +05:30
rnveach a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00
rnveach 90a41ef26a fixed selector string and removed all checkbox if it was selected 2014-01-17 11:46:44 -05:00
Morris Jobke f0a5007e9a fix input element closing tag 2014-01-17 16:32:01 +01:00
Jan-Christoph Borchardt b291fb9cd7 make sure there's enough room for the file actions 2014-01-17 15:47:26 +01:00
Vincent Petry f4c198b907 Fixed isPreviewAvailable warnings in log
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
2014-01-17 14:22:05 +01:00
Vincent Petry 350214c609 Added Javascript unit tests
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
Morris Jobke 16033c8123 Merge pull request #6264 from owncloud/files-draggabledestroy
Fix to not destroy draggable when no draggable was set
2014-01-16 05:52:43 -08:00
Pellaeon Lin 6ec50e4b0c Comments to clarify 2014-01-16 19:48:46 +08:00
Vincent Petry 2233aa2a04 Fixed files row height in Firefox/KDE
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
2014-01-16 12:05:05 +01:00
Pellaeon Lin cd6ab29313 Use t() 's native method 2014-01-16 17:51:00 +08:00
raghunayyar f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Jan-Christoph Borchardt db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
Thomas Müller ce231c406d no new menu on public upload 2014-01-15 15:07:52 +01:00
Thomas Müller 6c76b4ba12 fixing preview generation 2014-01-15 15:07:24 +01:00
Thomas Müller 807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Robin Appelman d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
raghunayyar d8eac2b9bc Merge branch 'master' into files-em-to-px
Conflicts:
	apps/files/css/files.css
2014-01-15 14:59:50 +05:30
Pellaeon Lin dbbbfee7de Fix namespace 2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt 072ef7f010 remove min-width rule to fix mobile views 2014-01-14 22:14:46 +01:00
Vincent Petry 8135828b2e Fix to not destroy draggable when no draggable was set
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.

Fixes #6254
2014-01-14 19:17:23 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry 1042733634 Fixed various file name escaping issues in core apps
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
2014-01-10 15:02:26 +01:00
Thomas Müller 2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Jenkins for ownCloud d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud 9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud 71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Jenkins for ownCloud 64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Jenkins for ownCloud 371a476eb5 [tx-robot] updated from transifex 2013-12-20 01:57:49 -05:00
Thomas Müller 277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Frank Karlitschek 753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Bjoern Schiessle 3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry 335b2f40a6 Fixed download file from URL error messages
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
2013-12-12 10:38:12 +01:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Pellaeon Lin 5ddd85ff9c Contextual upload error message 2013-12-11 15:40:58 +08:00
Pellaeon Lin 4b081be956 #max_upload is needed after all 2013-12-11 12:21:39 +08:00
Pellaeon Lin 0aa38165a4 Update #free_space on getstoragestats AJAX call 2013-12-11 12:18:18 +08:00
Vincent Petry 409b510889 Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Jenkins for ownCloud 6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
Pellaeon Lin 64bf0fa47f Display different messages for uploadLimit and freeSpace 2013-12-08 23:17:35 +08:00
Pellaeon Lin 69f2bde324 Change misleading message when file size exceeds upload limit 2013-12-08 15:41:20 +08:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Bjoern Schiessle e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Jenkins for ownCloud 4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
zombiehugs 8fb4ab097d Fixed indention.
As per @kabum request, indention on line 694 has been fixed.
2013-12-04 12:30:06 -06:00
zombiehugs be0197a29a #6051 [ux][files] Move File Spinner
Added spinner to file icon when moving to new folder or out of folder.

Commit is related to #6051
2013-12-04 11:27:24 -06:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Morris Jobke 587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class
fixes #6108
2013-11-28 21:36:43 +01:00
ganomi f723bf744a Merge pull request #6090 from ganomi/summaryfix
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
Vincent Petry da1a89fd15 Fixed directory icon after rename 2013-11-28 13:15:20 +01:00
Frank Karlitschek dab3629ff5 Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Vincent Petry 69a3327f47 Moved new file extension out of the translated string 2013-11-28 10:52:59 +01:00
Vincent Petry 24a08c686d New file box now has default file name + extension
Whenever a user creates a file or folder in the web UI, the input field
will contain a default file name, pre-selected up to the extension for
easier typing.

The purpose is mostly to prevent users creating text files without an
extension.

Fixes #6045
2013-11-28 10:18:31 +01:00
Vincent Petry bc64931cd0 Fixed unit tests for ajax rename 2013-11-27 23:19:57 +01:00
Vincent Petry 68f610a90e Update file list entry on rename
Whenever a file is renamed, if the extension changes, the mime type and
preview might change. This fix passes the updated info to the client
that updates it.
2013-11-27 21:35:00 +01:00
ganomi f94180a996 Fix filellist/rename/summary problem
Fixes #6055
This contribution is MIT licensed!
2013-11-27 19:09:49 +01:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload
Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Jenkins for ownCloud fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Jenkins for ownCloud dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Björn Schießle 31d0ba0344 Merge pull request #5641 from owncloud/filestrash-emptytrash
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
Jenkins for ownCloud ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Jenkins for ownCloud 60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Vincent Petry d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
Morris Jobke 3e1ade4397 Merge pull request #5988 from owncloud/files-mobilequickfix
Added min width to files table
2013-11-21 06:09:11 -08:00
Vincent Petry 14ad1ebf53 Added min width to files table
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.

The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
2013-11-21 14:45:24 +01:00
Bjoern Schiessle 9d16353e09 disable trahs in files_sharing/public.php 2013-11-21 12:06:35 +01:00
Vincent Petry 356eef0739 Quota storage wrapper is now used for all users in sharing mode
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
Bjoern Schiessle c9646ddc4c fix undefined index errors if public share view 2013-11-21 12:03:27 +01:00
Bjoern Schiessle b27fc42e1f public upload now also works with encryption enabled 2013-11-21 00:23:38 +01:00
Vincent Petry a7962faa56 Fixed delete action to show error message as notification 2013-11-19 15:05:11 +01:00
Jan-Christoph Borchardt b51d405852 Merge pull request #5923 from owncloud/font-weight
change bold 'deleted files' button to normal for less focus
2013-11-18 08:39:46 -08:00
Jörn Friedrich Dreyer 5da2929180 fix filtering number like filenames in filelist
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
Jan-Christoph Borchardt f2d18867af change bold 'deleted files' button to normal for less focus 2013-11-18 15:06:38 +01:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
Vincent Petry 008c3b80d6 Files app backend now normalizes paths before rendering templates
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"

Fixes #5848
2013-11-14 13:24:05 +01:00
Vincent Petry 5bdfccfc47 Fixed total dirs/files message hiding condition
Fixes #5829
2013-11-13 10:53:16 +01:00
Vincent Petry 80c8666d3a Deleting all files in trash now only sends a single flag
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.

Also fixes some "empty trash" message issues.
2013-11-11 17:58:33 +01:00
Morris Jobke 808634ac00 Merge pull request #5804 from owncloud/files-selectionsummary
Selection summary is now displayed properly
2013-11-11 08:41:53 -08:00
Vincent Petry e285e84e18 Selection summary is now displayed properly
Fixes #5775
2013-11-11 17:14:40 +01:00
Morris Jobke 43230f11f6 Merge pull request #5769 from owncloud/files-changedirjsevent
Added JS event for when the user changes the directory
2013-11-11 06:22:44 -08:00
Jenkins for ownCloud e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud 3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Vincent Petry 4998faf343 Added JS event for when the user changes the directory
This enables apps to detect directory changes which might be caused by
the user using the browser back button.
2013-11-08 13:16:28 +01:00
Vincent Petry c16fbbf386 Increased upload error delay to 10 seconds
Fixes #5662

Also made it use OC.Notification instead of directly access the
notification HTML element.
2013-11-08 11:22:08 +01:00
Vincent Petry bdc75e497b Fixed totalDirs JS error 2013-11-07 10:11:18 +01:00
Jenkins for ownCloud 263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Morris Jobke a0ee6aef29 Merge pull request #5399 from frisco82/fixDownloadOverQuota
Do not count the size of shared folder on total
2013-11-06 13:59:27 -08:00
Morris Jobke 1fa1cf46bd Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations
Fixes for "max upload size" value showed in the UI
2013-11-06 06:49:42 -08:00
Vincent Petry 5d698b72fc Fixed folder icon for home storage
Fixes #5713
2013-11-06 15:11:14 +01:00
Ramiro Aparicio b49530f80b Do not count the size of shared folder on total
Changed all array access to dot notation

Split comment in a second line
2013-11-06 13:47:03 +01:00
Vincent Petry 31181e4348 Fixed storage stats to be based on current directory
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.

This fix adds a "dir" argument to getstoragestats.php.
2013-11-06 10:55:19 +01:00
Vincent Petry 5d9ab6e7ac Update quota value in client after scan and upload
After uploading, the quota value wasn't refreshed.
This fix refreshes the quota value after files have been scanned or
uploaded.
2013-11-06 10:15:05 +01:00
Thomas Müller b869fb2a09 calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in 2013-11-05 12:18:25 +01:00
Thomas Müller 3488202f67 Merge pull request #5582 from owncloud/files-previewcaching
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud 07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
Jörn Friedrich Dreyer 9ae829497a cleanup and actually execute the query 2013-11-01 15:45:33 +01:00
Jörn Friedrich Dreyer 72ca0a482b use doctrine to construct concat expression 2013-11-01 15:40:21 +01:00
Jörn Friedrich Dreyer 51ec68a623 Concatenate string in SQL instead of PHP 2013-11-01 15:40:21 +01:00
Morris Jobke be07e828ef Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode
Corretly hide "no permissions" message in controls in viewer mode
2013-10-31 08:08:04 -07:00
Jörn Friedrich Dreyer adb5de4a88 prefer closest over parent
closest will search up the tree
2013-10-31 15:56:02 +01:00
Vincent Petry 35dd568f8f Added missing comma to make the next diff cleaner 2013-10-31 15:12:26 +01:00
Jörn Friedrich Dreyer a4be1ebeb8 use data-file to retrieve filename
forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163
trust me, I know what I'm doing
2013-10-31 14:31:57 +01:00
Vincent Petry 1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode
Fixes #5622
2013-10-31 12:34:15 +01:00
VicDeo 257084444b Merge pull request #5628 from owncloud/files-fixsummary
Fixed summary visibility check
2013-10-30 12:11:01 -07:00
Vincent Petry 19eeb618ff Prevent closing the create dropdown when right clicking in Firefox
Firefox sends a click event on the document when right clicking which
makes pasting with right click into the field impossible.

Fixes #5498
2013-10-30 17:55:41 +01:00
Vincent Petry aeac3186ee Fixed summary visibility check
Now using the integer values to check whether to show the summary parts
instead of trying to parse the html code.
2013-10-30 16:14:08 +01:00
Vincent Petry 4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master
Fixing l10n master
2013-10-30 02:44:54 -07:00