Compare commits

..

1178 Commits

Author SHA1 Message Date
Frank Karlitschek 5dc3b1dc71 5.0.16 2014-04-29 03:05:27 +02:00
Lukas Reschke 4df0130aa0 Clarify the trusted_domain error page
Backport of https://github.com/owncloud/core/pull/8372
2014-04-27 18:35:42 +02:00
Lukas Reschke 321dacabd4 Add another example to the trusted_domains config
Users often ask in IRC or the forum how to add another domain.
Hopefully they will be able to find it out on their own if we have an example with two domains.
2014-04-26 23:14:21 +02:00
Morris Jobke 889794884d Merge pull request #8366 from owncloud/stable5-external-storage-css-fix
fix layout of external storage config table
2014-04-26 10:34:23 +02:00
Morris Jobke 0737b91b34 fix layout of external storage config table
Conflicts:
	apps/files_external/css/settings.css
2014-04-26 00:54:05 +02:00
Lukas Reschke e08490cb4b Use JS as content-type due to mimesniffing 2014-04-25 16:48:33 +02:00
Frank Karlitschek e2ab6027c3 5.0.16 RC1 2014-04-23 16:51:55 +02:00
Thomas Müller c6a8efeaf2 Merge pull request #8298 from owncloud/backport_6290_to_stable5
Backport #6290 to stable5
2014-04-23 15:58:36 +02:00
Lukas Reschke 5327b303e3 Check whether the user has permissions to add personal storage backends
Quick’n dirty back port of #8182 - master has a better fix but that
should be good enough…

missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-)

Use error instead of success

Revert "Use error instead of success"

This reverts commit e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d.

Use error instead of success
2014-04-23 14:45:52 +02:00
Lukas Reschke b4c207ae30 Merge pull request #8323 from owncloud/stable5-backport-8183-and-co
Backport of #8183 and #8197
2014-04-23 14:37:00 +02:00
Robin Appelman 23e3752b8d Backport of #8197 to stable6 2014-04-23 12:39:58 +02:00
Robin Appelman f48b0d9681 Backport of #8183 to stable6 2014-04-23 12:26:59 +02:00
Björn Schießle 29b792779c Merge pull request #8299 from owncloud/fix_group_restore_stable5
fix variable name
2014-04-22 16:03:34 +02:00
Bjoern Schiessle 00193c62c5 fix variable name 2014-04-22 14:18:01 +02:00
Jörn Friedrich Dreyer 6205c554f1 restore trashbin download.php 2014-04-22 13:43:51 +02:00
Jörn Friedrich Dreyer ee822245fb backport #6290 to stable5 2014-04-22 12:22:11 +02:00
Lukas Reschke 93a11362be Backport of #7682 to stable5 2014-04-18 11:37:24 +02:00
Morris Jobke ec6c2a3fab Merge pull request #8115 from owncloud/stable5-fixselectallanddownload
[stable5] Added missing var that messes up IE8
2014-04-17 16:04:34 +02:00
Robin Appelman 2264615d20 Verify that a file exists before we share it 2014-04-17 12:38:58 +02:00
Thomas Müller ec594eb530 Merge pull request #8234 from owncloud/backport-fileids-stable5
backport of the FilesPlugin to stable5
2014-04-16 17:44:14 +02:00
Thomas Müller 6964474768 adding the plugin to the server object 2014-04-16 16:31:15 +02:00
Thomas Müller f16a19bea9 backport of the FilesPlugin to stable5 2014-04-16 15:11:58 +02:00
Vincent Petry c67aaf6688 Fixed Sabre Node implementation to correctly return timestamps as int
Negative timestamps were returned as string and were confusing other

Sabre API like Sabre_DAV_Property_GetLastModified.

This fix makes sure the timestamp is returned as int when defined.

Backport of 4f11786 from master
2014-04-10 17:48:21 +02:00
Vincent Petry 9bc463de6e Merge pull request #8005 from owncloud/files-fixie8upload
[stable5] Added requesttoken back for IE8
2014-04-10 13:55:30 +02:00
Thomas Müller e20d23e18b Merge pull request #8030 from owncloud/getpath-shared-stable5
[stable5] Make getPath work for shared files
2014-04-10 09:26:17 +02:00
Vincent Petry 7554374c5c Added missing var that messes up IE8 2014-04-08 18:38:24 +02:00
Robin Appelman 61425344cc Improve phpdoc 2014-04-03 15:30:41 +02:00
Robin Appelman 2af0ebf27a Implement getPath for shared files 2014-04-03 15:27:50 +02:00
Robin Appelman d3926b8d5e Give storages the option to implement the getById behaviour for View->getPath 2014-04-03 14:48:30 +02:00
Vincent Petry dffcf9ff40 Added requesttoken back for IE8 2014-04-02 12:20:56 +02:00
Thomas Müller 140a65e11b Revert "remove Sabre_DAV_Browser_Plugin"
This reverts commit 997a9ce0b1.
2014-04-01 13:46:08 +02:00
Vincent Petry c45de909e4 Merge pull request #7610 from owncloud/stable5-fix-updater
Backport of https://github.com/owncloud/core/pull/7609
2014-03-28 17:03:38 +01:00
blizzz c831fd88ca Merge pull request #7229 from owncloud/stable5-fix-5828-backport
Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5
2014-03-28 17:02:23 +01:00
Morris Jobke 97afb56440 Merge pull request #7900 from owncloud/close_session_early_on_download_stable5
Close session early on download stable5
2014-03-28 11:38:26 +01:00
Jörn Friedrich Dreyer ae9efcf931 don't block php session while download is in progress 2014-03-26 17:24:11 +01:00
Vincent Petry 635e34df8e Merge pull request #7763 from owncloud/stable5-fixrestoreall
[stable5] Fix "restore all selected files"
2014-03-19 18:13:37 +01:00
Vincent Petry 2e3b3b9947 Merge pull request #7762 from owncloud/stable5-fixtrashandversionrootsizecalc
[stable5] [backport] When reading the size of "files" mountpoints need to be excluded
2014-03-17 15:27:03 +01:00
Vincent Petry 1afbea1b68 Fix "restore all selected files"
It seems that a typo sneaked in during a backport.

This fixes the case when selecting files in the trashbin and clicking
"Restore" on the tool bar to restore them all.
2014-03-17 12:29:10 +01:00
Vincent Petry d677f789de When reading the size of "files" mountpoints need to be excluded
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
2014-03-17 12:20:52 +01:00
Bjoern Schiessle 84a5c28e0f fix left-over from merge conflict 2014-03-13 21:00:13 +01:00
Bjoern Schiessle ab1d69bddf finally fix the paths for the OCS Share API 2014-03-13 20:57:02 +01:00
Thomas Müller afe9de53ed Merge pull request #7700 from owncloud/backport-7681-stable5
remove Sabre_DAV_Browser_Plugin
2014-03-13 09:42:37 +01:00
Thomas Müller 997a9ce0b1 remove Sabre_DAV_Browser_Plugin
Conflicts:
	apps/files/appinfo/remote.php
2014-03-12 23:55:23 +01:00
Vincent Petry 5d1f681fdc Merge pull request #7691 from owncloud/backport-7683-stable5
Backport 7683 stable5
2014-03-12 17:51:29 +01:00
Thomas Müller 4721b545c4 fixing method names 2014-03-12 15:44:45 +01:00
Thomas Müller a440b360d0 set content-type on ocs exceptions
Conflicts:
	lib/api.php
2014-03-12 15:44:32 +01:00
Bjoern Schiessle 286799252b add 'received_from' info to the share, so that every share can have a different value 2014-03-11 17:10:13 +01:00
Bjoern Schiessle 013ec9a6e3 fix path creation for re-shares, issue #7662 2014-03-11 17:09:55 +01:00
Vincent Petry 109b65b3cb Disable XML entities when parsing XML 2014-03-10 20:43:31 +01:00
Thomas Müller 991b059861 Merge pull request #7654 from owncloud/backport-7646-stable5
we need the file_source to delete a share successfully
2014-03-10 17:55:42 +01:00
Bjoern Schiessle 53d36e6c43 we need the file_source to delete a share successfully
Conflicts:
	apps/files_sharing/tests/api.php
2014-03-10 16:47:39 +01:00
Vincent Petry e1723d76d4 Merge pull request #7584 from owncloud/stable5-trusteddomainerrorpage
[stable5] Show warning page when accessing server from an untrusted domain
2014-03-07 10:37:30 +01:00
Lukas Reschke 25d9e41502 Use $installedVersion instead of $currentVersion 2014-03-06 22:47:40 +01:00
Lukas Reschke b442a9b4c9 Revert "Use $installedVersion instead of $currentVersion"
This reverts commit aef1e5112f.
2014-03-06 22:46:16 +01:00
Lukas Reschke aef1e5112f Use $installedVersion instead of $currentVersion 2014-03-06 22:44:33 +01:00
Vincent Petry 7ba91c346f Fixed X-Forwarded-Host parsing
Backport of d7163c9 from stable6
2014-03-06 12:00:57 +01:00
Vincent Petry 6a07f9fc55 Added unit tests for serverHost and other related functions
Backport of 98ff74a from stable6
2014-03-06 12:00:38 +01:00
Vincent Petry 03810e6828 Added localhost as trusted domain
Backport of f1b948d from stable6
2014-03-06 11:59:37 +01:00
Vincent Petry 47c4971e10 Show warning page when accessing server from an untrusted domain
Added early check for the requested domain host and show a warning
page if the domain is not trusted.

Backport of 9b6b02a from stable6
2014-03-06 11:58:51 +01:00
Frank Karlitschek b66b10b806 increase internal version number once more 2014-03-03 15:01:11 +01:00
Frank Karlitschek d7bd7c60da 5.0.15 2014-03-01 12:27:20 +01:00
Thomas Müller 4abe1b1ede Merge pull request #7463 from owncloud/stable5-webdav-logexceptions
[stable5] Backport exception logger for Sabre connector
2014-02-28 16:50:21 +01:00
Vincent Petry 8558cefbee Merge pull request #7169 from owncloud/storage-cleanup-stable5
Remove the filecache for a users home storage when the user is deleted
2014-02-28 10:30:28 +01:00
Vincent Petry cb7369659f Backported sabre exception logger
Partial backport of 11ef12a

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-02-27 16:44:25 +01:00
Vincent Petry e31a3d0f87 Backported logException from stable6 2014-02-27 16:33:57 +01:00
Robin Appelman f7db879301 Also remove home storages 2014-02-27 13:38:55 +01:00
Bjoern Schiessle 61bb39829e only add "received_from" if a share was found 2014-02-26 14:50:19 +01:00
Frank Karlitschek 7819010161 5.0.15 RC1 2014-02-25 14:07:17 +01:00
Vincent Petry 0be942635d Merge pull request #7387 from owncloud/stable5-fixhostnamewithport
Fix case where port is missing
2014-02-25 12:32:36 +01:00
Frank Karlitschek 3730875b2f Merge pull request #7268 from owncloud/stable5-fix-ocspriv
Use separate table for privatedata attributes
2014-02-25 12:31:55 +01:00
Vincent Petry 153fde697f Fix case where port is missing 2014-02-25 11:28:49 +01:00
Vincent Petry bbe20191d4 Merge pull request #7365 from owncloud/backport-7305
Added extra checks for ext storage class (Backport to stable5)
2014-02-24 11:29:54 +01:00
Björn Schießle 195393e324 Merge pull request #7362 from owncloud/fix-7259-5
Backport #7259 to stable5
2014-02-24 11:23:20 +01:00
Lukas Reschke 1679c9138b Added extra checks for ext storage class
Backport of #7305
2014-02-23 11:50:53 +01:00
tomneedham 04e2df3c6a Change to using OC_User::setUserID() instead of OC::' 2014-02-22 17:57:48 +00:00
Lukas Reschke e9671c9c24 Backport #7259 to stable5 2014-02-22 08:24:57 +01:00
Lukas Reschke b88654561d Revert "Partially backport #7305 to stable5"
This reverts commit 258997471e.
2014-02-22 08:18:22 +01:00
Lukas Reschke 3d72340adb Revert "Backport #7259 to stable5"
This reverts commit 7bc69c7ea5.
2014-02-22 08:18:10 +01:00
Lukas Reschke 258997471e Partially backport #7305 to stable5 2014-02-22 08:15:58 +01:00
Lukas Reschke 7bc69c7ea5 Backport #7259 to stable5 2014-02-22 08:07:57 +01:00
Arthur Schiwon 74a46e2a9e LDAP: improve compilation of filters 2014-02-21 10:40:57 +01:00
Vincent Petry f1446509d3 Merge pull request #7313 from owncloud/stable5_fix_folder_delete
don't send delete for every single file if a folder gets deleted
2014-02-20 18:20:49 +01:00
Jan-Christoph Borchardt d8c61969ad Merge pull request #7185 from owncloud/backport_6777_mobile_style_for_public_pages_stable5
initial backport of #6777 - mobile public pages - to stable5
2014-02-20 15:27:18 +01:00
Bjoern Schiessle ab93d29562 don't send delete for every single file if a folder gets deleted 2014-02-20 14:08:17 +01:00
Lukas Reschke 2649bb7719 Merge pull request #6733 from owncloud/stable5-files-filenameescapingfixes
[stable5] Backport: Fixed various file name escaping issues in core apps
2014-02-20 13:04:54 +01:00
Lukas Reschke 626b90fa84 Check whether the app is set 2014-02-20 11:28:31 +01:00
Lukas Reschke 3f5038adef Check whether the Key is set 2014-02-20 11:28:23 +01:00
Lukas Reschke 0b00057cf6 An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-20 11:28:20 +01:00
Jörn Friedrich Dreyer bee41b6200 fix scrolling for mobile browsers 2014-02-19 15:20:30 +01:00
Jörn Friedrich Dreyer b6db4e9930 unset box-shadow for mobile devices, unsupported in all but the latest mobile browsers 2014-02-19 13:09:52 +01:00
Vincent Petry 382ddabf75 Merge pull request #4782 from owncloud/tune_legacy_cache_webdav_properties_prefixing
Tune legacy cache webdav properties prefixing
2014-02-18 18:56:21 +01:00
Thomas Müller 606c22d9a7 testing update and delete 2014-02-18 17:53:16 +00:00
Thomas Müller 7d52a511c6 adding unit tests for delete 2014-02-18 17:53:10 +00:00
Thomas Müller e7ccfc6f83 unit tests for set added 2014-02-18 17:53:05 +00:00
Thomas Müller 86858b408c first two tests 2014-02-18 17:52:59 +00:00
Joas Schilling bace2bcdfd Make google drive client secret and dropbox api secret a password field
Fix issue #5794

Backport of 828985d
2014-02-18 18:34:28 +01:00
Andreas Fischer 0ae41c3aff Get rid of the SELECT query. Try UPDATE, on failure INSERT. 2014-02-18 17:20:10 +00:00
Thomas Müller ddc14ae8ee fixing undefined index in delete() 2014-02-18 17:20:04 +00:00
Thomas Müller 42b7dd827b PHPDoc comment updated - checkLoggedIn() removed 2014-02-18 17:19:55 +00:00
Thomas Müller 9a28f2ded7 no need to check if the user is logged in 2014-02-18 17:19:48 +00:00
Thomas Müller 4c287ef640 fixing php notice: Undefined index key 2014-02-18 17:19:35 +00:00
Thomas Müller 90f9437b69 no need to check if the user is logged in - this is already done in the ocs dispatcher itself
adding @return
2014-02-18 17:19:27 +00:00
Frank Karlitschek cada6b50b4 fix the privatedata key value store 2014-02-18 17:19:13 +00:00
Lukas Reschke cf05ecbd1c Use the proper content-type
We should use the proper content-type `application/xml` instead of the default `text/html` here.

Backport requested.
2014-02-18 11:44:04 +01:00
tomneedham 8c09d66965 Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5 2014-02-17 14:36:42 +00:00
Vincent Petry 8d5430c1c7 Merge pull request #7227 from owncloud/stable5-removeunusedversionsmd5
Removed unused versions md5 code
2014-02-17 14:39:07 +01:00
Vincent Petry f7e91518a6 Removed unused versions md5 code
It looks like md5 was used previously to identify the most recent file
in the versions list, which seem to be old code, as now the versions
list doesn't contain the current file any more.

This fix removes the md5 code which caused performance issues with big
files.
2014-02-17 12:03:16 +01:00
Thomas Müller bb8f03c061 Merge pull request #7188 from owncloud/fix_gitignore_stable5
fix .gitignore for stable5
2014-02-15 00:09:16 +01:00
Jörn Friedrich Dreyer 102d5ab084 fix undefined index 2014-02-13 16:52:49 +01:00
Jörn Friedrich Dreyer 83a7196978 fix .gitignore for stable5 2014-02-13 14:51:58 +01:00
Jörn Friedrich Dreyer 3baee7a459 add missing mobile.css 2014-02-13 14:46:47 +01:00
Jörn Friedrich Dreyer 2248433180 initial backport of #6777 - mobile public pages - to stable5 2014-02-13 12:23:22 +01:00
Robin Appelman 85ae5b992b Remove the filecache for a users home storage when the user is deleted 2014-02-12 14:14:38 +01:00
Bjoern Schiessle 5e24e21493 getData() always needs to return an array, backport of #6988 2014-02-10 15:55:47 +01:00
Bjoern Schiessle b4b05c3291 remove needless element tag 2014-02-03 17:03:52 +01:00
Bjoern Schiessle 7e48b311ee use more accurate error codes 2014-01-28 16:47:33 +01:00
Jörn Friedrich Dreyer 075b56ba5f Merge pull request #6859 from owncloud/always_log_db_error_verbose_stable5
always be verbose when logging db error
2014-01-21 04:53:35 -08:00
Thomas Müller b4860d56ab Merge pull request #6860 from owncloud/neutral_download_zip_default_name_stable5
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 04:19:41 -08:00
Jörn Friedrich Dreyer 35d423d59d use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:31:36 +01:00
Jörn Friedrich Dreyer bfcb93b2b9 always be verbose when logging db error 2014-01-21 12:20:10 +01:00
Thomas Müller 3cbea9bd2d Merge pull request #6821 from owncloud/backport_5601
Fix mimetype detection
2014-01-17 07:44:39 -08:00
Jörn Friedrich Dreyer ae4d10668e Fix mimetype detection 2014-01-17 15:05:43 +01:00
Bjoern Schiessle 969650ecad don't unshare on delete 2014-01-13 16:50:02 +01:00
Vincent Petry 3f7550cdcf 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
- Prevent uploading file name with invalid characters

Backport to stable5 of 1042733
2014-01-12 15:42:10 +01:00
Thomas Müller 48cd4adfb4 Merge pull request #6665 from owncloud/fix_empty_mimetypes_stable5
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 07:31:54 -08:00
Jörn Friedrich Dreyer 244f277239 remove duplicate exe mimetype, add correct msi mimetype 2014-01-07 15:58:49 +01:00
Frank Karlitschek 5e1fc51f92 5.0.14a 2013-12-18 11:55:42 +01:00
Frank Karlitschek 5e5dcc2782 5.0.14 2013-12-17 14:11:18 +01:00
Thomas Müller 7964691645 Merge pull request #6447 from owncloud/fix_home_storage_quota
fix quota calculation for Home Storage
2013-12-16 12:07:53 -08:00
Jörn Friedrich Dreyer b02a15ceb8 add getOwner to Home Storage 2013-12-16 16:58:01 +01:00
Frank Karlitschek e98e98f38d 5.0.14 RC1 2013-12-13 13:07:51 +01:00
Björn Schießle e3822ef76d Merge pull request #6258 from owncloud/stable5_enc_fix_public_access
don't check migration status if a file is accessed by a public link
2013-12-09 04:57:34 -08:00
Vincent Petry 516e5f2ebe Merge pull request #6232 from owncloud/stable5-backgroundscan-reuse-etag
Stable5 backgroundscan reuse etag
2013-12-09 04:38:31 -08:00
Bjoern Schiessle 00cdb380e5 don't check migration status if a file is accessed by a public link 2013-12-09 12:45:19 +01:00
Robin Appelman 8fe4698d44 get rid of failing test that don't cause additional downloads 2013-12-08 00:17:17 +01:00
Robin Appelman 5d600e9d68 extend test case for etag preservation 2013-12-08 00:15:58 +01:00
Robin Appelman 605fa4a444 reuse etags when doing a background scan 2013-12-08 00:15:50 +01:00
Björn Schießle b6ecff93e1 Merge pull request #6207 from owncloud/stable5_unshare_vs_delete
Stable5 unshare vs delete
2013-12-06 03:06:21 -08:00
Bjoern Schiessle 08cfb7e489 it is not possible to unshare files in OC5 2013-12-05 17:44:09 +01:00
Robin Appelman 14be3b3dbb make rmdir recursive for mappellocal storage backend
Backported from d051d6f925
2013-12-03 11:45:08 +01:00
Robin Appelman 6eef3c9c4c Make rmdir recursive for local storage
Backport of 63c898c0
2013-12-03 10:47:26 +01:00
Vincent Petry a385e86e58 Return true when touch succeeds
Backported from c2fc0cb8191d1de80058f6572e8e10f5dbda01b2
2013-12-02 12:20:35 +01:00
Vincent Petry 7c623053dc Add trailing slash in FTP root path when missing
Fixes #6093

Backport of 84f3dd15a6
2013-12-02 12:02:40 +01:00
Vincent Petry 3b18c1bae4 Fixed FTP and SMB to use rmdir() when deleting folders
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.

Backport of d69243e
2013-12-02 11:12:09 +01:00
Vincent Petry e079d34f5a Merge pull request #6147 from owncloud/fix-ajax-getstoragestats-stable5
fixing ajax call to getstoragestats.php
2013-12-02 01:50:07 -08:00
Thomas Müller aaeb7827b8 fixing ajax call to getstoragestats.php 2013-12-02 10:30:55 +01:00
Robin Appelman f0f0be8b2b Add post hooks for filesystem scanner 2013-11-28 16:35:58 +01:00
Robin Appelman ad770024b6 Fix getRawPathInfo for the '/' edge case 2013-11-28 13:11:32 +01:00
Robin Appelman 527afe99ec fix custom routes defined by apps 2013-11-28 13:11:25 +01:00
Morris Jobke bc9cfcb0db Merge pull request #6082 from owncloud/themable_realm_stable5
use defaults to determine webdav realm name
2013-11-27 05:38:10 -08:00
Jörn Friedrich Dreyer 63a0348f98 use defaults to determine webdav realm name 2013-11-27 14:00:13 +01:00
Morris Jobke c3747e3910 Merge pull request #6042 from owncloud/backport-6035-oc5
Backport 6035 oc5
2013-11-27 01:23:47 -08:00
Thomas Müller 9ea931fbad fixing failing unit test 2013-11-26 22:34:26 +01:00
Thomas Müller 4221490d04 fixes #6050 2013-11-26 22:34:25 +01:00
Vincent Petry acd9ea7b2b Return plausible isReadable() default impl for ext storage
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.

This fix makes the default impl of isReadable() use file_exists().

Backport of a49e873d3f
2013-11-26 16:14:21 +01:00
Morris Jobke e016ac1d5f Merge pull request #5962 from owncloud/clean_permissions_cache_on_filescan
clean permissions cache on filescan
2013-11-25 23:37:42 -08:00
Thomas Müller 1130406763 in case uri and script name don't match we better throw an exception 2013-11-25 17:42:20 +01:00
Thomas Müller 411a78b509 handle duplicate slashes in case of reverse proxy configuration
Conflicts:
	tests/lib/request.php
2013-11-25 17:41:44 +01:00
Robin Appelman b5d04b05a0 clear permissions cache when scanning a file
Conflicts:
	lib/files/cache/scanner.php
2013-11-25 11:15:32 +01:00
Vincent Petry 880769976b Merge pull request #5934 from owncloud/stable5-excludeextstoragefromquota
[Stable5] Exclude ext storage from quota
2013-11-22 08:34:58 -08:00
Thomas Müller 2565a94e7d Merge pull request #4957 from owncloud/fixing-4866-stable5
Backport of #4869 to stable5 (recreate an etag within the scanner if the cache contains an empty etag)
2013-11-22 08:09:59 -08:00
Thomas Müller e7c903b767 Merge branch 'fixing-4866-stable5' of github.com:owncloud/core into fixing-4866-stable5 2013-11-22 15:45:27 +01:00
Thomas Müller 1267dccfe3 Merge branch 'stable5' into fixing-4866-stable5 2013-11-22 15:44:59 +01:00
Vincent Petry 6eae96b7b0 Fixed testTouch unit test to work with stable5
Calling getFileInfo() would trigger checkUpdate() and would return the
real file mtime because the test value 500 was in the past.

This fix makes this test work with the stable5 behavior.

Removed "storage_mtime" references which don't exist in stable5.
2013-11-22 14:53:56 +01:00
Robin Appelman 64b484e32e Emulate touch() for backends that don't support it
Backport of 9738fae3cf
2013-11-21 15:55:24 +01:00
Jörn Friedrich Dreyer ca61fac24d <default></default> and <notnull>true</notnull> contradict each other 2013-11-21 15:34:35 +01:00
Andreas Fischer 72f3860119 Cherry-pick of 5d671a8 onto stable5.
recreate an etag within the scanner if the cache contains an empty etag

Conflicts:
	lib/files/cache/cache.php
	tests/lib/files/cache/scanner.php
2013-11-20 17:35:40 +01:00
Vincent Petry ee581f56ea Merge pull request #5893 from owncloud/stable5-extstorage-smbfixes
[stable5] External storage SMB fixes for stat and unlink backport
2013-11-19 07:09:11 -08:00
Vincent Petry 5e6ea1565a 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.

Partial backport of 31181e4348
2013-11-19 11:05:05 +01:00
Vincent Petry a84b6b3847 Fixed ext storage free space to not be restricted by quota 2013-11-19 11:05:04 +01:00
Vincent Petry 4cb6c6fe64 Fixed quota calculation to also exclude ext storage 2013-11-19 10:05:50 +01:00
Vincent Petry 9ccaf85078 External storage space is now not counted in total space
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Backport of 614e4d485c
2013-11-19 09:47:36 +01:00
Morris Jobke fbf1b127db Merge pull request #5921 from owncloud/search_scrollto_stable5
backport search scrollto & filter to stable5
2013-11-18 15:24:01 -08:00
Thomas Müller 847ad6c40b fixing js error in case the file name is a number 2013-11-18 15:03:22 +01:00
Jörn Friedrich Dreyer cb656c8321 backport search scrollto & filter to stable5 2013-11-18 14:18:08 +01:00
Vincent Petry 79929fb6fa Fixed SMB file deletion success detection
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866

Backport of eefd91355d54b7e49dd328cef9a9561ee51b0194
2013-11-15 16:36:45 +01:00
Vincent Petry 321a1062d1 Removing trailing dot in path that samba doesn't seem to like
Fixes #5778
Added unit test for getId() and constructUrl()

Backport of f66ec8a02271e73755cb965107eca60f027ffe78
2013-11-15 16:35:12 +01:00
Vincent Petry 477e3a8b87 Merge pull request #5883 from owncloud/stable5-singledotdirs
Stable5 single dot dirs
2013-11-15 03:57:27 -08:00
Frank Karlitschek a3a97cd6d8 Merge pull request #5307 from nicokaiser/fixing-3694-stable5
Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694
2013-11-15 01:42:08 -08:00
Vincent Petry a7a87d074b Added missing test with leading backslash 2013-11-15 10:40:01 +01:00
Vincent Petry 42e553cdc0 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

Backport of 008c3b80d6
2013-11-15 10:40:01 +01:00
Vincent Petry e44831d10f Fixed normalizePath() to strip out single dot dirs
Now removing "/./" and trailing "/." from the paths when normalizing.

Backport of c06d8bb007
2013-11-15 10:39:43 +01:00
Thomas Müller 5aabf3826a Merge pull request #5811 from owncloud/fixing-5808-stable5
fixing Fatal error: Call to a member function logicToPhysical() on a non-object
2013-11-11 14:29:16 -08:00
Thomas Müller b6cd2a3758 fixes #5808 2013-11-11 19:43:57 +01:00
Thomas Müller 0a422ed489 Merge pull request #5725 from owncloud/fix_enabling_apps_on_oracle_cornercase
fix enabling apps for oracle - cornercase
2013-11-11 07:05:22 -08:00
Thomas Müller 0b295d9952 add missing argument $query 2013-11-08 16:55:01 +01:00
Jörn Friedrich Dreyer b9a62e9b51 use empty to check for null and '' 2013-11-08 14:57:05 +01:00
Owen Winkler ea914b6f47 Merge pull request #5723 from owncloud/stable5-strayremembermecookiesfix
Now removing stray old cookies from 5.0.12
2013-11-07 09:07:30 -08:00
Morris Jobke 349822d221 Merge pull request #5726 from owncloud/more_debug_output_stable5
add debug output related to app enablement
2013-11-06 13:39:14 -08:00
Jörn Friedrich Dreyer 5965b68cc3 fix enabling apps for oracle cornercase 2013-11-06 18:28:26 +01:00
Jörn Friedrich Dreyer 7b84b40435 add debug output related to app enablement 2013-11-06 18:14:43 +01:00
Vincent Petry 99e5c6f7eb Now removing stray old cookies from 5.0.12
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't there,
thus making it impossible to logout correctly.

This fix adds extra code to delete such stray cookies.
2013-11-06 17:37:35 +01:00
Frank Karlitschek d490b8f972 let's increase the version number once more 2013-11-05 20:40:25 +01:00
Frank Karlitschek eb58be0f10 Merge pull request #5704 from owncloud/fixing-5663-stable5
we create the cookies for the url path \OC::$WEBROOT - as a result we sh...
2013-11-05 11:39:38 -08:00
Thomas Müller 13c75259b7 we create the cookies for the url path \OC::$WEBROOT - as a result we shall 'remove' them with the same path
unsetMagicInCookie() is supposed to be static
2013-11-05 15:00:28 +01:00
Frank Karlitschek 38d945f300 5.0.13 2013-11-05 03:52:16 +01:00
Jörn Friedrich Dreyer f802fcfedc Concatenate string in SQL instead of PHP 2013-11-01 15:44:01 +01:00
Bart Visscher 979cabe0d4 When updating an appstore app, execute a database update
See #5202
2013-11-01 10:57:39 +01:00
Frank Karlitschek 0df79dd409 5.0.13 RC1 2013-11-01 03:12:21 +01:00
Thomas Müller 5b5fb3976e Merge pull request #5583 from frisco82/backportCookieChanges
Backport of  #3985 (Invalid remember me token)
2013-10-31 15:09:01 -07:00
Thomas Müller fb7cff5be5 Merge pull request #5640 from owncloud/backport_executeaudited_stable5
Backport executeaudited stable5
2013-10-31 10:28:49 -07:00
Thomas Müller 13e0fad19d Merge pull request #5647 from owncloud/fix4390_stable5
Fix4390 stable5
2013-10-31 09:42:50 -07:00
Jörn Friedrich Dreyer 7b9b7a48a1 use closest instead of parent 2013-10-31 15:53:16 +01:00
Thomas Müller 1b1859c4ea Merge pull request #5574 from owncloud/fixing-5271-stable5
we should check if a user is logged in before we check for admin privile...
2013-10-31 04:59:50 -07:00
Thomas Müller cba32719eb adding second argument to DatabaseException
updated some PHPDoc comments
fixing undefined variable in line 789 - actually unrelated but well ....
2013-10-31 12:44:51 +01:00
Thomas Müller 2d643a7c8d Merge pull request #5579 from owncloud/backport_5496
backport of #5496, fixes #5421 for stable5
2013-10-31 04:30:48 -07:00
Thomas Müller 817a10b465 Merge pull request #5327 from owncloud/backport-4867-stable5
[stable5] Adding detection of aborted uploads for chunked uploads
2013-10-31 04:27:04 -07:00
Jörn Friedrich Dreyer 4acca3f157 extend unit test to directories starting or ending in whitespace 2013-10-31 11:55:58 +01:00
Thomas Müller 640a1f28fe Merge pull request #5630 from owncloud/backport_home_storage_stable5
backport home storage to stable5
2013-10-31 03:32:23 -07:00
Jörn Friedrich Dreyer 7a0db0291c disable MDB2_PORTABILITY_RTRIM
fixes dnd into folders ending in whitespace on oracle
unnecessary portability option because only affects fixed length character columns. luckily we dont have that kind of columns: the text datatype is transformed into varchar by MDB2
2013-10-31 11:19:58 +01:00
Jörn Friedrich Dreyer 02d7b04b2e allow dnd into folders starting with whitespace 2013-10-31 11:15:12 +01:00
Jörn Friedrich Dreyer 266f068238 remove leftover execute() and unused variables 2013-10-31 10:27:42 +01:00
Thomas Müller 5ca03f851e call \OC_Util::checkLoggedIn() on checkSubAdminUser() as well 2013-10-30 22:55:48 +01:00
Jörn Friedrich Dreyer 93f6fca35d use executeAudited() for all cache queries
Conflicts:
	lib/files/cache/cache.php
2013-10-30 22:27:16 +01:00
Jörn Friedrich Dreyer 906a08a36e backport executeAudited() 2013-10-30 22:15:49 +01:00
Bjoern Schiessle 3b1c365c82 allow to share a file/folder as public link also if one of it parents was already shared as link 2013-10-30 17:44:56 +01:00
Frank Karlitschek c251ccfcfb Merge pull request #5487 from owncloud/backport_search_in_shared_files_to_stable5
backport search in shared files to stable5
2013-10-30 09:42:21 -07:00
Jörn Friedrich Dreyer 800d2e9564 Merge pull request #5613 from owncloud/upload_to_shared
fix check if we upload to /Shared
2013-10-30 09:10:23 -07:00
Jörn Friedrich Dreyer 9d259306a7 backport home storage to stable5 2013-10-30 16:52:17 +01:00
Jörn Friedrich Dreyer a75017bb48 fix placholder counting 2013-10-30 15:02:35 +01:00
Bjoern Schiessle 1a3ab036c0 remove unused variable 2013-10-30 12:43:52 +01:00
Bjoern Schiessle 058d4d1136 if the database doesn't contain any information about the recovery mode than we assume that it is disabled 2013-10-30 12:43:33 +01:00
Bjoern Schiessle 78e00df089 fix check if we upload to /Shared 2013-10-29 22:49:12 +01:00
Thomas Müller e7fb6be72a fixes #5367
Conflicts:
	lib/connector/sabre/file.php
2013-10-29 16:40:18 +01:00
Jörn Friedrich Dreyer 149679ca68 cleanup PR
- extract method,
- introduce MAX CHUNK SIZE const with 999 (reduce this by the number of additional query parameters),
- fix whitespace
2013-10-29 15:52:13 +01:00
Björn Schießle 072b82732a Merge pull request #5513 from owncloud/fix_file_cache_updater
Fix file cache updater
2013-10-29 06:40:07 -07:00
Bjoern Schiessle 91a11e2533 make getUidAndFilename() private 2013-10-29 14:39:44 +01:00
Bjoern Schiessle b6249ea377 disable encryption app for file cache updater test since the test doesn't use a completely initialized oc filesystem 2013-10-29 11:47:06 +01:00
Bjoern Schiessle 392ed5c881 make sure that hooks are only executed when the app is enabled 2013-10-29 11:45:40 +01:00
Bjoern Schiessle 5cf8c84a8a tests should work if I explicitely log-in as a user 2013-10-29 10:12:53 +01:00
Bjoern Schiessle 1de813f300 make sure that we operate on the owners Path because this path needs to be updated
check the storage for every iteration to make sure that we update the correct cache entry
2013-10-29 09:55:40 +01:00
Thomas Müller 00484d62e5 fixes #5367
Conflicts:
	lib/connector/sabre/file.php
2013-10-28 21:58:31 +01:00
Thomas Müller 46ef1f73d7 Merge branch 'stable5' into backport-4867-stable5 2013-10-28 21:51:25 +01:00
Ramiro Aparicio e6625cccb9 Fix logout issue with tokens 2013-10-28 15:43:53 +01:00
Jörn Friedrich Dreyer 5403c68e78 backport of #5496, fixes #5421 for stable5 2013-10-28 14:30:49 +01:00
Bjoern Schiessle c8bcdce38f remove debug output, add comment 2013-10-28 12:00:48 +01:00
Bjoern Schiessle bf657289f5 Share Updater doesn't need to call the cache updaters correctFolder method, this method always expect a path relativ to the current user 2013-10-28 12:00:16 +01:00
Bjoern Schiessle f6e04c9cf9 check storage for every iteration 2013-10-28 11:37:22 +01:00
Thomas Müller 126f0ddf3c we should check if a user is logged in before we check for admin privilege 2013-10-28 11:32:43 +01:00
Thomas Müller b46c82069e Merge pull request #5465 from owncloud/create-custom-logfile-stable5
Stable5: Try to create custom log file before falling back to default.
2013-10-27 15:20:02 -07:00
Vincent Petry e8bb7d9dbd Fixed group management dropdown in IE9
There is a syntax error in the "em" tag that isn't close that seem
to mess up in IE9.

- Fix was found in 0bcb0439 for multiselect.js, so backported this partially.
- Fixes #2569
2013-10-27 19:45:12 +01:00
blizzz 331cc2ccff Merge pull request #5425 from buczek/fix-ldap-login
Fix ldap login
2013-10-25 02:10:23 -07:00
Bjoern Schiessle 765ab9db66 changed the logic, this should fix the tests 2013-10-24 17:24:49 +02:00
Bjoern Schiessle e8975239bd remove debug code 2013-10-24 16:14:34 +02:00
Bjoern Schiessle ecdba3d0e5 resolvePath() needs to resolve the path for the owner, otherwise it doesn't work for Shared files
correctFolder() correct folder for the owner of the file. The Shared folder for the other users gets updated by the files_sharing app
2013-10-24 12:27:22 +02:00
Bjoern Schiessle 80ec5466a7 return -1 if file is empty otherwise we run into infinite loops 2013-10-24 12:26:38 +02:00
Thomas Müller f06cf05816 Merge pull request #5457 from owncloud/fix5438
LDAP: cookies from Paged Search must only be used once, as stated in RFC...
2013-10-23 14:51:32 -07:00
Björn Schießle 20d22ece2b Merge pull request #5416 from owncloud/sharing_fix_infinite_loop
sharing: fix infinite loop
2013-10-23 07:31:56 -07:00
Björn Schießle c6eabe58e2 Merge pull request #5145 from guruz/files_encryption_511_fix_chunk_calc
files_encryption: Fix getFileSize()
2013-10-23 07:11:45 -07:00
Jörn Friedrich Dreyer 1e5257c610 OC5 does not have executeAudited 2013-10-23 14:40:47 +02:00
Bjoern Schiessle 7dc68d40bc Merge branch 'stable5' into sharing_fix_infinite_loop 2013-10-23 14:30:14 +02:00
Jörn Friedrich Dreyer 38a78ad115 backport search in shared files to stable5 2013-10-23 12:33:23 +02:00
Andreas Fischer 51a57d97ac Merge pull request #5485 from owncloud/fixing-oci-stable5
adding backticks to satisfy Oracle

* owncloud/fixing-oci-stable5:
  adding backticks to satisfy Oracle
2013-10-23 11:55:18 +02:00
Thomas Müller 00d4ae01ee adding backticks to satisfy Oracle 2013-10-23 11:00:29 +02:00
Bjoern Schiessle 7a74f483dc fix array key 2013-10-22 11:54:12 +02:00
Bjoern Schiessle 004b4dbcb6 try to fix unencrypted file size if it doesn't look plausible 2013-10-22 11:54:00 +02:00
Andreas Fischer f82885b124 Try to create custom log file before falling back to default. 2013-10-22 11:22:01 +02:00
Arthur Schiwon eab57209fd LDAP: cookies from Paged Search must only be used once, as stated in RFC 2696. Also, if we go with Paged Search it, we need to use it with any read operation. Fixes #5438 and possibly #2545 2013-10-21 22:48:00 +02:00
Bjoern Schiessle 7923f93ee3 backport of https://github.com/owncloud/core/pull/5247
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-21 17:50:10 +02:00
Markus Goetz 6ece54853d files_encryption: Fix getFileSize()
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
2013-10-21 16:02:33 +02:00
Robin Appelman fa068641a7 fix recursive delete for smb 2013-10-20 19:23:53 +02:00
Robin Appelman aa96ac063a fix using touch to create a file for smb 2013-10-20 19:23:42 +02:00
blizzz afcf86a537 Merge pull request #5420 from owncloud/fix5081
LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks...
2013-10-18 14:57:48 -07:00
Björn Schießle b6655de2c4 Merge pull request #5414 from owncloud/ocs_share_api_stable5
ocs share api stable5
2013-10-18 09:13:17 -07:00
Bjoern Schiessle b09f0a3ca2 mail_send doesn't exists in stable5 2013-10-18 18:07:16 +02:00
Bjoern Schiessle 3d0f68bd7a run first getUsersItemShared() with the owner 2013-10-18 17:48:35 +02:00
Bjoern Schiessle 2ae9fefae4 update etags for user we haven't checked yet 2013-10-18 17:47:01 +02:00
Bjoern Schiessle 525f909e3c keep a list of users we already checked to avoid loops 2013-10-18 17:35:56 +02:00
Donald Buczek 5169b0ee8b make sure the shared ldap connection is rebound to the configured user after being used for password checking. 2013-10-18 17:13:36 +02:00
Arthur Schiwon e150764ee6 LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @sfyang 2013-10-18 14:40:25 +02:00
Bjoern Schiessle 6a01fb31aa enable files sharing tests 2013-10-18 14:27:44 +02:00
Bjoern Schiessle edee6f1e27 Merge branch 'stable5' into ocs_share_api_stable5 2013-10-18 14:26:45 +02:00
Bjoern Schiessle 78537cb1a1 don't cache if the encryption is enabled, this can lead to problems during unit testing
backport from: https://github.com/owncloud/core/commit/909af2b62e75d1a5db866466074f2bcb95b864dc
2013-10-18 14:25:31 +02:00
Bjoern Schiessle 8552b30bf0 Merge branch 'stable5' into ocs_share_api_stable5 2013-10-18 14:08:40 +02:00
Morris Jobke de33fcdfa8 Merge pull request #5415 from owncloud/fix_4884
Use display name from magic cookie, fixes #4884
2013-10-18 04:15:05 -07:00
Bjoern Schiessle b3240af93d fix infinite loop while updating etags, fix for #4365 2013-10-18 12:51:16 +02:00
Arthur Schiwon 036441078b Use display name from magic cookie, fixes #4884 2013-10-18 12:16:47 +02:00
Bjoern Schiessle 4ffec16ea7 fix check if app is enabled
Conflicts:
	apps/files_encryption/lib/proxy.php
2013-10-18 11:50:09 +02:00
Bjoern Schiessle 12b30cd708 check if key exists before reading it 2013-10-18 11:49:14 +02:00
Bjoern Schiessle a925c98197 check if encryption app is enabled before trying to calculate file size 2013-10-18 11:48:06 +02:00
Bjoern Schiessle b5325dbe06 ocs share api backport to stable5 2013-10-18 11:20:33 +02:00
Vincent Petry d7b2a09cae Disable versions app JS in public mode
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.

Fixes #4545

Backport of 41c6c44221
2013-10-17 21:21:27 +02:00
Vincent Petry a33decaa27 Added isPublic flag in files_sharing template
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.

Backport of 6a36d7fa86 required by other
fixes.
2013-10-17 21:20:09 +02:00
Vincent Petry 79cf3a722e Fixed sharing status update for new/uploaded files
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977

Backport of 70c9652cdf6e00f1c62fb9a61d9dd4fb3e2c93c3
2013-10-17 14:56:38 +02:00
Vincent Petry 5dda9c08c7 Fixed upload permissions distinction between public and logged in upload
Backport of 9cfb438ff7
2013-10-17 12:57:27 +02:00
Vincent Petry 5f6ac078fd Update file actions for newly created files
The commit d53b603b82 for the backport
didn't contain code for the case where new files were created.
This is because that code already existed in OC6 as part of another fix.

This fix adds the missing call to update the file actions for newly
created files.
2013-10-17 12:20:04 +02:00
Thomas Müller 9628f5245c Merge pull request #5229 from owncloud/more-link-expiration-stable5
Backport of #4856 to stable5: Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
2013-10-16 12:30:31 -07:00
Thomas Müller 57ccd50b54 Merge pull request #5185 from owncloud/Update-feed
[stable5] Fixes for update feed fetching and parsing
2013-10-16 12:09:59 -07:00
Andreas Fischer 0f693f027b Merge pull request #5343 from owncloud/backport-5340-stable5
Backport 5340 stable5

* owncloud/backport-5340-stable5:
  streamCopy() should return proper structure.
2013-10-15 16:15:37 +02:00
Thomas Müller 703e7506dd streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.

Conflicts:
	lib/helper.php
	tests/lib/helper.php
2013-10-14 23:55:53 +02:00
Thomas Müller 649041b13a minimize diff for easier review 2013-10-14 15:51:56 +02:00
Thomas Müller 1f0cca0ce0 adding detection of aborted uploads
Conflicts:
	lib/connector/sabre/directory.php
2013-10-14 15:49:26 +02:00
Thomas Müller 73570d4979 returning the number of stored bytes in store() and adding cleanup() method 2013-10-14 15:42:53 +02:00
Thomas Müller 0ac379f916 adding size() to the file cache 2013-10-14 15:42:35 +02:00
Vincent Petry d53b603b82 File actions are now updated after create/upload file
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.

Backport of e98ea06890 for #4971 and #4993
2013-10-14 10:21:01 +02:00
Nico Kaiser 09588b6f1c Fix static function call. Sorry. 2013-10-11 21:57:09 +02:00
Nico Kaiser 1c2b2909eb Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694 2013-10-11 21:41:04 +02:00
Björn Schießle f89e96e06d Merge pull request #5218 from owncloud/no_passwords
remove password before writing it to the log file
2013-10-11 06:04:14 -07:00
Bjoern Schiessle 6095a47acb let admin specify timezone for log file entries
Backport from #5173 and #5219
2013-10-11 14:57:36 +02:00
Bjoern Schiessle 621390b10b make sure that we only find file/folder shares 2013-10-11 10:51:42 +02:00
Bjoern Schiessle b37b4ccad9 only encrypt file to users with encryption keys
Conflicts:
	apps/files_encryption/lib/stream.php
2013-10-11 10:51:24 +02:00
Thomas Müller f8d28138b2 the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()

Conflicts:
	tests/lib/files/view.php
2013-10-10 23:16:00 +02:00
Victor Dubiniuk dd7ce02458 Improve empty data check 2013-10-10 19:56:20 +03:00
Björn Schießle edd8d22c6f Merge pull request #5208 from owncloud/fix_5126_stable5
[stable5] fix upload to /Shared
2013-10-09 06:28:37 -07:00
Andreas Fischer 49686dc85c Perform expiration date checking before returning share data for token. 2013-10-09 13:25:43 +02:00
Andreas Fischer 6c683baccb Tests whether expired/valid link share is still accessible. 2013-10-09 13:25:38 +02:00
Andreas Fischer de7861928f Merge pull request #5190 from owncloud/stable5-numRows-no-limit
Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().

* owncloud/stable5-numRows-no-limit:
  Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().
2013-10-09 03:15:58 +02:00
Andreas Fischer 05adfb1128 Merge pull request #5212 from owncloud/fixing-5201
[stable5] executeAudited->execute Closes #5201

* owncloud/fixing-5201:
  OC_DB::executeAudited is not availabe in 5.0
2013-10-08 23:16:17 +02:00
Bjoern Schiessle 9edd9373e7 remove username/passswords from URLs before writing the to the log file 2013-10-08 20:19:39 +02:00
Bjoern Schiessle d474e6f8f2 Merge branch 'stable5' of github.com:owncloud/core into stable5 2013-10-08 17:22:20 +02:00
Bjoern Schiessle c14480616d revert backport from here: https://github.com/owncloud/core/pull/5088
This shouldn't have been backported.
2013-10-08 17:21:12 +02:00
Victor Dubiniuk 127b81780a OC_DB::executeAudited is not availabe in 5.0 2013-10-08 18:19:09 +03:00
Björn Schießle eba9d24650 Merge pull request #5211 from owncloud/sharing_search_users_fix-stable5
find users which are in the same group
2013-10-08 08:09:40 -07:00
Bjoern Schiessle e3565d5266 find users which are in the same group 2013-10-08 17:04:12 +02:00
Björn Schießle 3d5f8de758 Merge pull request #5206 from owncloud/cleanup_share_table
share table clean-up: make sure that we only remove files/folders
2013-10-08 06:58:12 -07:00
Bjoern Schiessle f700afcb4b Backport of https://github.com/owncloud/core/pull/5193/
write the part file to the users root folder if the updated file is located in /Shared because we can't create new files in Shared/
2013-10-08 15:46:54 +02:00
Morris Jobke 2264360272 fix escaping 2013-10-08 15:45:52 +02:00
Bjoern Schiessle 2868b27760 make sure that we only remove file/folder shares 2013-10-08 15:16:33 +02:00
Thomas Müller 148d882ee0 Merge pull request #5112 from owncloud/backport-4969-stable5
[backport-stable5] adding privilege check on move and rename operations
2013-10-08 04:39:13 -07:00
Andreas Fischer 36d77a07d5 Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare(). 2013-10-08 01:33:22 +02:00
Victor Dubiniuk d1f6bb466e Do not write current time before checking if cache is expired 2013-10-07 19:44:19 +03:00
Bjoern Schiessle 8ecf88d9f9 Merge branch 'stable5' of github.com:owncloud/core into stable5 2013-10-07 16:21:33 +02:00
Bjoern Schiessle a00e4b2d3d trash bin button needs to be an input field 2013-10-07 16:21:02 +02:00
Morris Jobke b0776e1ee7 Merge pull request #5164 from owncloud/share-autofocus
Share autofocus
2013-10-07 06:23:03 -07:00
Morris Jobke 8c63f91ba1 Fix autofocus
fix #4465
fix #4941
backport of 4803 to stable5
2013-10-07 11:34:46 +02:00
Bjoern Schiessle 6f617bdec7 catch exception if db query execution fails 2013-10-07 11:09:18 +02:00
Bjoern Schiessle 2a0be238bc clean up oc_share table from files which are no longer exists 2013-10-07 11:09:00 +02:00
Bjoern Schiessle d0f876102d add comments 2013-10-07 11:08:51 +02:00
Bjoern Schiessle 3c29b1a01c remove deleted shares from the database table oc_share 2013-10-07 11:08:39 +02:00
Bart Visscher 632a2e166f Merge pull request #5110 from owncloud/pg_install_db
postgresql connect with specify db if 'postgres' does not work
2013-10-04 04:31:40 -07:00
Thomas Müller 293e70a6d4 adding privilege check on move and rename operations
Conflicts:
	lib/connector/sabre/objecttree.php
2013-10-04 10:31:31 +02:00
Thomas Müller 1bc7ae869a Merge pull request #5096 from owncloud/backport-4960-stable5
Backport of #4960 to stable5
2013-10-04 01:09:00 -07:00
Morris Jobke 33e1ed6074 Try connection with specified db when postgres does not work 2013-10-04 07:54:22 +02:00
Frank Karlitschek 4b317c02c7 5.0.12 2013-10-03 14:26:01 +02:00
Thomas Müller 1f1171dfaf duplicate code :sigh: - will fix this in a second pr 2013-10-02 22:13:59 +02:00
Thomas Müller 245a0260a9 adding file_exists check just to be on the save side 2013-10-02 22:13:59 +02:00
Thomas Müller ba7432126b handle error situation of rename proper 2013-10-02 22:13:58 +02:00
Bjoern Schiessle d0046b6e29 set rememberlogin to false for the encryption app 2013-09-30 21:48:50 +02:00
Bjoern Schiessle 490023ba4e check every enabled app if the remember login feature needs to be disabled 2013-09-30 21:48:39 +02:00
Bjoern Schiessle 61752fa8d1 introduce OC_Util::rememberLoginAllowed()
Conflicts:
	core/templates/login.php
	lib/util.php
2013-09-30 21:47:55 +02:00
Bjoern Schiessle f95da8ba59 don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password

Conflicts:
	core/templates/login.php
	lib/util.php
2013-09-30 21:45:22 +02:00
Andreas Fischer e01efd3887 Cherry-pick of 5d671a8 onto stable5.
recreate an etag within the scanner if the cache contains an empty etag

Conflicts:
	lib/files/cache/cache.php
	tests/lib/files/cache/scanner.php
2013-09-29 23:24:33 +02:00
Frank Karlitschek e71c7ee635 5.0.12 RC1 2013-09-27 16:47:10 +02:00
VicDeo eca060bf0e Merge pull request #4948 from owncloud/fix-inputfields
fix visual glitch, do not use black border for input fields
2013-09-26 06:39:05 -07:00
Bjoern Schiessle d6fd22802d we can leave the loop if the permission of the link share was checked 2013-09-26 12:21:54 +02:00
Bjoern Schiessle 342be99149 check only permission from link-share to decide if public upload is enabled or disabled 2013-09-26 12:21:43 +02:00
Andreas Fischer 174f5000d6 Merge pull request #4954 from owncloud/fix-link-expiration-stable5
Backport of sharing fixes to stable5

* owncloud/fix-link-expiration-stable5:
  Calculate dateInPast and dateInFuture.
  Compare objects directly. Also use $expected and $actual.
  Add database tests for INSERT/SELECT date format.
  Add comment explaining how $dateInFuture was picked.
  Coding style: { for methods start are supposed to be on the same line.
  Expiration tests for sharing with groups.
  Do not repeat shareUserOneTestFileWithUserTwo() code.
  Make dates test class properties.
  Try to make Oracle happy by also specifying seconds.
  Test whether a still-valid user share is still accessible.
  Test whether an expired user share is still accessible.
2013-09-24 23:36:34 +02:00
Andreas Fischer cbaf93ff92 Calculate dateInPast and dateInFuture. 2013-09-24 00:00:30 +02:00
Andreas Fischer f63c9a24eb Compare objects directly. Also use $expected and $actual. 2013-09-24 00:00:24 +02:00
Andreas Fischer a8d7f1feae Add database tests for INSERT/SELECT date format. 2013-09-23 23:59:59 +02:00
Andreas Fischer 40c6927b59 Add comment explaining how $dateInFuture was picked. 2013-09-23 23:59:47 +02:00
Andreas Fischer 1751340164 Coding style: { for methods start are supposed to be on the same line. 2013-09-23 23:59:35 +02:00
Andreas Fischer a551bfc9ff Expiration tests for sharing with groups. 2013-09-23 23:59:25 +02:00
Andreas Fischer 9f8d3595b5 Do not repeat shareUserOneTestFileWithUserTwo() code. 2013-09-23 23:59:16 +02:00
Andreas Fischer aa6aef485e Make dates test class properties. 2013-09-23 23:59:09 +02:00
Andreas Fischer e8ac55a884 Try to make Oracle happy by also specifying seconds. 2013-09-23 23:59:06 +02:00
Andreas Fischer d3498153c3 Test whether a still-valid user share is still accessible. 2013-09-23 23:58:54 +02:00
Andreas Fischer d6c3b9488e Test whether an expired user share is still accessible. 2013-09-23 23:58:28 +02:00
Robin Appelman 46cdb7b406 remove deleted files while scanning 2013-09-23 19:57:48 +02:00
Bjoern Schiessle 9c9597e582 initialize variable 2013-09-23 10:25:15 +02:00
Bjoern Schiessle a6466b1c7c calculate correct permissions while toggle the password protection 2013-09-23 10:25:07 +02:00
Bjoern Schiessle 10944464c1 make sure that both $permissions and $oldPermissions have the same type 2013-09-23 10:24:58 +02:00
Bjoern Schiessle 3451bb4ebf only remember password if the user changes the permissions, otherwise the user disabled the password protection
Conflicts:
	lib/public/share.php
2013-09-23 10:24:46 +02:00
Jan-Christoph Borchardt a321be15df fix visual glitch, do not use black border for input fields 2013-09-23 00:41:43 +02:00
Morris Jobke b7c8691d80 Merge pull request #4924 from owncloud/fixing-4416-stable5
Fixing 4416 stable5
2013-09-22 08:40:03 -07:00
Georg Ehrke 30c56d2572 public.php - check if maintenance mode is enabled 2013-09-20 21:20:06 +02:00
Thomas Müller 12bef4124b setting a default on filecache column unencrypted_size 2013-09-20 16:31:46 +02:00
Thomas Müller d525369cd3 adding comma to get cleaner diffs in the future 2013-09-19 17:34:35 +02:00
Thomas Müller 6dd8a1d2c6 no file actions during upload 2013-09-19 17:34:16 +02:00
Thomas Müller 2fde0d0944 remove file action elements before recreating them 2013-09-19 17:33:52 +02:00
Thomas Müller 23bfe083a1 store the permissions retrieved via ajax within the dom element 2013-09-19 17:33:31 +02:00
Thomas Müller d5cbfa4f44 add permissions of the file to the json response 2013-09-19 17:32:57 +02:00
Bjoern Schiessle 9ff9082c13 performance improvement, check configuration only if no private key exists
backport from https://github.com/owncloud/core/commit/72eaf2894a540bc9280e144ba493db7fcde07eac
2013-09-18 10:40:52 +02:00
Bjoern Schiessle 479ad26a98 check if stream wrapper is already registered to avoid warning 2013-09-18 10:37:50 +02:00
Thomas Müller 1a26b20538 Merge pull request #4827 from owncloud/backport-4719-stable5
some is_resource tests have been missing in #4701
2013-09-13 12:08:32 -07:00
Frank Karlitschek 9490e792e6 Merge pull request #4821 from owncloud/fix_user_management
Fix user management
2013-09-13 03:07:42 -07:00
Thomas Müller 86eab2ee6c some is_resource tests have been missing in #4701 2013-09-13 01:00:43 +02:00
ringmaster 0a90454729 Allow numeric group names 2013-09-12 10:50:26 -04:00
ringmaster 4fd16c5411 Ensure creation of a JSON array, not an object. 2013-09-12 10:49:36 -04:00
Jörn Friedrich Dreyer 38258fe246 Improve IE Compatibility
Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
2013-09-11 11:50:36 +02:00
Thomas Müller 51b53abf9f never hack late night
Conflicts:
	apps/files_external/lib/irods.php
2013-09-11 09:54:45 +02:00
Robin Appelman 1a8636eb9c test case for hooks send from a non-default view 2013-09-10 18:08:59 +02:00
Robin Appelman 507a0450db also emit hooks for views that are a subfolder of the user folder 2013-09-10 18:05:14 +02:00
Thomas Müller 750e4c4f8f Merge branch 'stable5' of github.com:owncloud/core into stable5 2013-09-10 13:55:06 +02:00
Thomas Müller b127ad449d removing all ?> jutt in case 2013-09-10 13:54:43 +02:00
Thomas Müller 36cd58c4f5 removing ?> followed by whitespaces 2013-09-10 13:54:43 +02:00
Thomas Müller eecc31aa61 Workaround for IE 9 & 10 for clicking filelist after adding new item
manual backport of f4ec5182bd
2013-09-10 10:55:02 +02:00
Frank Karlitschek 33ba6b0b34 5.0.11 2013-09-06 20:31:11 +02:00
Björn Schießle 0907b4119a Merge pull request #4551 from owncloud/fix_4533
Handle part files correctly
2013-09-06 06:57:45 -07:00
Bjoern Schiessle 1d2f444128 remove some more debug output 2013-09-06 10:58:42 +02:00
Bjoern Schiessle 13f3fb94e8 Merge branch 'stable5' into fix_4533 2013-09-06 10:51:27 +02:00
Bjoern Schiessle d33678b0cb remove some error_logs 2013-09-05 11:50:36 +02:00
Bjoern Schiessle 9083833b37 remove error logs 2013-09-05 11:45:36 +02:00
Bjoern Schiessle ce382aec63 coding style fixes 2013-09-05 10:11:09 +02:00
Bjoern Schiessle 7e0f855caf if the files doesn't exist yet we start with the parent to search for shares 2013-09-05 10:08:13 +02:00
Bjoern Schiessle 0e97712ad3 fix part file handling and real size calculation, this should also solve #4581 2013-09-04 21:15:06 +02:00
Frank Karlitschek 2d1d8465e8 5.0.11 RC2 2013-09-01 16:59:38 +02:00
blizzz 6cb839b6e9 Merge pull request #4701 from owncloud/fix_4667
Always check variable type before using readdir to avoid surprises, fixes #4667 #4658 and #4613
2013-09-04 03:28:12 -07:00
Arthur Schiwon 73e4b55ff3 one check is enough 2013-09-04 11:19:58 +02:00
Bart Visscher 44b71248b6 Merge pull request #4700 from owncloud/stable5_ocp_files_searchbymime
Stable5 ocp files searchbymime
2013-09-03 08:56:50 -07:00
Jörn Friedrich Dreyer 6678d69dc8 Merge pull request #4699 from owncloud/stable5_autoloader_try_lib_folder
Stable5 autoloader try lib folder
2013-09-03 04:04:35 -07:00
blizzz c0f1a6be4a Merge pull request #4693 from owncloud/encryption_improved_error_messages_stable5
Encryption improved error messages for Stable5
2013-09-02 14:31:37 -07:00
Arthur Schiwon 4e54e8b36d fix unknown var in if clause 2013-09-02 22:13:11 +02:00
Arthur Schiwon cd6443a19f Check variable type before using readdir to avoid surprises and fix #4667 #4658 and #4613 2013-09-02 18:58:25 +02:00
Jörn Friedrich Dreyer 692c8abfd7 add searchByMime to public api 2013-09-02 18:09:00 +02:00
Jörn Friedrich Dreyer f9eea901fe backport autoloader magic trying to find class in lib folder 2013-09-02 18:05:10 +02:00
Bjoern Schiessle 2c937e06d7 improved error message to reflect the case when the app was re-eanbled during the session 2013-09-02 13:00:41 +02:00
Bjoern Schiessle 7665297472 Merge branch 'stable5' into fix_4533 2013-08-30 14:27:40 +02:00
blizzz e1d6e63083 Merge pull request #4654 from owncloud/fix_4616
Fix 4616
2013-08-30 02:43:44 -07:00
Raghu Nayyar 23a3e4f2cb Merge pull request #4633 from owncloud/backport-4610-stable5
Backport 4610 to stable5
2013-08-30 00:59:59 -07:00
Arthur Schiwon 76453f9cf0 Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616. 2013-08-30 00:33:48 +02:00
Arthur Schiwon 6415a547a1 whitespaces 2013-08-30 00:31:10 +02:00
Thomas Müller 30173ec329 Merge pull request #4539 from owncloud/fix_4201
Fix 4201, Group Search in Share Dialog only half-working
2013-08-29 08:52:20 -07:00
Owen Winkler f53ffe98cf Merge pull request #4634 from owncloud/backport-4360-stable5
Backport 4360 stable5
2013-08-29 04:47:17 -07:00
Thomas Müller 90e5d5f84e Merge pull request #4635 from owncloud/fixing-quota-stable5
Fixing quota stable5
2013-08-29 03:33:39 -07:00
Thomas Müller 0423090771 backport of #4360 2013-08-29 10:51:46 +02:00
Thomas Müller 1445a12e9e webdav quota information contains the values for used and free - not total 2013-08-29 10:49:50 +02:00
Jan-Christoph Borchardt 90ae95c73a fix shadow style of username input box
Conflicts:
	core/css/styles.css
2013-08-29 09:40:57 +02:00
Jan-Christoph Borchardt 0956363410 remove show password toggle from log in page, ref #4577 #4580
Conflicts:
	core/js/js.js
2013-08-29 09:39:23 +02:00
Robin Appelman da504295fe better variable naming 2013-08-28 22:56:29 +02:00
Robin Appelman fa7189c40d Cache: don't check if the parent exists in the cache if we are already sure it does 2013-08-28 22:56:29 +02:00
Frank Karlitschek ee1d996c65 5.0.11 RC1 2013-08-28 14:13:00 +02:00
Thomas Müller 616bc08431 Merge pull request #4357 from owncloud/fixing-4341-stable5
Enable file upload to shared folder with create permission only
2013-08-27 14:29:52 -07:00
blizzz 4d0823eefc Merge pull request #4595 from owncloud/ldap_robust_replace
LDAP: case insensitive replace for more robustness
2013-08-27 13:22:59 -07:00
Thomas Müller b8010ce35d lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
Conflicts:
	lib/connector/sabre/quotaplugin.php
2013-08-27 21:35:21 +02:00
Thomas Müller 31d60bced3 adding unit tests for quota checks 2013-08-27 21:32:00 +02:00
Thomas Müller 19bab68d89 adding unit tests to determine length 2013-08-27 21:31:59 +02:00
Thomas Müller 7d6069f972 fixes #4343 2013-08-27 21:31:59 +02:00
Bjoern Schiessle b658cc6c07 check shares for the real file and not for the .part file 2013-08-27 16:29:54 +02:00
Bjoern Schiessle 81827e7570 first check if a extension exists before comparing it 2013-08-27 14:19:30 +02:00
Arthur Schiwon 636ee554b6 LDAP: case insensitive replace for more robustness 2013-08-27 13:47:31 +02:00
Thomas Müller b2d676dda5 storage information is path specific 2013-08-27 10:54:13 +02:00
Thomas Müller 17dfdcc645 webdav quota now displays the same values as the web interface does
Conflicts:
	lib/helper.php
2013-08-27 10:53:47 +02:00
Owen Winkler e6f01380f7 Merge pull request #4364 from ringmaster/fix_4351
Store and retrieve group data as JSON
2013-08-26 09:22:59 -07:00
Owen Winkler 43ac018f88 Break long lines into smaller ones. 2013-08-23 14:45:53 -04:00
Owen Winkler 630c3cb682 Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.

Conflicts:
	settings/js/users.js
2013-08-23 14:45:07 -04:00
Bjoern Schiessle dd213f4627 handle part files correctly 2013-08-22 17:55:10 +02:00
Thomas Müller f52d722ff2 Merge pull request #4541 from owncloud/backport-4512-stable5
Backport 4512 stable5
2013-08-21 15:15:51 -07:00
blizzz c8554cc514 Merge pull request #4487 from owncloud/ldap_fix_hook
Ldap fix hook
2013-08-21 14:57:11 -07:00
Thomas Müller da299e0a7a additional readdir check in mappedlocal 2013-08-21 22:41:34 +02:00
Robin Appelman f42b69d72f use strict equals in readdir loops to prevent issues with '0' files
Conflicts:
	apps/files_external/lib/amazons3.php
	apps/files_trashbin/index.php
	lib/connector/sabre/objecttree.php
2013-08-21 22:37:22 +02:00
Arthur Schiwon 02e9483c86 Whitespaces 2013-08-21 13:15:58 +02:00
Arthur Schiwon bf933c77a1 Use Group methods for searching, fixes #4201 2013-08-21 13:15:31 +02:00
Bjoern Schiessle 8e67854fc9 selective backport from https://github.com/owncloud/core/pull/4239; don't change etags during initial encryption because the file content doesn't change 2013-08-18 19:05:43 +02:00
Morris Jobke 76e4fe79d2 Merge pull request #4490 from owncloud/fix-multiselect-mac-firefox
fix hidden groups in Firefox on Mac - fix 2571
2013-08-18 03:21:16 -07:00
Arthur Schiwon 2613eb6b5d Sharing: only determine path root if owner is available 2013-08-17 18:45:36 +02:00
Morris Jobke 26e0aadf9c fix hidden groups in Firefox on Mac - fix 2571 2013-08-17 18:23:37 +02:00
Arthur Schiwon 108bb4101f LDAP: fix wrong hook name 2013-08-17 17:55:46 +02:00
Bjoern Schiessle 34afce769c switched to dirname() 2013-08-17 17:36:20 +02:00
Bjoern Schiessle b8550d77d1 added missing parameter documentation 2013-08-17 17:36:09 +02:00
Bjoern Schiessle a1f0dd2c69 added createMissingDirectories() method 2013-08-17 17:35:59 +02:00
Bjoern Schiessle 75ceeed38b also create root dir if it doesn't exist yet 2013-08-17 17:35:48 +02:00
Bjoern Schiessle 02f40f2150 use OC files API to create missing directory which should handle special chars in every environment correctly 2013-08-17 17:35:39 +02:00
Bjoern Schiessle 79b6f39e3d first check if file exists before checking the files size 2013-08-17 13:37:51 +02:00
Bart Visscher 01e2e914bd Merge pull request #4423 from owncloud/ldap_reduce_connections
Ldap reduce connections
2013-08-17 03:03:51 -07:00
Kondou 656daff629 Merge pull request #4454 from owncloud/fix_4446
Show a "password incorrect" notice when used shared password is wrong
2013-08-17 02:29:39 -07:00
Thomas Müller 1c24936ae2 no files external for SMB on windows 2013-08-16 17:34:40 +02:00
kondou 2a7c9ee9d2 Use better wording. 2013-08-16 10:56:43 -04:00
kondou 2db617bf17 Add a "Wrong password." message, if the password
for the public share was wrong.

Fix #2725
2013-08-16 10:56:32 -04:00
Owen Winkler 333900d5aa Style the new 'password wrong' div conservatively. 2013-08-16 10:53:52 -04:00
Thomas Tanghus 7d06d67661 Merge pull request #4458 from owncloud/dav_principal_groupmemberset
Dav principal groupmemberset
2013-08-16 07:41:36 -07:00
Thomas Tanghus 3c4e64710a Don't barf on OC_Connector_Sabre_Principal::getGroupMemberSet
Refs: owncloud/contacts#166 and owncloud/calendar#102
2013-08-16 01:46:31 +02:00
Jörn Friedrich Dreyer 5e7963dfb1 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-15 23:10:39 +02:00
Bjoern Schiessle 7d8ab0a6c1 use __DIR__ instead of realpath 2013-08-15 12:37:26 +02:00
Bjoern Schiessle 2fbcbe9b83 provide correct path for require_once 2013-08-15 12:37:17 +02:00
Thomas Müller 660a109221 Merge pull request #4306 from owncloud/stable5-googledrive
[Stable5] backport  Google Drive SDK
2013-08-14 11:37:16 -07:00
Arthur Schiwon 6251b3491c LDAP: only connect to LDAP once on login 2013-08-14 16:03:18 +02:00
Robin Appelman c6e62f5e4c fix namespacess for scanner test 2013-08-12 19:53:57 +02:00
Robin Appelman 6325cf6ecb Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 17:30:23 +02:00
Robin Appelman 20f9f43de7 Scanner: additional tests for reusing etags during scanning 2013-08-12 17:30:14 +02:00
Thomas Müller 168881df44 use dir to determine the proper permissions 2013-08-10 00:33:24 +02:00
Thomas Müller 3569bbe637 Merge pull request #4361 from ringmaster/fix_4355
Send mime-type for new files
2013-08-08 10:20:22 -07:00
Bjoern Schiessle a6b8c5231c don't create empty versions 2013-08-08 17:25:50 +02:00
Bjoern Schiessle d446eecd5e oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work. 2013-08-08 17:20:24 +02:00
ringmaster d63cd30797 Provide a default mime-type for files created by filename.
Fixes #4355.
2013-08-08 11:06:06 -04:00
Morris Jobke db964d32cf Merge pull request #4358 from owncloud/rm_debug_msg
Less noisy debug log
2013-08-08 07:35:31 -07:00
Arthur Schiwon 0049f6f91f Remove noisy Log/Debug message 2013-08-08 16:30:29 +02:00
Thomas Müller 57a1b9038e Merge pull request #4346 from owncloud/basic_hack_auth_backport
Basic hack auth backport
2013-08-08 07:28:50 -07:00
Thomas Müller 96e0b81fcb in case the file is new isCreatable() is checked
in case the file exists isUpdatable() is checked
2013-08-08 16:11:28 +02:00
Thomas Müller d9d0a6e7d6 proper response in case the upload fails - e.g. in case permissions on shared folders are not enough 2013-08-08 15:58:57 +02:00
Andreas Fischer 604ba1d0f7 Check expected type after JSON decode instead of checking what is not expected.
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-08 13:13:55 +02:00
Björn Schießle cc03251c8f Merge pull request #4268 from owncloud/encryption_check_config
Encryption app, check config
2013-08-07 23:35:53 -07:00
Thomas Tanghus 201557cf13 Backport #3487 Basic Auth fix 2013-08-07 21:19:03 +02:00
Thomas Müller 248e7a0692 fixing PHPDoc 2013-08-07 15:21:57 +02:00
Andreas Fischer 49ecd7764b app migrate: Use = instead of LIKE as described in the comment above.
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
2013-08-07 15:08:23 +02:00
Andreas Fischer 29d0b2cd41 Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. 2013-08-07 15:08:11 +02:00
Frank Karlitschek 38d2124340 5.0.10 2013-08-05 00:12:02 +02:00
Frank Karlitschek fb35010c15 5.0.10 RC1 2013-08-04 22:44:06 +02:00
blizzz 3b59d5737a Merge pull request #4179 from owncloud/ldap_oracle_fixes
(not only) LDAP Oracle compatiblity
2013-08-06 02:41:05 -07:00
Thomas Müller 797c2a9c76 adding executable script occ (ownCloud console) 2013-08-05 23:31:56 +02:00
Thomas Müller 6c8a0b2c8d Merge pull request #4317 from owncloud/backport-cli-scanner-stable5
Backport cli scanner to stable5
2013-08-05 14:30:36 -07:00
Thomas Müller d8b14ed47a use isset to prevent undefined index 2013-08-05 16:48:03 +02:00
Thomas Müller f8ce76c423 load authentication apps to get users from other backends like LDAP - THX @blizzz 2013-08-05 12:37:26 +02:00
Bart Visscher 2188a756e8 Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common 2013-08-05 12:14:19 +02:00
Thomas Müller 7b3de12a74 manual backporting of #4285 2013-08-05 12:14:15 +02:00
Thomas Müller 03f242a3b0 manual backporting of OC\Files\Utils\Scanner to stable5 2013-08-05 12:13:34 +02:00
Robin Appelman 58ee51fc42 Make Cache\Scanner an emitter 2013-08-05 12:01:13 +02:00
Thomas Müller f4e94a46cb Merge branch 'stable5' of github.com:owncloud/core into stable5 2013-08-05 00:25:22 +02:00
Thomas Müller 99a0581140 fixing PHPDoc 2013-08-05 00:24:45 +02:00
Thomas Müller 3ad4531a4f add 'logdateformat' to config.sample.php 2013-08-05 00:24:45 +02:00
Bernhard Posselt 34fd7e3df4 make log date configurable, default to iso 8601 2013-08-05 00:24:45 +02:00
Thomas Müller 3b5d5a2b32 Merge pull request #4290 from owncloud/oracle_current_timestamp
Oracle current timestamp
2013-08-04 14:52:02 -07:00
Thomas Müller c262430639 Merge pull request #4240 from owncloud/backport-remember-checked
Backport remember checked
2013-08-04 14:50:29 -07:00
Morris Jobke 4e2200a1e1 Merge pull request #4164 from owncloud/fix_102
flicker-free versions drop-down
2013-08-04 10:33:17 -07:00
Michael Gapczynski 88e8eeb6c0 Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing 2013-08-03 15:40:52 +03:00
Michael Gapczynski e8037e41b8 Fix 'most' Google Drive tests 2013-08-03 15:40:38 +03:00
Michael Gapczynski 5c22a635b7 substr storage id to prevent problems with storing the change id in appconfig 2013-08-03 15:40:22 +03:00
Michael Gapczynski a1c44d6fea Implement hasUpdated() to watch for changes on Google Drive side 2013-08-03 15:40:03 +03:00
Michael Gapczynski 1c3fc3ac76 Return null if file size is negative for WebDAV, fix #2013 2013-08-03 15:39:40 +03:00
Michael Gapczynski 37800413f6 Fix require_once for 3rdparty in google ajax frontend 2013-08-03 15:39:22 +03:00
Michael Gapczynski 3398e193db Include 3rdparty Google Drive SDK 0.6.2 2013-08-03 15:38:48 +03:00
Michael Gapczynski bbf440d969 Fix constant in last commit 2013-08-03 15:38:35 +03:00
Michael Gapczynski e4289cf629 Prepare for #2013 fix 2013-08-03 15:38:18 +03:00
Michael Gapczynski 491acebc80 Setting Redirect URI is not required here 2013-08-03 15:37:58 +03:00
Michael Gapczynski cac44b2eac Switch to using Google Drive SDK, closes #2047 2013-08-03 15:37:34 +03:00
Thomas Müller d0ab685744 fix whitespacing 2013-08-02 16:33:30 +02:00
Lennart Rosam c9b7820e31 Make default language configurable via config.php
Conflicts:
	config/config.sample.php
2013-08-02 16:30:11 +02:00
Michael Gapczynski 9fc995498f Use old database methods for caclulateFolderSize 2013-08-02 10:02:47 -04:00
Michael Gapczynski 8c2575aae2 Use query to calculate folder size 2013-08-02 09:58:38 -04:00
Michael Gapczynski 502a479eb6 Fix calculating size for empty folders
Conflicts:
	lib/files/cache/cache.php
2013-08-02 09:58:10 -04:00
Jörn Friedrich Dreyer bff951375a use fixed OC.Breadcrumb.push()
Conflicts:
	core/js/js.js
2013-08-02 14:45:41 +02:00
Jörn Friedrich Dreyer 1c91daa8ab convert 0000-00-00 00:00:00 to CURRENT_TIMESTAMP when setting up db on oracle 2013-08-02 13:06:35 +02:00
Jörn Friedrich Dreyer 8fb52b2de4 Merge pull request #4260 from owncloud/stable5_search_result_scrollbar
Stable5 search result scrollbar
2013-08-02 02:55:43 -07:00
Bjoern Schiessle ecc6c8d491 attach click handler after drop-down was created 2013-08-02 10:09:27 +02:00
Thomas Müller 78ea86c583 Merge pull request #4276 from owncloud/Respect-table-prefixes
[stable5] Skip non-oc tables on upgrade
2013-08-02 00:28:08 -07:00
Robin Appelman b27180a613 Add a CLI script for manually triggering checking a folder for updates 2013-08-01 23:51:56 +02:00
Bernhard Posselt 6e2b9896de also adjust template properly for log date fix 2013-08-01 18:09:28 +02:00
Bernhard Posselt 45f5c9ceb2 fix admin log display and use a more readable format 2013-08-01 18:09:18 +02:00
Bernhard Posselt 8930725a87 use date and time instead of timestamp 2013-08-01 18:09:04 +02:00
Bjoern Schiessle 399c1f9a2c fix test and make warning translatable 2013-08-01 16:47:19 +02:00
Bjoern Schiessle e75dcf51c7 cancel sharing if some users doesn't have a working encryption set-up.
Conflicts:
	lib/public/share.php
2013-08-01 16:46:55 +02:00
Arthur Schiwon 4369dfe43f fix logical mistake in version comparison 2013-08-01 16:45:14 +02:00
Bjoern Schiessle af219650ac more error messages which might be useful for the user to debug his server config 2013-08-01 15:52:00 +02:00
Victor Dubiniuk 86335c6188 Use prefixes while reading old Db structure 2013-08-01 16:42:37 +03:00
Bjoern Schiessle e91062b179 improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-01 13:57:12 +02:00
Bjoern Schiessle 8ca8a587bc also write error message to the log 2013-08-01 13:51:33 +02:00
Bjoern Schiessle c62f1ab0ac catch broken server config and disable encryption app. 2013-08-01 11:50:56 +02:00
Jörn Friedrich Dreyer 17f821219a update css properties with px based values 2013-07-31 17:05:24 +02:00
Jörn Friedrich Dreyer 05207d3714 add overflow-y scroll and clean up indents 2013-07-31 16:52:53 +02:00
Thomas Müller 3b30bb23d7 fixes #4026 2013-07-30 17:34:15 +02:00
Thomas Müller c34f4c8298 Merge branch 'stable5' into backport-remember-checked 2013-07-30 17:20:15 +02:00
Thomas Müller cbb23154e8 Merge branch 'stable5' into ldap_oracle_fixes 2013-07-30 15:06:00 +02:00
Robin Appelman fea2a4a200 Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures 2013-07-30 14:34:56 +02:00
Robin Appelman 381fe4d7ef Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures 2013-07-30 14:33:56 +02:00
Jan-Christoph Borchardt fdffb3462e replace external storage status images with CSS, also use form to distinguish, fix #3910 2013-07-30 13:52:05 +02:00
Jan-Christoph Borchardt 8e0fcd4454 check remember log in by default, manual backport of #4175 2013-07-30 13:43:46 +02:00
Kondou cb3c3770d8 Merge pull request #4222 from owncloud/backport-3459-stable5
Backport 3459 stable5
2013-07-29 06:59:44 -07:00
Thomas Müller c76be96314 manual backport of changes related to #3459 2013-07-29 10:00:17 +02:00
Michael Gapczynski 73ab147f25 Move check so the variable will never be undefined 2013-07-28 19:33:58 -04:00
Robin Appelman 9159662fa9 use output buffering when including the irods libraries 2013-07-24 21:16:05 +02:00
Victor Dubiniuk 7deebc926b Show generic error when there is no error 2013-07-24 21:48:23 +03:00
Victor Dubiniuk d09e887945 Create an array entry before filling it 2013-07-24 21:48:03 +03:00
Arthur Schiwon 495f0d4b3c LDAP / Oracle compatibility: sql for emptying tables 2013-07-24 15:08:12 +02:00
Arthur Schiwon 429f07d142 LDAP / Oracle compatibility, make SQL syntax valid 2013-07-24 14:55:25 +02:00
Thomas Müller fefc476462 Merge pull request #4166 from owncloud/ext-fs-irods-stable5
Ext fs irods stable5
2013-07-24 04:48:08 -07:00
Morris Jobke 8c48881c4e mark test as incomplete because I can't reproduce jenkins failure 2013-07-24 09:14:51 +02:00
Arthur Schiwon 99113a78f0 Fix Updater if used with MDB2 2013-07-23 20:09:55 +02:00
Arthur Schiwon c239ca0d25 Oracle compat: enable appconfig.configvalue to store empty strings (now working) 2013-07-23 19:57:04 +02:00
Arthur Schiwon 4d46567dc0 Revert "Oracle compat: enable appconfig.configvalue to store empty strings"
This reverts commit 6c1e68acd8.
2013-07-23 19:55:47 +02:00
Arthur Schiwon 6c1e68acd8 Oracle compat: enable appconfig.configvalue to store empty strings 2013-07-23 13:23:59 +02:00
Thomas Mueller 2ae4675c49 update to latest master 2013-07-23 12:36:58 +02:00
Thomas Mueller efd3308711 Read configuratons for external filesystem test from a private place.
This will help not to accidentially push private data and enable testing on our ci server.
2013-07-23 12:27:13 +02:00
Thomas Müller f3c58fa794 fixing / adding comments 2013-07-23 12:24:42 +02:00
Thomas Müller dd29c71644 update copy right 2013-07-23 12:24:26 +02:00
Thomas Müller bc10e8a63e update .gitignore 2013-07-23 12:24:09 +02:00
Thomas Müller 67e23bced6 incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
Conflicts:
	.gitignore
2013-07-23 12:23:35 +02:00
Thomas Mueller ca1bfbeb2a - implement touch() to at least create a file which doesn't exist
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
2013-07-23 12:19:50 +02:00
Thomas Mueller 9169116cfa adding auth mode to ui and the url 2013-07-23 12:19:28 +02:00
Thomas Mueller 30c9a711e2 adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS 2013-07-23 12:19:16 +02:00
Thomas Mueller 37b52e33ab test case for iRODS storage added 2013-07-23 12:19:01 +02:00
Thomas Mueller 46b9ce5389 checkbox in settings ui 2013-07-23 12:18:46 +02:00
Thomas Mueller dcd5f71b7a in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session.
The stored credentials will be used for and interactions with the iRODS server.

Within the config UI a check box can be used to enable the credential reuse.
2013-07-23 12:18:30 +02:00
Thomas Mueller 5859bf0ec0 initial integration with iRODS www.irods.org
The used PHP API is hosted at https://code.renci.org/gf/project/irodsphp/
2013-07-23 12:18:07 +02:00
Björn Schießle 200ed0c469 only add versions if the drop down was added 2013-07-23 10:49:19 +02:00
Björn Schießle db8e19dba2 Create directly the right version dialog to open the drop-down flicker-free if no versions are available, issue #102 2013-07-23 10:23:45 +02:00
Georg Ehrke 254b29fc21 return empty array instead of 0 2013-07-22 20:37:39 +02:00
Arthur Schiwon 4b203280d2 LDAP: avoid PHP Warnings cause by passing empty values to implode 2013-07-22 13:57:58 +02:00
Arthur Schiwon 88dc61c200 LDAP: Oracle compat. fix, closes #4064 2013-07-22 13:52:08 +02:00
Thomas Müller 14daec98be Squashed commit of the following:
commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sun Jul 14 21:58:08 2013 +0200

    No admin option to enable public upload in case encryption is enabled
    No upload on pubic page if public upload is disabled

commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 21:34:38 2013 +0200

    change anonymous to public

commit c3bda8654d911383ae0acf9e41adda7117cb79f8
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:51:01 2013 +0200

    fixing Undefined index: publicUploadEnabled

commit 98861afde443c12a2ef5290c83c63fd12b7b196d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:05:58 2013 +0200

    in case the encryption app is enabled we cannot yet allow anonymous upload

commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:03:51 2013 +0200

    new admin setting added which allows to turn off anonymous uploads
2013-07-22 13:08:59 +02:00
Morris Jobke 57d94580e9 Merge pull request #4140 from sezuan/fix_wrong_found_http_code
changed HTTP FOUND code to the correct value 302
2013-07-21 01:33:47 -07:00
Matthias Rieber 6fbdf74c3e changed HTTP FOUND code to the correct value 302 2013-07-20 19:08:51 +02:00
Jan-Christoph Borchardt 6b0c35b20b deactivate show password toggle for IE
Conflicts:

	core/css/styles.css
2013-07-20 15:41:06 +02:00
Bart Visscher a0dc41c0ab Merge pull request #3778 from owncloud/fix_3528
LDAP: fix background job, resolves #3528
2013-07-19 09:36:19 -07:00
shkdee c2f3bcbaf0 Backport #3779, makes setuped backends are REALLY remembered and not instanciated many times 2013-07-19 18:09:36 +02:00
blizzz 6e4bb45809 Merge pull request #4072 from owncloud/non_ajax_upgrade_script
non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 404...
2013-07-18 13:31:57 -07:00
blizzz 8e3bd98264 Merge pull request #4047 from owncloud/backport_3617
Backport 3963
2013-07-18 13:30:07 -07:00
Thomas Mueller 2ad4af1651 fixing UNIX_TIMESTAMP() for mssql
Conflicts:
	lib/db.php
2013-07-17 23:07:18 +02:00
Arthur Schiwon 2d291f621f Add message about completed update 2013-07-17 17:32:43 +02:00
Arthur Schiwon 87547f8e0d Adjust to latest changes in PR #4047 2013-07-17 17:30:47 +02:00
Arthur Schiwon 5b18f2fc0e Rerename \OC\Updater to OC_Updater, fixes broken admin page 2013-07-17 17:23:08 +02:00
Markus Goetz 2fe849df9a WebDAV Auth Connector: Check if already logged in 2013-07-17 16:20:14 +02:00
rolandgeider 67ee9ae797 Use transifex.com on link to translations
Conflicts:
	settings/templates/personal.php
2013-07-16 00:56:12 +02:00
Arthur Schiwon 6a4221732d non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047. 2013-07-15 18:07:43 +02:00
Michael Gapczynski 810e718eb8 Only emit permissions hook for files and and include path
Conflicts:
	lib/public/share.php
2013-07-15 10:32:49 -04:00
Frank Karlitschek 3b95440e92 5.0.9 2013-07-14 13:36:22 +02:00
Thomas Müller 38eeddfc92 Merge pull request #4039 from owncloud/webdav_create_new_file
[webdav client] if the file doesn't exists; create a new one
2013-07-14 13:42:18 -07:00
Thomas Müller 528f870e09 Merge pull request #4044 from owncloud/more_ie8_fixes
More ie8 fixes
2013-07-14 13:10:46 -07:00
Frank Karlitschek 2309432310 Removed the preview warning. This is only a simple text change 2013-07-13 13:28:22 +02:00
Arthur Schiwon 9728192dc8 Stable5 adjustements (incl copy of lib/hooks/ from master) to make backport of #3963 work 2013-07-12 21:42:46 +02:00
Robin Appelman c767ac3f16 fix typo 2013-07-12 17:46:09 +02:00
Robin Appelman bd7d04cb44 backport: Updater: pass update url as argument to update check
Conflicts:
	lib/updater.php
2013-07-12 17:45:36 +02:00
Robin Appelman a9470181d5 backport: split upgrade logic from ajax file
Conflicts:
	core/ajax/update.php
	lib/updater.php
2013-07-12 17:44:43 +02:00
Victor Dubiniuk b37e25a9da IE8 Show delete icon 2013-07-12 17:51:20 +03:00
Victor Dubiniuk 267f1d1654 Some styling to user list 2013-07-12 17:29:08 +03:00
Victor Dubiniuk 52a6a3dc5d Ie8 specific multiselect 2013-07-12 17:13:50 +03:00
Björn Schießle 9f507ed642 if the file doesn't exists; create a new one. We use this to create new text files in the web interface 2013-07-12 13:25:37 +02:00
Björn Schießle 17a4cca5b7 Merge pull request #3859 from owncloud/versioning_improved_expire_function
call expire function before writing the new version to make sure to have...
2013-07-12 02:22:31 -07:00
Thomas Müller cdb9b9b0f9 Merge pull request #3965 from dphi/fix_2846
speedup for propfinds on shared folders
2013-07-12 02:00:14 -07:00
Thomas Müller d939619db3 Merge pull request #4014 from owncloud/fixing-4005-stable5
EventSource and update fixes
2013-07-11 14:00:31 -07:00
Thomas Müller 6ae1324673 Merge pull request #3984 from owncloud/enable_oci_testing_stable5
Enable oci testing stable5
2013-07-11 02:40:17 -07:00
Thomas Müller c89f231787 update.php: remove event type 'error' as it's unused
eventsource.js: fixing typos and JSDoc comment
2013-07-11 00:26:40 +02:00
Thomas Müller 2b2004b1a2 missing file 2013-07-11 00:04:43 +02:00
Thomas Müller 5e29f7d324 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:00:01 +02:00
Frank Karlitschek 7d7b7e6e63 5.0.8 2013-07-10 08:54:03 +02:00
Victor Dubiniuk 97d1b07445 Fallback to border instead of box-shadow 2013-07-09 15:43:02 +03:00
Victor Dubiniuk 0916bff81d Fix lazy styles loading in IE8 2013-07-09 15:42:47 +03:00
Jörn Friedrich Dreyer f773b91365 enable oci in autotest.sh 2013-07-09 12:53:10 +02:00
Bart Visscher f8ba6c77c8 Going from text to clob is not something we do.
Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html

Conflicts:
	tests/lib/dbschema.php
2013-07-09 12:45:55 +02:00
Bart Visscher 36491371c8 Merge pull request #3893 from owncloud/backport_1872
Backport #1872
2013-07-08 11:28:33 -07:00
Thomas Müller 2a41ff9204 Merge pull request #3970 from owncloud/backport-3946-stable5
Backport 3946 to stable5
2013-07-08 06:51:39 -07:00
Jörn Friedrich Dreyer 52226e6a71 Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes
Stable5 oracle testsuite fixes
2013-07-08 03:43:21 -07:00
Thomas Müller c14206e3f8 Squashed commit of the following:
commit 70e6ad56ed5d00aeea8fe82b45047998dac92f80
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sat Jul 6 00:11:42 2013 +0200

    fixing check if public share is a folder or not

commit 8e74ecec3f43a52a9a55871954171ef4073eab9d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sat Jul 6 00:04:01 2013 +0200

    removing unused getSharedItem()

commit 60ac0f274bbaa926dcec1800e952f2e0b1f05a50
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 17:39:41 2013 +0200

    on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function

    Conflicts:
    	apps/files/ajax/upload.php

commit f071f7439568ffd8b785cd96035cc2e616f61b01
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 11:30:53 2013 +0200

    fixing Notice: Undefined index: isPublic

commit d2f2c7e9b896fd0ac57fb8047501205fc37b2abc
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 09:58:41 2013 +0200

    handle anonymous upload to reshared folder
2013-07-08 11:55:22 +02:00
Björn Schießle 54a1239680 Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819

Conflicts:

	lib/config.php
2013-07-08 10:14:39 +02:00
Michael Gapczynski eb017b2666 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-07-06 21:34:38 +02:00
Michael Gapczynski 3244d23bcf Only retrieve the current user's permissions 2013-07-06 21:34:38 +02:00
Robin Appelman 918b1b77a2 Cache: provide a function to get the permissions of all files in a folder with one query
Conflicts:
	lib/files/view.php
2013-07-06 21:34:38 +02:00
Frank Karlitschek 16a3502cf1 5.0.8 RC 2013-07-05 17:06:34 +02:00
Thomas Müller b2cfa01e57 Backport of #3951 to stable5
Squashed commit of the following:

commit 46c1280e4f2ac61f0b3c5fed9d2a516cb000c009
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 13:45:21 2013 +0200

    proper fix for getting the shared item if no user is logged in

commit 99e32baec4464444a1a46ae47321e0378e367c3e
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 13:22:38 2013 +0200

    php 5.3 compliant now

commit 227e5f10016e362ed1302acb4426de391d4d9b4b
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 12:15:47 2013 +0200

    get the real physical folder name for anonymous upload
2013-07-05 23:47:18 +02:00
Thomas Müller 79558c26a0 Backport of #3948 to stable5 2013-07-05 23:35:23 +02:00
Thomas Mueller 2634eb33f1 for now we disable public upload in case encryption is enabled 2013-07-05 18:00:36 +02:00
Thomas Müller 9d2495c63f adding tipsy to the upload button showing the max upload and restoring client side upload size validation
Conflicts:
	apps/files_sharing/templates/public.php
2013-07-05 17:51:40 +02:00
Björn Schießle ba11ab92c7 remove unneeded bracket, was introduced by the last merge 2013-07-05 16:18:17 +02:00
Björn Schießle 133279714b added helper function to escape glob pattern
Conflicts:

	apps/files_encryption/lib/helper.php
2013-07-05 16:14:57 +02:00
Björn Schießle 2fa95cdebc fix getUidAndFilename() test 2013-07-05 16:13:47 +02:00
Björn Schießle 0cc1f6e70a only check for external mount points if the external storage app is enabled 2013-07-05 16:13:38 +02:00
Björn Schießle db51ffc553 make trash bin aware of system wide mounts with respect to encryption keys 2013-07-05 16:13:30 +02:00
Björn Schießle 5c5a8a0eba only escape glob pattern 2013-07-05 16:13:22 +02:00
Björn Schießle 7bc153a87a del share keys from correct location 2013-07-05 16:13:14 +02:00
Björn Schießle f535b57896 always return normalized path 2013-07-05 16:13:05 +02:00
Björn Schießle cbe97b5df2 delete file keys from the correct location 2013-07-05 16:12:54 +02:00
Björn Schießle c818115a4f handle rename correctly for system wide mounts 2013-07-05 16:12:46 +02:00
Björn Schießle ec1c769da3 move isSystemWideMountPoint() to util.php 2013-07-05 16:12:35 +02:00
Björn Schießle 2177001152 some performance improvements, check for system wide mounts only once while writing share keys 2013-07-05 16:12:22 +02:00
Björn Schießle a46a1eed6e fix path to OC_Mount_Config 2013-07-05 16:12:11 +02:00
Björn Schießle 3a2603e1fe handle system wide mount points 2013-07-05 16:11:59 +02:00
Jörn Friedrich Dreyer 126ab4ee11 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 15:41:16 +02:00
Thomas Müller b585e960e7 no anonymous upload on read-only folders 2013-07-05 12:20:02 +02:00
Victor Dubiniuk c60c76d03b Do not add groups if user has no groups 2013-07-04 21:55:25 +03:00
Georg Ehrke 6d1e2dc8c0 fix position of 'user shared the folder foldername with you' label 2013-07-04 20:17:27 +02:00
Jörn Friedrich Dreyer 4bf8a93fbd add correct check if table exists for oracle 2013-07-04 18:20:56 +02:00
Bart Visscher fc9e3c63f6 Oracle doesn't know & as bitwise AND
Conflicts:
	lib/public/share.php
2013-07-04 17:34:54 +02:00
Jörn Friedrich Dreyer 87e0a1f85c for oracle use BITAND() instead of & in sharing permissions sql 2013-07-04 17:34:43 +02:00
Jörn Friedrich Dreyer 6d70b64fab fix type of numeric columns 2013-07-04 17:08:50 +02:00
Jörn Friedrich Dreyer 9d33ed376d check item id is set 2013-07-04 17:08:33 +02:00
Jörn Friedrich Dreyer 07377ed431 stable5 does not have execute audited yet 2013-07-04 17:08:24 +02:00
Jörn Friedrich Dreyer 24fa167898 add missing backticks 2013-07-04 17:07:18 +02:00
Jörn Friedrich Dreyer 804eee87c9 manuall calculate unix_timestamp for oracle 2013-07-04 16:55:41 +02:00
Björn Schießle d01854fd75 more verbose error message 2013-07-04 16:35:14 +02:00
Björn Schießle 2dedc3aa57 improved error message 2013-07-04 16:35:06 +02:00
Thomas Müller b722f8bba3 no ?> at the end of a file
missing .

Conflicts:

	apps/files_encryption/files/error.php
2013-07-04 16:34:53 +02:00
Thomas Müller 4a67257c42 typo 2013-07-04 16:34:03 +02:00
Björn Schießle 8dd61163bc cast result to bool 2013-07-04 16:33:54 +02:00
Björn Schießle 0d36205083 fix error string 2013-07-04 16:33:43 +02:00
Björn Schießle f13ce01499 add correct php version 2013-07-04 16:33:33 +02:00
Björn Schießle d4c58027e0 check php version, the encryption app needs php >= 5.3.3
Conflicts:

	apps/files_encryption/appinfo/app.php
2013-07-04 16:33:20 +02:00
Jörn Friedrich Dreyer dbb2457d81 one if less 2013-07-04 16:13:39 +02:00
Jörn Friedrich Dreyer 1ed103f650 use assertEquals number of rows in db tests 2013-07-04 16:13:30 +02:00
Jörn Friedrich Dreyer b46c7fe872 fix numRows usage in files_encryption 2013-07-04 16:13:18 +02:00
Jörn Friedrich Dreyer 0fb1d3421f fix numRows usage in core lib 2013-07-04 16:13:09 +02:00
Jörn Friedrich Dreyer 42b0fa0c9f fix numRows usage in user_ldap
Conflicts:
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/helper.php
2013-07-04 16:12:49 +02:00
Jörn Friedrich Dreyer dc748f3ced make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query 2013-07-04 15:48:45 +02:00
Jörn Friedrich Dreyer a902e5048a Merge pull request #3931 from owncloud/backport_selectRange
Fixing renaming for stable5
2013-07-04 05:39:08 -07:00
Björn Schießle 72e6d915d4 Merge pull request #3921 from owncloud/init_default_strings
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 01:04:19 -07:00
Victor Dubiniuk 93430ec17e Add selectRange function 2013-07-04 00:24:43 +03:00
Björn Schießle 6857e87a82 eddition string should be empty by default 2013-07-03 17:10:17 +02:00
Björn Schießle c20653cedc add public api 2013-07-03 15:18:19 +02:00
Björn Schießle 7bc3edae0a move to non-static OC_Defaults 2013-07-03 14:21:51 +02:00
Björn Schießle f155826dc2 Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-03 12:38:20 +02:00
Robin Appelman d6f2fe6a6b Sabre: throw exceptions when delete/create/write operations are not permitted 2013-07-02 22:29:20 +02:00
Thomas Müller 9532859e4d use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set 2013-07-02 22:27:52 +02:00
Thomas Mueller 61c569c76a in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing 2013-07-02 22:27:52 +02:00
Thomas Müller 919c0b6248 Merge pull request #3905 from owncloud/emit_signals_for_part_files
Emit signals for part files
2013-07-02 13:12:17 -07:00
Björn Schießle 9a4f2f1318 add openssl_error_string() output to the owncloud.log 2013-07-02 16:59:13 +02:00
Björn Schießle c459a5cec2 fix function documentation 2013-07-02 16:28:40 +02:00
Björn Schießle a7b01ae74d introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-07-02 16:28:27 +02:00
Jörn Friedrich Dreyer 102a0415d4 Merge pull request #3909 from owncloud/stable5-anon-upload
Stable5 anon upload
2013-07-02 05:49:36 -07:00
Björn Schießle 3a2f662a0f improved error message 2013-07-02 10:11:17 +02:00
Victor Dubiniuk 73ac5c68a6 Use svg to png fallback on demand only 2013-07-01 23:12:22 +03:00
Victor Dubiniuk 511a806f4e Add fallback for svg app icons 2013-07-01 23:11:54 +03:00
Victor Dubiniuk bcb85ea79b Hide a ghost image on the apps management page 2013-07-01 23:11:36 +03:00
Robin Appelman 4dfc560419 fix detection of public upload in filelist.js 2013-07-01 19:41:47 +02:00
Robin Appelman 66773ac96b fix uploading when ['dirtoken'] is not set 2013-07-01 19:41:47 +02:00
Robin Appelman f7b64993b8 code style 2013-07-01 19:41:29 +02:00
Roman Geber fb83481936 Added file-upload to GIT repo
Optimized CSS identifiers
2013-07-01 19:38:33 +02:00
Roman Geber a987f9f4cf Public upload feature
Conflicts:
	apps/files/js/filelist.js
2013-07-01 19:38:15 +02:00
Jörn Friedrich Dreyer 9e5983c569 use css browser switch instead of deprecated jquery browser detection 2013-07-01 19:35:45 +02:00
Jörn Friedrich Dreyer 2a0a4ad0df '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-07-01 19:35:32 +02:00
Jörn Friedrich Dreyer a3862c43da use local variable to walk DOM only once 2013-07-01 19:35:22 +02:00
Jörn Friedrich Dreyer b9abc8002b use === to compare empty string '' 2013-07-01 19:35:11 +02:00
Jörn Friedrich Dreyer 0c10c4a15d don't update progress bar in ie < 10 2013-07-01 19:34:59 +02:00
Jörn Friedrich Dreyer f60a74e75f return created table row, use as context in fileupload events 2013-07-01 19:34:47 +02:00
Jörn Friedrich Dreyer b94272b8a3 refactor files.js, make proper use of fileupload events 2013-07-01 19:34:34 +02:00
Jörn Friedrich Dreyer 8f846006d3 return original filename to fileupload 2013-07-01 19:34:24 +02:00
Jörn Friedrich Dreyer 5cabb73337 Merge pull request #3802 from owncloud/stable5_backport_oracle_fixes
backport oracle related changes, mostly comments, but also setup related...
2013-07-01 08:53:33 -07:00
Björn Schießle c32b267a36 don't run hooks for .part files 2013-07-01 17:00:17 +02:00
Björn Schießle ef51a42522 if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal 2013-07-01 16:21:31 +02:00
Björn Schießle c421103ed5 Merge pull request #3863 from owncloud/improved_footer
Improved footer
2013-07-01 01:22:32 -07:00
Björn Schießle 1eae41e033 set default logo claim to '' 2013-07-01 10:22:05 +02:00
Thomas Müller 60173be25e Squashed commit of the following:
commit 557df5cc5e62fab80125d1ea86f8ed56ad3b10cc
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date:   Fri Jun 28 15:17:54 2013 +0200

    session_life_time -> session_lifetime
    default session_lifetime is 24hrs
    recreation of session is triggered at 50% of the session life time

    Conflicts:
    	lib/base.php

commit fcd2e91459ef2ff41d9ca3d07e325c358ded091a
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date:   Wed Jun 26 09:19:19 2013 +0200

    session life time is now configurable and set to the same value

    Conflicts:
    	lib/base.php
2013-07-01 00:05:06 +02:00
Lukas Reschke 87ef930587 Escape dropdown
Fixes #3241
2013-06-29 13:43:19 +02:00
herbrechtsmeier 65de4a0522 request.php: add type check to the not empty check of a string
The not equal comparison (<>) of a variable with an empty string
could lead to false positive results as the compare do not check
the type and thereby could not make sure that the checked variable
is a string. The usage of the not identical comparison operator
(!==) make sure that the variable is a string and not empty.
2013-06-28 21:06:36 +02:00
herbrechtsmeier 4df9a9aa65 Overwrite host and webroot when forcessl is enabled
This patch enables the use of forcessl together with a multiple domains
reverse SSL proxy (owncloud/core#1099) which have different hostname
and webroot for http and https access. The code assumes that the ssl
proxy (https) hostname and webroot is configured via overwritehost and
overwritewebroot.
2013-06-28 21:06:24 +02:00
Björn Schießle d80b2cdc42 fix array access and change variable names according to the coding style 2013-06-28 20:31:33 +02:00
Björn Schießle 8e3eff5549 continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota 2013-06-28 17:13:14 +02:00
Björn Schießle ee1a3ea0d8 fix some var names according to our style guide 2013-06-28 17:06:02 +02:00
Thomas Mueller 6d3349c85e PHP Strict standards: Non-static method OC_Defaults::themeExist() should not be called statically 2013-06-28 16:23:26 +02:00
Björn Schießle 6ae9af16f9 add logo claim to defaults.php 2013-06-28 10:06:57 +02:00
Björn Schießle 6a7efa3a47 logo claim added 2013-06-27 19:53:49 +02:00
Björn Schießle 49e86ed779 make mail footer aware of different themes 2013-06-27 18:28:53 +02:00
Björn Schießle f8374faa08 remove unneeded if condition 2013-06-27 16:28:45 +02:00
Björn Schießle 31d565131c lib/defaults.php should only contain the default strings and read the other strings directly from the theme 2013-06-27 16:24:03 +02:00
Björn Schießle 5ce718f0b1 adjust comments 2013-06-27 14:22:01 +02:00
Björn Schießle 84ad37ac9a fix typo in comment 2013-06-27 10:49:13 +02:00
Thomas Mueller 498bb50597 move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853 2013-06-26 18:59:37 +02:00
Björn Schießle 26cb6ba08c check for updates only in the community edition 2013-06-26 18:05:37 +02:00
Björn Schießle 3e3ed0784a construct the foother in defaults.php so that we use always the same footer 2013-06-26 17:56:19 +02:00
Björn Schießle e51a569e03 also expire versions on rename, to update the history more regularly 2013-06-26 16:28:23 +02:00
Björn Schießle ae89676af4 it is enough to call the expire function once 2013-06-26 16:24:46 +02:00
Markus Goetz 07a5914dc4 Fix ugly error style on install
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-06-25 16:27:07 +03:00
Björn Schießle 2f4cf6a585 call expire function before writing the new version to make sure to have enough free space 2013-06-25 09:39:01 +02:00
blizzz 38d702e3f8 Merge pull request #3816 from owncloud/fix_3815
LDAP: better check for emptiness, fixes #3815
2013-06-22 00:11:03 -07:00
blizzz a1e1456bdb Merge pull request #3814 from owncloud/fix-german-du-and-deine-stable5
In German we want uppercase 'Du' and 'Deine*'
2013-06-21 15:13:34 -07:00
Arthur Schiwon b52d765dbf LDAP: even better check for emptiness, fixes #3815 2013-06-21 23:58:44 +02:00
Arthur Schiwon 4f75a9cf1c Revert "LDAP: better check for emptiness, fixes #3815"
This reverts commit 4797f9d7db.
2013-06-21 23:58:27 +02:00
Arthur Schiwon 4797f9d7db LDAP: better check for emptiness, fixes #3815 2013-06-21 23:19:53 +02:00
Thomas Mueller 62f01a1239 In German we want uppercase 'Du' and 'Deine*' 2013-06-21 22:55:26 +02:00
Victor Dubiniuk 96e42ebff1 Replace display name only 2013-06-21 23:00:44 +03:00
Georg Ehrke fee313e256 improve error handling of webdavauth 2013-06-21 20:38:05 +02:00
Björn Schießle 437a79e2f9 encryption is LDAP compatible 2013-06-21 13:07:52 +02:00
Björn Schießle 2a26336080 check openssl dependency for the encryption app
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded

Conflicts:

	apps/files_encryption/appinfo/app.php
2013-06-21 10:43:22 +02:00
Jörn Friedrich Dreyer 761c7e9a51 backport oracle related changes, mostly comments, but also setup related fixes 2013-06-20 17:42:02 +02:00
Thomas Mueller ba7797e6a1 adding unit test for folder remove: testRemovedFolder() 2013-06-20 13:05:45 +02:00
Robin Appelman 7992953f1c remove deleted files when re-scanning a folder 2013-06-20 13:05:45 +02:00
Robin Appelman 4f99dcf699 use json to encode user list 2013-06-20 11:59:43 +02:00
Robin Appelman 850cde6ed4 allow scanning files for multiple users 2013-06-20 11:59:43 +02:00
Björn Schießle 8e5bc02e92 always have a defined return value 2013-06-20 11:14:54 +02:00
Björn Schießle 433cb9f01d some more error messages 2013-06-20 11:14:42 +02:00
Björn Schießle 41fa7ec791 add some more error messages, in case something went wrong 2013-06-20 11:14:27 +02:00
Björn Schießle 908c8fdc71 fixed enghlish sentence, thanks to @MTGap 2013-06-19 16:11:09 +02:00
Robin Appelman fa894beb5c fix updaters test cases 2013-06-19 13:33:32 +02:00
Robin Appelman b06432fef0 add tests for reusing existing data in scanner 2013-06-19 13:33:25 +02:00
Robin Appelman a498876aa6 reuse etag when doing a forced rescan 2013-06-19 13:33:18 +02:00
Robin Appelman 90acda6c06 scanner: give more percision about what data is reused during scanning 2013-06-19 13:33:09 +02:00
Robin Appelman 663c30ede0 split of scanning the childs of a folder 2013-06-19 13:32:58 +02:00
Jan-Christoph Borchardt 5e06b068ce hide the logo claim in case the theme is not loaded 2013-06-19 12:58:31 +02:00
Björn Schießle c72e3ca442 Merge pull request #3770 from owncloud/fix_theme_loading
getTheme() should also return the default theme if a empty theme is set in the config.php
2013-06-19 02:54:56 -07:00
Robin Appelman 9700b84a62 Fix OC_User::getDisplaynames when using numeric user id's
fixes #2948
2013-06-19 00:19:53 +03:00
Frank Karlitschek 87f70d643e Merge pull request #3771 from owncloud/fix_lost_password_page
fix lost password page
2013-06-18 14:06:00 -07:00
Arthur Schiwon f01e568046 LDAP: fix background job, resolves #3528 2013-06-18 20:03:59 +02:00
Björn Schießle 96983c2ad0 fix lost password page, don't show checkbox is encryption is not enabled 2013-06-18 11:43:11 +02:00
Björn Schießle cf51be0fa8 use default value when we try to retrieve the theme from the config 2013-06-18 11:18:31 +02:00
Björn Schießle 07b1e677a6 also use the default theme if the theme is set to an empty string in the config.php 2013-06-18 10:57:37 +02:00
Björn Schießle 592656c699 don't normalize absolute local path 2013-06-17 15:39:56 +02:00
Björn Schießle 1fead354b2 only escape glob pattern
Conflicts:

	apps/files_trashbin/lib/trash.php
2013-06-17 15:39:43 +02:00
Björn Schießle 52d1797b30 Merge pull request #3753 from owncloud/fix_translation_link
fix link to translation
2013-06-17 03:56:43 -07:00
Björn Schießle 1171a5a2e0 fix link to translation, bug was introduced by https://github.com/owncloud/core/commit/ca7699c8bdb85df9b69e3639f53d1b959287ba16#settings/templates/personal.php 2013-06-17 11:48:23 +02:00
Jörn Friedrich Dreyer 112f9f055b Merge pull request #3725 from owncloud/oracle_stable5
Oracle stable5
2013-06-14 07:07:49 -07:00
Jörn Friedrich Dreyer b6e664c445 don't use sequence suffix, MDB2 handles that internally 2013-06-14 13:43:50 +02:00
Thomas Mueller f5b1f598ea Squashed commit of the following:
commit 85043af59846edd54b6f402829a698142fdb412f
Author: Michael Gapczynski <mtgap@owncloud.com>
Date:   Sat May 25 11:25:43 2013 -0400

    Clear opcode caches after writing to the config file, fixes #3372

commit e96ca0a217112a612e5018fb06115879be634f0b
Author: Michael Gapczynski <mtgap@owncloud.com>
Date:   Fri May 17 11:15:53 2013 -0400

    Add undefined verision variables

commit d7faeea0b8a79bcd84255120e396280fe62c8aa1
Author: Michael Gapczynski <mtgap@owncloud.com>
Date:   Tue May 14 09:34:01 2013 -0400

    Turn off theme before update

commit f620df4e88201a8d35ecb6173f258d5e5f67c7f9
Author: Bart Visscher <bartv@thisnet.nl>
Date:   Tue Apr 16 08:07:44 2013 +0200

    Also check for needed upgrade in the Sabre Maintenance connector

commit 223cfce8c89663beb95cf7438f47cea4bac6e0de
Author: Bart Visscher <bartv@thisnet.nl>
Date:   Tue Apr 9 21:05:11 2013 +0200

    Connect watcher failure function to the failure signal

commit 49b9a1e8af062c03ebc863e1139ca310944b784a
Author: Bart Visscher <bartv@thisnet.nl>
Date:   Tue Apr 9 20:51:43 2013 +0200

    Move start of the maintenance mode to the ajax call

    Make sure the update page is shown in a browser. And not an ajax request
2013-06-14 13:34:01 +02:00
Jörn Friedrich Dreyer 1099960e55 cleanup codestyle 2013-06-14 13:17:15 +02:00
Jörn Friedrich Dreyer d6878f5551 use to_char only for oracle, whitespace 2013-06-14 13:16:02 +02:00
Jörn Friedrich Dreyer be534fecf4 oracle fixes, missing backticks, LIMIT to param
Conflicts:
	lib/files/cache/cache.php
2013-06-14 13:13:29 +02:00
Jörn Friedrich Dreyer 61c89874cd allow install when only oracle is available 2013-06-14 13:08:05 +02:00
Jörn Friedrich Dreyer fb33c01a8f convert LIMIT to parameter 2013-06-14 13:06:13 +02:00
Jörn Friedrich Dreyer 715648e79d fix fetchRow checks to also work with MDB2 2013-06-14 13:05:33 +02:00
Jörn Friedrich Dreyer 2d876c2bf5 add missing backticks all over the place
Conflicts:
	apps/files_encryption/lib/util.php
	lib/files/cache/backgroundwatcher.php
	lib/files/cache/cache.php
2013-06-14 13:04:23 +02:00
Jörn Friedrich Dreyer 3903977166 shorten table identifiers in tests 2013-06-14 12:50:49 +02:00
Jörn Friedrich Dreyer fe2ef4bcc4 db structure, allow null in columns for '' values 2013-06-14 12:49:23 +02:00
Thomas Mueller 28d8ed9726 Squashed commit of the following:
commit 1c7d5da4d1687183f8701336fc14636f61095f4e
Author: infoneo <infoneo@yahoo.pl>
Date:   Sat Jun 8 19:44:58 2013 +0300

    Update mapper.php

commit 37f1f034f776b084ac7e25be136ce64b5772a446
Author: infoneo <infoneo@yahoo.pl>
Date:   Sat Jun 8 18:39:25 2013 +0300

    Update mapper.php

    Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).

commit 4a5f872f1f55941d07992d7ac5e8f8b74ec8febc
Author: infoneo <infoneo@yahoo.pl>
Date:   Sun May 12 15:22:57 2013 +0300

    Fixed problems with a dots in a filenames

commit bc17f958349e36c1caacfc9263ae1de2df8e6a76
Author: infoneo <infoneo@yahoo.pl>
Date:   Sun May 12 01:47:48 2013 +0200

    Dots in a filenames fix
2013-06-14 11:19:13 +02:00
Florin Peter d7528a9b9f fix for path_hash not unique as reported at #3641 2013-06-14 10:40:44 +02:00
Florin Peter 1d956b1faf fix memory problems as reported at #3620 2013-06-14 10:40:33 +02:00
Björn Schießle 5efbf25c2a improved footer 2013-06-13 16:40:04 +02:00
Björn Schießle d8a55da9b6 add logo-claim 2013-06-13 16:39:51 +02:00
Björn Schießle ca7699c8bd don't show translation hints in enterprise edition
Conflicts:

	settings/templates/personal.php
2013-06-13 16:39:40 +02:00
Jan-Christoph Borchardt 5572e1dc11 move common settings footer fieldset out of conditional 2013-06-13 16:38:18 +02:00
Björn Schießle 43146a68cf short explanation about OC_Defaults 2013-06-13 16:38:09 +02:00
Björn Schießle 89191a9c1f make pub link share footer aware of different owncloud editions 2013-06-13 16:37:58 +02:00
Björn Schießle 68229009ac make main menu aware of the different owncloud editions 2013-06-13 16:37:48 +02:00
Björn Schießle 22394d5855 add default doc url 2013-06-13 16:37:30 +02:00
Björn Schießle ae2615e74d make footer and urls aware of ownCloud editions 2013-06-13 16:37:14 +02:00
Björn Schießle 939bc3e71c keep all strings in one place to make it easier to change them 2013-06-13 16:37:02 +02:00
Björn Schießle 7e556475f8 make footer aware of ownCloud editions 2013-06-13 16:36:51 +02:00
Björn Schießle a74ece336d mage page title aware of ownCloud edition
Conflicts:

	core/templates/layout.user.php
2013-06-13 16:36:36 +02:00
Björn Schießle aa16518f66 only check for recovery key if someone else than the user wants to change the password
Conflicts:

	settings/ajax/changepassword.php
2013-06-13 14:02:19 +02:00
Björn Schießle 56a0b7a71a add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set 2013-06-13 13:45:40 +02:00
Björn Schießle af23fa9863 print a warning if a user wants to reset his password and encryption is enabled
Conflicts:

	core/lostpassword/templates/lostpassword.php
2013-06-13 13:45:30 +02:00
Björn Schießle ac77c2f98c allow to press enter to update the password 2013-06-13 13:43:44 +02:00
Björn Schießle fef186e7dc tell the user what he can do to regain access to his files 2013-06-13 13:43:32 +02:00
Björn Schießle c062322d0f only show personal settings if the recovery feature is enabled or if no private key is set 2013-06-13 13:43:17 +02:00
Florin Peter 03907da05b improved error msg and removed duplicate string 2013-06-13 13:43:08 +02:00
Björn Schießle bea81bcc69 improved label for the password recovery feature 2013-06-13 13:42:52 +02:00
Björn Schießle 76db8c0506 link directly to the encryption settings 2013-06-13 13:42:42 +02:00
Florin Peter f637118008 better handling for http post 2013-06-13 13:40:44 +02:00
Florin Peter e65ff413e2 changed redirect handling 2013-06-13 13:40:27 +02:00
Florin Peter 4e2ff14cda fixed typo 2013-06-13 13:40:13 +02:00
Florin Peter 5d7aa761bc fix password change when files_encryption app is disabled
Conflicts:

	settings/ajax/changepassword.php
2013-06-13 13:39:54 +02:00
Florin Peter 86a1a7ea53 reformat code
Conflicts:

	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
2013-06-13 13:32:52 +02:00
Björn Schießle 380a402699 use generated private key fro m setUp() 2013-06-13 13:26:59 +02:00
Björn Schießle 7a5c4fd092 added test for decryptPrivateKey() 2013-06-13 13:26:48 +02:00
Björn Schießle fe9a9c3264 let user update private key password in case it was changed from outside, e.g. external auth back-ends 2013-06-13 13:26:33 +02:00
Björn Schießle 30b00f4bc1 $session->setPrivateKey expects only one parameter 2013-06-13 13:26:18 +02:00
Björn Schießle 1d38e244fd control files are no longer needed, remove them from the tests 2013-06-13 13:26:05 +02:00
Björn Schießle b3d87def99 introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
Conflicts:

	apps/files_encryption/lib/session.php
2013-06-13 13:25:50 +02:00
Florin Peter 1914353c49 code optimized and cleaned up unused vars 2013-06-13 13:24:06 +02:00
Florin Peter d45bddc035 allow the user to login but do not allow upload and show error message on the web
Conflicts:

	apps/files_encryption/appinfo/app.php
2013-06-13 13:23:32 +02:00
Florin Peter d33b215b21 check if the decrypted private key is valid on login and on read/write files 2013-06-13 13:22:10 +02:00
Florin Peter 64cb67c6d7 cleanup unused method legacyKeyRecryptKeyfile 2013-06-13 13:00:44 +02:00
Florin Peter 9620f0df98 normalize path to prevent following split to fail 2013-06-13 13:00:06 +02:00
Florin Peter a7017167bc fix legacy key in until test 2013-06-13 12:59:40 +02:00
Florin Peter 1fb9a5126f fix re-encrypt legacy files
Conflicts:

	apps/files_encryption/lib/util.php
2013-06-13 12:59:06 +02:00
Florin Peter 514e47f57e use legacyDecrypt to decrypt key file like the previous files_encryption 2013-06-13 12:57:26 +02:00
Florin Peter 49b4d8e3f0 fix for autoloader while user logged in and system is in maintenance
Conflicts:

	apps/files_encryption/appinfo/app.php
2013-06-13 12:57:07 +02:00
Björn Schießle 07fb6a0d57 add comment to explain the helper function 2013-06-13 12:37:57 +02:00
Björn Schießle 301b0f1b77 fix typo in var name 2013-06-13 12:37:38 +02:00
Björn Schießle 8c07eddc65 use number of manipulated rows as idicator if it was possible to enter the migration mode
Conflicts:

	apps/files_encryption/lib/util.php
2013-06-13 12:37:12 +02:00
Björn Schießle 1d5c9d84fd adapt test to the code changes 2013-06-13 12:33:45 +02:00
Björn Schießle 76bb5a4ba7 use constants for different migration status 2013-06-13 12:33:17 +02:00
Björn Schießle 7252d09dd2 make sure that only one process can enter the migration mode 2013-06-13 12:32:58 +02:00
Jan-Christoph Borchardt 33afa9a253 move storage bar below clients showcase to make it more visible 2013-06-12 18:18:44 +02:00
Björn Schießle 2d5f97ef2e Merge branch 'stable5' of github.com:owncloud/core into stable5 2013-06-12 14:11:17 +02:00
Björn Schießle 4b50145617 disable proxys during ssl root cert upload to avoid encryption 2013-06-12 14:10:14 +02:00
Thomas Müller 1fa76e53dc Merge pull request #3470 from owncloud/fix_ssl_root_certs
fix deletion of ssl root certificates
2013-06-11 14:15:05 -07:00
Björn Schießle 243b7d82d4 IE doesn't like class as keyword, add quotation marks 2013-06-11 23:07:33 +02:00
Björn Schießle ec80dd5e3a use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened 2013-06-10 11:12:55 +02:00
Björn Schießle d3a663469a add hint about what the recovery password field is for 2013-06-10 11:12:12 +02:00
Michael Gapczynski 1b39f46cc2 Backport #2919 2013-06-07 09:42:52 -04:00
Björn Schießle 07c3f08e66 remove html entities since this seems to be a problem only on my system 2013-06-06 14:19:09 +02:00
Frank Karlitschek e35303f702 5.0.7 2013-06-06 10:13:32 +02:00
blizzz 68960db77e Merge pull request #3584 from owncloud/fix_ldap_port
LDAP: append port when URL is passed in LDAP Host configuration, fixes #...
2013-06-04 01:31:52 -07:00
Arthur Schiwon 03e5982026 LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 2013-06-03 23:07:32 +02:00
Frank Karlitschek 9046c65af5 5.0.7 RC 2013-06-02 23:02:52 +02:00
Arthur Schiwon f3620b7c03 LDAP: sqlite compatibility for emptyiing tables 2013-05-31 21:18:39 +02:00
Arthur Schiwon 7b95d031a1 LDAP: fix possible recursion 2013-05-31 20:13:33 +02:00
Arthur Schiwon 78520cdfc7 Backport bfa7157 2013-05-31 20:13:22 +02:00
Florin Peter 1ef101c439 also fix login errors while filesystem is not loaded in app.php 2013-05-31 20:06:43 +02:00
Florin Peter a1401f686a fix login errors while filesystem is not loaded 2013-05-31 20:06:33 +02:00
Florin Peter 5eded27fa3 added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp' 2013-05-31 12:28:45 +02:00
Florin Peter 7c9b34a416 prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations 2013-05-31 12:28:40 +02:00
Florin Peter 6e3acd3111 fix share and un-share for single file 2013-05-31 12:28:29 +02:00
Florin Peter aed15ef72b fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files 2013-05-31 12:28:22 +02:00
Florin Peter 5353bcc246 fixes for pgsql 2013-05-31 12:28:12 +02:00
Florin Peter 2e5fcf4d56 changed deprecated class 2013-05-31 12:28:06 +02:00
Florin Peter 4dac837046 fixed typo 2013-05-31 12:28:00 +02:00
Florin Peter 512571c54f fixes if cache returns false 2013-05-31 12:27:55 +02:00
Florin Peter 0fa0e92883 fix $parent/$source typo 2013-05-31 12:27:49 +02:00
Florin Peter 8e80aa3630 backport of #3527 2013-05-31 12:27:38 +02:00
Björn Schießle 15e0fc6b7f fix indention 2013-05-31 12:24:44 +02:00
Björn Schießle 6d667c02fc remove unnecessary variable 2013-05-31 12:24:36 +02:00
Björn Schießle 8e512bdfdf use public API for error handling; improved while condition 2013-05-31 12:24:26 +02:00
Björn Schießle a5b75d348f for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists 2013-05-31 12:24:21 +02:00
Björn Schießle ae2ab015d9 if one public link share was found, we don't have to check it for the other folders 2013-05-31 12:24:15 +02:00
Björn Schießle a8c3d51a49 check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages 2013-05-31 12:24:08 +02:00
Florin Peter f9c9cceb30 fixed if fopen returns false typically on external storage 2013-05-31 12:23:25 +02:00
blizzz acff4fc4fa Merge pull request #3543 from owncloud/fix_ldap_alternateintname
Fix ldap alternateintname
2013-05-30 07:54:48 -07:00
Arthur Schiwon deeb1cfd50 Merge branch 'stable5' into fix_ldap_alternateintname 2013-05-30 14:15:38 +02:00
Arthur Schiwon 955eff8d87 LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links 2013-05-30 14:14:43 +02:00
Morris Jobke 1b4d2e851d Merge pull request #3526 from owncloud/fix_ldap_doc_url
LDAP: fix help (doc) URL. Old one works, but leads to an outdated versio...
2013-05-30 04:16:10 -07:00
Florin Peter 1c49784f7f backport #3507 2013-05-30 00:40:30 +02:00
Michael Gapczynski 9a25f7b849 Organize conditionals in a better order 2013-05-29 13:25:19 -04:00
Michael Gapczynski 71cdd17df4 Only update metadata that has changed 2013-05-29 13:25:04 -04:00
Michael Gapczynski 3891a4cef9 Style fixes 2013-05-29 17:22:06 +02:00
Robin Appelman 0017753ec5 Cache mimetype icons 2013-05-29 17:22:00 +02:00
Arthur Schiwon a4ef49c2be LDAP: fix help (doc) URL. Old one works, but leads to an outdated version 2013-05-29 14:07:47 +02:00
zafi 621d18f77d The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
so it should only be visible for users with a supporting backend.
2013-05-28 13:17:07 +02:00
Florin Peter 0c5bd4e578 fix for undefined index 2013-05-28 10:56:48 +02:00
Florin Peter 54768402b6 fix for losing private key while being logged in and accessing a public link 2013-05-28 10:56:41 +02:00
Björn Schießle 7316d6f850 Merge pull request #3504 from owncloud/fix_enc_migration
fix migration old encryption -> new encryption
2013-05-27 08:29:58 -07:00
Florin Peter daf5d47821 backport of #3495 2013-05-27 17:19:48 +02:00
Georg Ehrke c872042616 fix https://github.com/owncloud/core/issues/3320 2013-05-27 17:07:45 +02:00
Georg Ehrke 0cf6e5693a add event.preventDefault to undelete function 2013-05-27 17:07:39 +02:00
Björn Schießle 9ac29cd122 Merge branch 'stable5' into fix_enc_migration 2013-05-27 14:28:26 +02:00
Florin Peter 55e4e054d6 added users for tests
reformat code to meet coding guidelines
2013-05-27 14:20:24 +02:00
Florin Peter 3cbe6b2d8b improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-27 14:20:18 +02:00
Björn Schießle 087b21c913 legacyBlockDecryprt() needs to be public 2013-05-27 13:47:03 +02:00
Björn Schießle 09765ea27c make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 12:21:39 +02:00
Björn Schießle 189d251c6a fix migration from old to new encryption 2013-05-27 12:02:27 +02:00
Roland Hager 07fb230cbe Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users. 2013-05-25 14:19:11 -04:00
Bart Visscher faad2d0d69 Add check for Magic Quotes 2013-05-25 14:06:40 -04:00
Arthur Schiwon c7d8cd9679 Merge branch 'backport_ldap_configurable_username_n_uuid' into stable5 2013-05-25 14:07:38 +02:00
Frank Karlitschek 6c53253ad6 preview of stable5 including the new encryption app 2013-05-25 12:12:07 +02:00
Frank Karlitschek 2018e94b41 increase version and add warning 2013-05-25 12:07:16 +02:00
Björn Schießle e044260bc1 Merge pull request #3484 from owncloud/files_encryption_stable5
file encryption app backport master -> stable5
2013-05-24 14:09:50 -07:00
Florin Peter 12f5b5ce61 improved trashbin test again 2013-05-24 22:01:27 +02:00
Florin Peter 210ae9e5f7 improved trashbin test 2013-05-24 21:35:18 +02:00
Florin Peter f164f43590 added files_encryption tests at first position 2013-05-24 20:04:51 +02:00
Florin Peter 9a25c39c36 fixed missing directory creation in files_trashbin 2013-05-24 20:04:21 +02:00
Björn Schießle 397dc3dcde fix first time encryption after app was enabled 2013-05-24 20:02:41 +02:00
Björn Schießle 8c235de826 no use the recoveryPassword var instead of accessing the POST array 2013-05-24 20:00:29 +02:00
Florin Peter e7734d0c46 Merge branch 'stable5' into files_encryption_stable5 2013-05-24 19:40:23 +02:00
Florin Peter 1a638cd3a8 backport of #3271 2013-05-24 19:37:28 +02:00
Björn Schießle 890b7702ef port css for recovery passwd input to stable5 2013-05-24 18:04:23 +02:00
Björn Schießle a4018ad4d7 handle recovery password 2013-05-24 17:57:39 +02:00
Björn Schießle c6dc7993b6 enable files_encryption for testing 2013-05-24 14:59:12 +02:00
Björn Schießle 7b8f64d20f remove unneeded hooks 2013-05-24 14:54:47 +02:00
Björn Schießle cb12cf8324 increase ownCloud version number to upgrade file cache table 2013-05-24 13:44:05 +02:00
Björn Schießle 3bd0141e6d backport file cache changes from master to stable5, needed for encryption app 2013-05-24 13:40:37 +02:00
Björn Schießle 89546bf90c add post hooks to share API, needed by the encryption app 2013-05-24 13:26:03 +02:00
Björn Schießle c960cfcd55 add post hooks to share API, needed by the encryption app 2013-05-24 13:15:51 +02:00
Björn Schießle a99676a73e backport trashbin: enable trashbin to handle encryption keys 2013-05-24 13:04:31 +02:00
Björn Schießle 8fa5f35e4f backport changes to share.php to enable the encryption app to get all users with access to a given file 2013-05-24 12:45:30 +02:00
Björn Schießle c4b40af602 backport: enable admin to recover encrypted files 2013-05-24 12:42:08 +02:00
Björn Schießle 1c3ced26c1 add new files encryption app 2013-05-24 12:08:40 +02:00
Björn Schießle 33520c2985 move old files_encryption out of the way 2013-05-24 12:05:13 +02:00
Björn Schießle 365c77c52c fix var naming 2013-05-24 10:21:48 +02:00
Michael Gapczynski 0eb32bfc93 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 20:43:08 -04:00
Michael Gapczynski ae98c50b16 Remove user name addition to paths in deleteAll 2013-05-23 20:42:59 -04:00
Michael Gapczynski c528fbb9bb Add data-dir attribute to home breadcrumb 2013-05-23 20:42:44 -04:00
Michael Gapczynski 0e4d45a56d Fix undefined variable for copying empty folders 2013-05-23 20:42:23 -04:00
Michael Gapczynski a55a92752a Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
Conflicts:
	lib/files/cache/scanner.php
2013-05-23 20:40:13 -04:00
Björn Schießle df39e681b5 remove debug output 2013-05-23 16:16:17 +02:00
Björn Schießle 2ed0d6e1dc fix deletion of ssl root certificates 2013-05-23 16:13:48 +02:00
Michael Gapczynski 34fda272d6 RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 18:21:39 -04:00
Robin Appelman 412f0962e7 Have the filecache updater testcase clean the filesystem properly 2013-05-22 15:04:39 -04:00
Jörn Friedrich Dreyer 74e475cf2d cleanup after people who don't test in ie 2013-05-20 13:00:32 +02:00
Robin Appelman 1291f36709 Set storage id for openstack swift backend 2013-05-17 18:26:57 -04:00
Michael Gapczynski 1284179589 Initialize collectionTypes variable as false 2013-05-17 15:29:38 +02:00
Florin Peter 75fd96878a only connect share hooks if installation OC is installed 2013-05-17 10:56:59 +02:00
Thomas Tanghus f6dac667fd Add Compound property to avoid double escaping values. 2013-05-16 16:59:37 +02:00
Thomas Tanghus 197914480e StringProperty unittest 2013-05-16 16:58:50 +02:00
Thomas Tanghus 3a6181620a Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762 2013-05-16 16:58:28 +02:00
Arthur Schiwon 41aef94c24 LDAP: fix display of numerical display names 2013-05-16 14:48:02 +02:00
Arthur Schiwon 0e3e3d15a1 LDAP: Implement clear mappings functionality 2013-05-16 14:47:52 +02:00
Arthur Schiwon 6573fdc717 LDAP: implement UUID and internal username override 2013-05-16 14:47:00 +02:00
Arthur Schiwon 0e2c3dc89e LDAP: better variable name 2013-05-16 14:46:53 +02:00
Arthur Schiwon 34c8fd5149 LDAP: implement r+w for new settings 2013-05-16 14:46:45 +02:00
Arthur Schiwon 55332fe1bb LDAP: add settings for UUID override 2013-05-16 14:46:39 +02:00
Arthur Schiwon 57339b725e LDAP: prepare settings for internal username attribute and clearing user mappings 2013-05-16 14:46:33 +02:00
Arthur Schiwon c8d63e3c79 LDAP: Coypright info 2013-05-16 14:46:25 +02:00
Thomas Tanghus 7a1992a170 Merge pull request #3355 from owncloud/filepicker_escape_names
Escape file names and types in filepicker.
2013-05-15 05:08:58 -07:00
Thomas Tanghus 752a316a52 Escape file names and types in filepicker. 2013-05-15 01:31:53 +02:00
Björn Schießle 408aed3175 Merge pull request #3350 from owncloud/fix_history_template
fix history template, print_unescaped() needs to include closing tags
2013-05-14 12:18:16 -07:00
Björn Schießle 1282c33db4 fix history template, print_unescaped() needs to include closing tags 2013-05-14 20:06:53 +02:00
Björn Schießle 256e53ba68 touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly; backport of https://github.com/owncloud/core/pull/3303 2013-05-14 11:34:40 +02:00
Frank Karlitschek 2020f35c6a 5.0.6 2013-05-14 08:14:24 +02:00
Frank Karlitschek cc495ed6d8 backport https://github.com/owncloud/core/pull/3329 2013-05-13 03:23:07 +02:00
Lukas Reschke f2911e76bc Add requesttoken to guest view
Should fix #3321
2013-05-13 14:54:18 +02:00
Frank Karlitschek 726350ea97 5.0.6 RC2 2013-05-12 23:59:31 +02:00
Lukas Reschke 9a53d50e16 Merge pull request #3290 from owncloud/config-data
Move config data to template
2013-05-12 11:41:42 +02:00
Jörn Friedrich Dreyer bc767f1899 don't emit rename hooks on partial file renames 2013-05-10 15:19:02 +02:00
Jörn Friedrich Dreyer 35b1f40ba4 rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted 2013-05-10 15:18:57 +02:00
Björn Schießle a23e8833c3 Merge pull request #3282 from owncloud/fix_etag_update
Fix etag update
2013-05-08 13:58:24 -07:00
Björn Schießle 8875bae0c3 don't call correctFolder() in touchHook, it will be called later in the writeUpdate() 2013-05-08 22:57:08 +02:00
Robin Appelman 144977352d Cache: only look for child entires when doing a move operation when moving a folder 2013-05-08 22:35:38 +02:00
Björn Schießle 35da6f25b1 rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 16:32:29 +02:00
Björn Schießle c43ec33ecb update etag for for the touched file 2013-05-08 15:49:45 +02:00
Björn Schießle 08561da5b6 touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 15:05:03 +02:00
Bart Visscher d6fe8f213d Merge pull request #3141 from owncloud/fix_2553
Cache: mount user mountpoints to make sure that $data/$user/ exists before accessi...
2013-05-08 05:05:21 -07:00
Morris Jobke dd8c1f7759 Merge pull request #3244 from owncloud/allow_set_quota_to_zero
allow to set quota to zero, issue #2696
2013-05-07 01:37:10 -07:00
Björn Schießle 7ff26af107 allow to set quota to zero, issue #2696 2013-05-06 11:43:50 +02:00
blizzz 44fedae69f Merge pull request #3143 from owncloud/ldap_guid_check
LDAP: do not reset UUID attribute setting when guid is detected
2013-05-06 01:16:32 -07:00
Frank Karlitschek ffb91cdd66 5.0.6 RC 2013-05-05 23:35:20 +02:00
Lukas Reschke 1dfb757593 Merge pull request #3245 from owncloud/use-$view
Use the internal ownCloud view
2013-05-06 18:23:58 +02:00
Michael Gapczynski c0047b9079 Fix #2816 renaming shared files 2013-05-06 11:40:55 -04:00
Arthur Schiwon 0d5c82cd2a LDAP: cachekey in set method needs to match with that one from get 2013-05-03 16:05:46 +02:00
Bernhard Posselt e3c7386be4 respect format output 2013-05-03 15:39:51 +02:00
Bernhard Posselt 5db33b47c2 logout before output to not run into header already sent problems 2013-05-03 15:39:45 +02:00
Bernhard Posselt 6c26143516 fix bug that would only return error responses for 3rdparty apps 2013-05-03 15:39:35 +02:00
Robin Appelman 9c605c3fd1 Dont task external storages with creating their own root 2013-05-03 15:11:56 +02:00
Arthur Schiwon 0639634782 LDAP: remove restriction from group names to be in line with core behaviour again 2013-05-03 15:07:10 +02:00
blizzz 7d5b8e85ac Merge pull request #3197 from owncloud/fix_userlist
Fix retrieval of users with multiple backends
2013-05-03 04:48:51 -07:00
Arthur Schiwon c99b667021 Fix retrieval of users with multiple backends 2013-04-30 19:51:28 +02:00
Lukas Reschke c08c22aa54 It's a class 2013-04-29 14:28:49 +02:00
Lukas Reschke cbd216414a Remove uneeded onclick handler 2013-04-29 14:28:43 +02:00
Lukas Reschke 5428086204 Move onclick handler 2013-04-29 14:28:33 +02:00
Robin Appelman b38a1adf2d Files: Fix XSS when creating dropshadow 2013-04-28 19:33:54 +02:00
Tom Needham a5978ad544 Correct the api response when both a shipped app and/or a third party app fail 2013-04-28 11:56:31 +01:00
Tom Needham b24e6f11ba Fix typo 2013-04-28 11:53:30 +01:00
Tom Needham d642480c55 Code style for ocs/routes.php 2013-04-28 11:53:23 +01:00
Tom Needham 556ea61f8e Change app identifier for core api routes 2013-04-28 11:53:17 +01:00
Tom Needham 3bcd10a97c Use correct variable when checking auth 2013-04-28 11:53:08 +01:00
Arthur Schiwon 54a3038dc0 Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location 2013-04-26 22:14:38 +02:00
Arthur Schiwon a6ece109ba LDAP: do not reset UUID attribute setting when guid is detected 2013-04-26 15:02:05 +02:00
Arthur Schiwon 4c008a8f92 Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374 2013-04-26 13:20:12 +02:00
Morris Jobke 2030037301 modify password clone to password type right on submit to prevent the browser remind the content 2013-04-26 11:05:07 +02:00
Morris Jobke 794ed99927 turn off autocompletion for password field
refs #2632
2013-04-26 11:04:54 +02:00
Morris Jobke 65c7746504 Merge pull request #3115 from owncloud/backport-3109-stable5-2
backport #3109 to stable5 - changed *.po and *.pot have been ignored
2013-04-25 01:51:38 -07:00
Jenkins for ownCloud faa51bd002 backport #3109 to stable5 - changed *.po and *.pot have been ignored 2013-04-24 22:37:41 +02:00
Robin Appelman d9f10e2c26 Files: fix the order fileactions are computed for a file 2013-04-24 19:58:43 +02:00
Morris Jobke 8d92aaf3b7 fix wrong shared icon description
fix #2928

translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 17:51:50 +02:00
Lukas Reschke 9894145f8d Allow loading of external media ressources 2013-04-24 17:20:00 +02:00
Florian Scholz deba972093 - xframe restriction configurable now 2013-04-24 17:02:58 +02:00
Daniel Molkentin 41dc1fee68 Merge pull request #3100 from owncloud/ensure_index_php
Fix for #3049(cherry picked from commit ff6fb0906b)
2013-04-24 16:23:21 +02:00
Bernhard Posselt 72ea678c0e use variable instead of relative path to file 2013-04-24 16:12:23 +02:00
Bernhard Posselt ff49824312 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 16:12:10 +02:00
Lukas Reschke bb3d39f728 Disallow URLs containing a @ 2013-04-23 21:24:05 +02:00
Robin Appelman a7f1269f92 Files: also check if the source path is valid when doing a rename or copy operation 2013-04-23 21:13:29 +02:00
Arthur Schiwon 7ae0e38c4f LDAP: reset user/group-config association only after exists-check, may performance in some cases 2013-04-23 19:20:54 +02:00
Thomas Tanghus b626e514f7 Merge pull request #3076 from owncloud/manually_backport_insertIfNotExist
Backport #2567 OC_DB:insertIfNotExist()
2013-04-22 13:48:55 -07:00
Thomas Tanghus 3e8beddfe3 Backport #2567 2013-04-22 21:12:30 +02:00
Jan-Christoph Borchardt 18d515450a remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px 2013-04-22 16:17:22 +02:00
Jan-Christoph Borchardt 969bcb3ced make textarea inherit ownCloud font instead of using monospace 2013-04-22 16:16:52 +02:00
Bart Visscher 1d255ebf70 No need to strip slashes, json_decode handles that for us 2013-04-19 15:08:46 +02:00
Frank Karlitschek 9aae21db79 5.0.5 2013-04-10 02:14:16 +02:00
Jan-Christoph Borchardt 536117da2a apply navigation hover effect directly to img and span, cleaner code 2013-04-18 10:03:14 +02:00
Brice Maron 29054c27c9 Warn when we do an upgrade 2013-04-17 22:03:05 +02:00
Jan-Christoph Borchardt 207bf4bffe additional comments 2013-04-17 19:44:20 +02:00
Jan-Christoph Borchardt 4e11814a0c fix navigation hover effect, documentation 2013-04-17 19:44:07 +02:00
Thomas Tanghus 32667f8c38 Remove not null constraint. Fix #2976 2013-04-17 19:18:17 +02:00
Thomas Müller 1c06bec262 Merge pull request #2967 from Mirodin/patch-6
Update de_DE.php
2013-04-17 02:29:34 -07:00
Thomas Müller a82965edf2 Merge pull request #2965 from Mirodin/patch-5
Update de.php
2013-04-17 02:29:02 -07:00
Mirodin 76f12567be Update de_DE.php 2013-04-17 11:54:56 +03:00
Mirodin d7cbf45d15 Update de.php
Fixed a translation issue
2013-04-17 11:53:17 +03:00
Bart Visscher 05a2f31352 Merge pull request #2960 from owncloud/always_load_file_cache_hooks_first_stable5
always connect file cache updater hooks first
2013-04-17 00:32:45 -07:00
Jörn Friedrich Dreyer 811d649262 always connect file cache updater hooks first 2013-04-17 08:21:33 +02:00
Frank Karlitschek 6e32fc1db7 Merge pull request #2945 from owncloud/improved_quota_calc
Improved free space calculation for trash and versions
2013-04-16 19:55:32 -07:00
Björn Schießle e718a728c4 adapt free space calculation to the way it is done for the trash bin 2013-04-16 13:52:46 +02:00
Björn Schießle a065ae5db2 improved free space calculation if no quota is set, discussed in #2936 2013-04-16 13:51:53 +02:00
Bernhard Posselt 623db8549e also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly 2013-04-15 21:07:50 +02:00
Jan-Christoph Borchardt 16ef7c62dc Merge pull request #2931 from owncloud/info_message_trash_bin
write a info message to the log if a file gets removed from the trash bin automatically
2013-04-15 11:16:43 -07:00
Björn Schießle 0978ebd195 add explenation of the expire function to the apps description 2013-04-15 11:42:50 +02:00
Björn Schießle 1ddfefed3f write a info message to the log if a file gets removed from the trash bin automatically 2013-04-15 10:34:38 +02:00
Arthur Schiwon 16b62c697f allow Storages to join MountPoint initialization 2013-04-15 10:28:14 +02:00
Jan-Christoph Borchardt f70b1c1b0d add .disabled class so it can be used for simple a buttons as well 2013-04-14 22:07:07 +02:00
raghunayyar b400c29944 Add span tag while enabling or disbling apps as well. 2013-04-13 20:08:25 +05:30
Lukas Reschke 86d8b831f2 Add a name to the version parameter
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
2013-04-13 15:49:15 +02:00
Thomas Mueller 5fbb8b374d more accurate safe_mode check - refs #2258 2013-04-13 01:16:45 +02:00
Bernhard Posselt 0a3e87c890 used oc version 5.0.3 2013-04-13 01:15:35 +02:00
Bernhard Posselt 2220802cdd added yet another test for the verion compare check due to mail 2013-04-13 01:15:35 +02:00
Jan-Christoph Borchardt 0ff7aa4436 add styles for disabled input fields 2013-04-12 19:14:09 +02:00
Jan-Christoph Borchardt 5e817584db use proper sans-serif font-stack 2013-04-12 19:10:20 +02:00
Bernhard Posselt fbcb4b2673 Merge pull request #2899 from owncloud/stable5-backport-buttonfix
dont overwrite background image when hovering over button
2013-04-12 09:44:13 -07:00
Bernhard Posselt edae196f34 dont overwrite background image when hovering over button 2013-04-12 15:41:37 +02:00
Bernhard Posselt 11dcc29c0c Merge pull request #2867 from owncloud/cleanup_after_delUser
Cleanup database after del user
2013-04-11 05:00:44 -07:00
Björn Schießle d068325bdb cleanup the trash bin tables in the database after a user was deleted 2013-04-11 12:37:52 +02:00
Björn Schießle 6dc66e14fb remove used space for versions from db is a user was deleted 2013-04-11 12:36:08 +02:00
raghunayyar 30d5c70180 Using max-width instead of width for filename. 2013-04-11 13:55:31 +05:30
raghunayyar e9c3caeb9b Adds a fixed width to the filename to prevent horizontal scroll. 2013-04-11 13:55:11 +05:30
raghunayyar 9a0344f1d5 The Opacity for the navigation loads fine for icon and App name. 2013-04-11 11:00:35 +05:30
raghunayyar 33b27362ff Long Application Names are ellipsis correctly. 2013-04-11 10:59:46 +05:30
Frank Karlitschek 15c50017cc 5.0.5 RC1 2013-04-09 20:04:37 +02:00
Frank Karlitschek c43e33cdf5 5.0.4 2013-04-09 18:01:26 +02:00
Robin Appelman ef1481c7bb Fix touch for creating new files 2013-04-10 14:52:56 +02:00
Robin Appelman 892d85556b Add the quota change listeners to newly added user entries in the user list 2013-04-10 14:50:42 +02:00
Frank Karlitschek 5fb891e20a Merge pull request #2828 from owncloud/trashbin_fixes
Trashbin fixes
2013-04-10 01:07:17 -07:00
Frank Karlitschek c241985f04 5.0.4 RC 2013-04-09 16:59:03 +02:00
Lukas Reschke 9a4fe09979 Use a more random source... 2013-04-10 00:15:44 +02:00
Bart Visscher e26cdc4cdd Suppress the notice from the nullbyte check 2013-04-09 22:20:48 +02:00
Björn Schießle 317b00988a size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage. 2013-04-09 15:27:19 +02:00
Thomas Mueller 9159d55639 fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-09 15:23:35 +02:00
Thomas Mueller 06ab314c15 fixes #2125 - the warning is now displayed with a disabled button 2013-04-09 15:18:19 +02:00
Björn Schießle f26a4e0b80 only add filesize to trashbin size if the file was moved to the trash bin successfully 2013-04-09 15:16:15 +02:00
Robin Appelman 2c3d66c776 Users: fix "Other.." quota option for the default quota 2013-04-09 15:15:08 +02:00
Frank Karlitschek aef66e06b3 Merge pull request #2818 from owncloud/fix_versioncheck
fix versioning check
2013-04-09 05:35:46 -07:00
kondou 67a84ad487 Fix #2730
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 14:20:23 +02:00
Frank Karlitschek 440148aa1f fix versioning check 2013-04-09 13:13:52 +02:00
OpenLarry b35148bbb6 fixes #2679 2013-04-09 13:02:35 +02:00
Lukas Reschke 5ef8762886 Merge pull request #2786 from owncloud/disable-archive-app
manually disable archive app for stable5 to fix upgrade problems
2013-04-09 03:04:46 -07:00
Thomas Mueller b52666567a fixes #2792 - only touch if writable 2013-04-09 10:52:06 +02:00
Bernhard Posselt 1e580bf04b manually disable archive app for stable5 to fix upgrade problems 2013-04-08 15:53:43 +02:00
Bart Visscher 2a5599b3e0 Merge pull request #2614 from eMerzh/fix_internet_check
Improve internet connection check with proxy
2013-04-06 09:50:40 -07:00
Bernhard Posselt f82799cf7d Merge pull request #2741 from owncloud/fix_2650
Make FileCache upgrade more robust, fixes #2650
2013-04-05 12:22:59 -07:00
root e6d286b449 Proper CSS comment
CSS comments don't work like that.
2013-04-05 17:13:17 +02:00
Arthur Schiwon dc3a7e09af Make FileCache upgrade more robust, fixes #2650 2013-04-05 11:27:08 +02:00
Lukas Reschke 5add001373 Unescape the update hint
Backport of 8000f9db74ef2890cac74a34132c2550e4be6f11, fixes #2676
2013-04-05 00:41:08 +03:00
Bernhard Posselt 5317e7071e Merge pull request #2680 from owncloud/fix_2666
PostgreSQL compatibility, fixes #2666
2013-04-03 13:06:40 -07:00
Arthur Schiwon f5592cc88e Typo, fixes #2690 2013-04-03 20:06:33 +02:00
Arthur Schiwon 09f11c2679 PostreSQL compatibility, fixes #2666 2013-04-03 13:04:38 +02:00
Frank Karlitschek db48f5302a 5.0.3 2013-04-03 00:53:09 +02:00
Bernhard Posselt 4cd4bbd489 Merge pull request #2665 from owncloud/backport-2275-app-styles
manually backport #2275 app styles to stable
2013-04-02 14:24:00 -07:00
Bernhard Posselt 7b42c20180 Merge pull request #2595 from owncloud/fix_part_file_ignoring_stable5
Fix part file ignoring stable5
2013-04-02 14:01:17 -07:00
Jan-Christoph Borchardt 835df6c177 manually backport #2275 app styles to stable 2013-04-02 22:20:46 +02:00
root 5268aadb62 Backport PR #2622 2013-04-02 21:13:09 +02:00
Frank Karlitschek d7dccfb648 5.0.3 RC1 2013-04-02 19:14:24 +02:00
Frank Karlitschek cc204a608a Merge pull request #2656 from owncloud/fix_2642
fix upgrade error for instances not upgraded from 4.5
2013-04-02 09:34:29 -07:00
Arthur Schiwon 22c8194cc8 fix upgrade error for instances not upgraded from 4.5 2013-04-02 16:25:12 +02:00
Frank Karlitschek 8231f657d9 Merge pull request #2641 from owncloud/fix_2612
Key must use less then 767 bytes long
2013-04-02 02:58:57 -07:00
Arthur Schiwon 4f9f5a41b1 Key must use less then 767 bytes long 2013-04-02 11:29:41 +02:00
Frank Karlitschek 5944ee6ebe 5.0.2 2013-04-02 11:23:47 +02:00
VicDeo e1b6574ce7 Merge pull request #2625 from owncloud/fix_namespace_in_autoloader_stable5
Fix namespace in autoloader stable5
2013-03-31 06:10:47 -07:00
VicDeo c16860e648 Remove space before parethesis 2013-03-31 16:51:54 +04:00
Lukas Reschke d4a492d321 Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack 2013-03-31 16:51:29 +04:00
Lukas Reschke a004266b7c Check if the installed PHP version has a fix for the nullbyte vulnerability 2013-03-31 16:51:12 +04:00
Thomas Mueller da96d1adb0 some basic unit test for loading classes 2013-03-31 16:50:29 +04:00
VicDeo ed39e47c9d Remove leading and trailing backslashes in classname. Ref #2310 2013-03-31 16:49:43 +04:00
Thomas Tanghus b9213cf451 User list: Keep array of available groups. Should fix #873 2013-03-29 20:45:35 +01:00
Brice Maron f308b0e321 Improve internet connection check with proxy 2013-03-29 15:37:39 +00:00
Thomas Mueller eeebf21fce fixes #1463 - file size is now displayed correctly in IE8 2013-03-29 13:50:53 +01:00
Thomas Mueller 75d944f96a fixes #1461 2013-03-29 13:50:53 +01:00
Jörn Friedrich Dreyer 9bfdfdf071 supress write hook for .part files 2013-03-28 12:21:00 +01:00
Jörn Friedrich Dreyer 2bb22d3aab ignore files in scanFile instead of scan to catch all occurences.
Conflicts:
	lib/files/cache/scanner.php
2013-03-28 12:21:00 +01:00
blizzz 4742d0eb94 Merge pull request #2602 from owncloud/fix_share_with_displayname
Fix share with displayname
2013-03-27 14:54:16 -07:00
Arthur Schiwon c901709d53 Whitespaces 2013-03-27 21:18:19 +01:00
Arthur Schiwon 84bc4c175a Share Dialog: show Displayname instead of internal name 2013-03-27 21:17:58 +01:00
blizzz 4d50a21eb4 Merge pull request #2558 from owncloud/fix_cache_upgrade
Fix cache upgrade
2013-03-27 11:10:22 -07:00
blizzz 37971133f1 Merge pull request #2596 from owncloud/fix_files_external_displayname
Files External: show display names instead of internal user names in Set...
2013-03-27 11:06:49 -07:00
blizzz c962f9db47 Merge pull request #2593 from owncloud/fix_userlist_append_displayname
Users: use DisplayName in the Display Name col when appending users
2013-03-27 10:47:52 -07:00
Jan-Christoph Borchardt 6333036a1a Merge pull request #2599 from owncloud/backport-2515-nav-scrollbar
Backport 2515 nav scrollbar
2013-03-27 09:19:06 -07:00
yannickoo 73758c1f78 Fixed typo 2013-03-27 17:13:06 +01:00
yannickoo 7e9e94d8d7 No Scrolling for more than approximately 10 Applications 2013-03-27 17:13:04 +01:00
Arthur Schiwon 07d0245336 Files External: show display names instead of internal user names in Settings UI 2013-03-27 14:33:35 +01:00
Arthur Schiwon 0bbac66ec5 Users: use DisplayName in the Display Name col when appending users 2013-03-27 14:05:00 +01:00
Arthur Schiwon 4411de0dbf Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy 2013-03-26 23:42:00 +01:00
Thomas Mueller 871bbbba8a prevent to fire delete ajax a second time.
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 22:56:42 +01:00
Arthur Schiwon 4384cf70da Cache: Do not overwrite ETag when file did not change 2013-03-26 16:03:40 +01:00
Thomas Müller e0cf61dfc8 Merge pull request #2272 from owncloud/fix_json_encoded_pubic_download_oc5
let public link download handle json encoded file lists [oc5]
2013-03-26 01:55:40 -07:00
Björn Schießle 2387fbd9dd Merge pull request #2562 from owncloud/update_mtime_after_sync
listen to touch hook to update the mtime after sync
2013-03-26 01:41:41 -07:00
Arthur Schiwon 0b6b5e807c Only prepare an SQL statement once. 2013-03-25 21:46:50 +01:00
Arthur Schiwon b2b78228d6 Add PHPDoc 2013-03-25 21:45:55 +01:00
Arthur Schiwon 2e5829445f Adjust to Icewind's fix 2013-03-25 21:45:10 +01:00
Robin Appelman e63a12a481 Cache: fix property path for getting legacy etag 2013-03-25 21:43:51 +01:00
Robin Appelman 56302ff9cf Port Icewind's fix I 2013-03-25 21:43:49 +01:00
Arthur Schiwon 707de3e644 Add Index to properties table for better performance on upgrade 2013-03-25 17:54:45 +01:00
Arthur Schiwon 19a65f6c3f Change LIMIT in DB query respectively remove where not necessary 2013-03-25 17:54:10 +01:00
Björn Schießle 011ab3a11c listen to touch hook to update the mtime after sync 2013-03-25 16:26:17 +01:00
Arthur Schiwon ad62d89f2b Remove Debug output 2013-03-25 14:23:46 +01:00
Jörn Friedrich Dreyer 9b84c50f15 Merge pull request #2533 from owncloud/fix_sharing_updater
fix shared updated for rename action
2013-03-25 05:13:57 -07:00
Thomas Müller 01ffa519d5 Fixing author and copyright 2013-03-24 19:17:56 +01:00
Thomas Mueller fe73b5919d some more test cases & fix on file name generation with index 2013-03-24 19:17:56 +01:00
Thomas Mueller 5ad7eb080e adding extension to slugified physical path 2013-03-24 19:17:55 +01:00
Thomas Müller 2ce8329503 Merge pull request #2531 from Mirodin/patch-5
Update de.php
2013-03-24 11:14:33 -07:00
Thomas Müller 83e5383912 Merge pull request #2532 from Mirodin/patch-6
Update de_DE.php
2013-03-24 11:13:25 -07:00
Bernhard Posselt 660d204cbf Merge pull request #2525 from owncloud/fix_db_queries
add backticks around table names
2013-03-23 05:39:01 -07:00
Bernhard Posselt d091db4bc7 Merge pull request #2474 from owncloud/fix_2299
skip update if the recipient is the same user as the owner
2013-03-23 05:35:50 -07:00
Bernhard Posselt d61e820285 Merge pull request #2538 from eMerzh/improve_pbm_detect
Improve detection of installations errors
2013-03-23 05:31:19 -07:00
Brice Maron 85613cc66c Improve detection of installations errors 2013-03-23 12:19:43 +01:00
Arthur Schiwon 0fb9cc3c25 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-22 23:33:40 +01:00
Björn Schießle 76e5ffaa92 the old path no longer exists after rename, update the parent folder instead 2013-03-22 16:20:40 +01:00
Mirodin 9a26b1e0a6 Update de_DE.php
Fixed some translation issues
2013-03-22 15:33:52 +01:00
Mirodin bfd69dc8e0 Update de.php
Fixed some translation issues
2013-03-22 15:28:20 +01:00
Arthur Schiwon 0d075df15e Performance: prepare queries only once 2013-03-22 13:36:31 +01:00
Arthur Schiwon c82f43ee55 Fix lost ETag on Cache Upgrade 2013-03-22 13:23:43 +01:00
Björn Schießle 0eaf141528 add backticks around table names 2013-03-22 12:47:43 +01:00
Arthur Schiwon ee0dab1b13 LDAP: fix wrong return value 2013-03-20 13:17:40 +01:00
Björn Schießle 98ee292c93 fix indention 2013-03-20 12:58:39 +01:00
Björn Schießle 4ff5658475 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-20 12:45:24 +01:00
Thomas Mueller 7de540b8ee using rtrim 2013-03-19 17:00:48 +01:00
Thomas Mueller 9a41453254 fixes #2081 2013-03-19 17:00:35 +01:00
Jörn Friedrich Dreyer 707b319157 Merge pull request #2449 from owncloud/fix_npe
fix npe when createStorage() returns null
2013-03-19 07:48:54 -07:00
Bernhard Posselt f7911412e0 Merge pull request #2444 from owncloud/fix_ldap_issues
Fix ldap issues
2013-03-19 06:20:33 -07:00
Jörn Friedrich Dreyer 1cb3872df0 fix npe when createStorage() returns null 2013-03-19 14:18:44 +01:00
Arthur Schiwon 432fb55d91 LDAP: specify appid when selecting from appconfig 2013-03-19 13:39:52 +01:00
Arthur Schiwon 98c5d10bb5 LDAP: remove unnecessary func call, was a leftover from earlier refactor 2013-03-19 13:29:09 +01:00
Thomas Tanghus 84a2be1aad Backport #2440 js parameter. 2013-03-19 13:13:11 +01:00
Thomas Tanghus 9e383db75b User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 12:59:32 +01:00
Arthur Schiwon c12b30f7a2 LDAP: check first whether group exists in this backend before doing other operations 2013-03-19 11:52:35 +01:00
Arthur Schiwon 5bf111e75f LDAP: check whether user exists for before trying to determine displayname 2013-03-19 11:16:57 +01:00
Arthur Schiwon f42d98edab LDAP: avoid irritating log output 2013-03-19 00:23:59 +01:00
Arthur Schiwon d392aa81c7 LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup. 2013-03-19 00:23:35 +01:00
Frank Karlitschek 532e5463db backport https://github.com/owncloud/core/pull/2411 2013-03-17 22:17:24 +01:00
Robin Appelman cfea3ce2d7 Cache: better rename hook for cache updater 2013-03-17 14:16:13 +01:00
Robin Appelman 2c76ee1c8b Close sessions when doing background jobs 2013-03-17 02:25:21 +01:00
Michael Gapczynski 9a2c1cbcc3 Merge pull request #2384 from owncloud/error-handling-upgrade-backport
Backport add error handling to the file cache upgrade
2013-03-16 13:17:01 -07:00
Michael Gapczynski e6616ed758 Add error handling to the file cache upgrade 2013-03-16 15:22:27 -04:00
Ceri Davies b51b41468d Correct emails when folders are shared.
itemType is never "dir"; it's either "file" or "folder".
2013-03-15 12:43:22 +01:00
Frank Karlitschek 6f86802a48 Merge pull request #2348 from owncloud/fix_version_db_query
Fix db query in versions app, add backticks
2013-03-15 03:37:35 -07:00
Björn Schießle 0c6c175d62 remove backticks around table names 2013-03-15 11:24:13 +01:00
Brice Maron 885b81ba23 Add backtick for trash app to prevent pg errors 2013-03-15 11:19:02 +01:00
Björn Schießle fc86815a2c add backtick for db queries to prevent postgresql errors 2013-03-15 11:06:51 +01:00
Björn Schießle 6ca2abc108 create new version if the same file is uploaded again over the web interface, approved in #2317 2013-03-15 10:47:19 +01:00
Björn Schießle 0fe2f81a0c create new version if the same file is uploaded again over the web interface 2013-03-15 10:44:27 +01:00
Bernhard Posselt 2cd52e52c8 Merge pull request #2294 from owncloud/use_display_name_in_mail
use display name as sender for private link mails
2013-03-14 05:22:45 -07:00
Björn Schießle d06fec658c use display name as sender for private link mails 2013-03-14 11:48:04 +01:00
Bernhard Posselt 049329588f Merge pull request #2276 from owncloud/fix_sharing_hooks_oc5
listen to the pre delete hook in the sharing app [oc5]
2013-03-13 10:16:14 -07:00
Jörn Friedrich Dreyer 09d3b9ef26 Merge pull request #2278 from owncloud/fix_2267_master
use OC_DB instead of MDB2
2013-03-13 10:09:39 -07:00
Björn Schießle 92ce2bf89b fix for #2267, use OC_DB instead of MDB2 2013-03-13 16:51:41 +01:00
Björn Schießle ca93f6e1de don't show share action for the Shared folder, approved pull request #2265 2013-03-13 16:26:20 +01:00
Björn Schießle d166471a46 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:36:02 +01:00
Björn Schießle 896c56996e let public link download handle json encoded file lists 2013-03-13 11:40:46 +01:00
Arthur Schiwon 6017ca5ddd LDAP: compatibility with Novell eDirectory UUID 2013-03-12 20:16:09 +01:00
Thomas Mueller eedc1e76db enable UTF-8 charset on mssql
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
2013-03-12 20:01:40 +01:00
Thomas Mueller 510cbc4ff9 write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( 2013-03-12 20:01:40 +01:00
Thomas Mueller 9b9497bedf fixing various filesystem/storage unit tests on windows
fixing copy operation on mapper
2013-03-12 19:57:56 +01:00
Thomas Mueller 8846edd919 skip archive tests for now 2013-03-12 19:57:42 +01:00
Thomas Mueller 253f7ec932 adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 19:57:28 +01:00
Thomas Mueller 8bafcd1414 slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 19:56:44 +01:00
Thomas Mueller 40bb805b83 indexed slug should be created based on logic path 2013-03-12 19:56:33 +01:00
icewind1991 00030a6c24 Merge pull request #2248 from otetard/bugfix/fix-public-link-file-sharing
Fix file sharing via public link for one particular file.
2013-03-12 11:49:08 -07:00
Olivier Tétard 2afece459a Fix file sharing via public link for one particular file.
Fix OC_Files::get() to not return the first character of the filename
if only one file is requested.
2013-03-12 11:53:41 +01:00
9276 changed files with 373221 additions and 1102167 deletions
-3
View File
@@ -1,3 +0,0 @@
{
"directory": "core/vendor"
}
-12
View File
@@ -1,12 +0,0 @@
codecov:
branch: master
coverage:
precision: 2
round: down
range: "70...100"
status:
project: off
patch: off
comment: off
-699
View File
@@ -1,699 +0,0 @@
clone:
git:
image: plugins/git
depth: 1
pipeline:
jsunit:
image: nextcloudci/jsunit:jsunit-5
commands:
- ./autotest-js.sh
- curl -o codecov.sh https://codecov.io/bash
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
when:
matrix:
TESTS: jsunit
checkers:
image: nextcloudci/php7.0:php7.0-16
commands:
- ./autotest-checkers.sh
when:
matrix:
TESTS: checkers
syntax-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php5.6
syntax-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php7.0
syntax-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php7.1
litmus-v1:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/litmus-v1/script.sh
when:
matrix:
TESTS: litmus-v1
litmus-v2:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/litmus-v2/script.sh
when:
matrix:
TESTS: litmus-v2
caldavtester-new-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/caldav/install.sh
- bash apps/dav/tests/travis/caldav/script-new-endpoint.sh
when:
matrix:
TESTS: caldavtester-new-endpoint
caldavtester-old-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/caldav/install.sh
- bash apps/dav/tests/travis/caldav/script-old-endpoint.sh
when:
matrix:
TESTS: caldavtester-old-endpoint
carddavtester-new-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/carddav/install.sh
- bash apps/dav/tests/travis/carddav/script-new-endpoint.sh
when:
matrix:
TESTS: carddavtester-new-endpoint
carddavtester-old-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/carddav/install.sh
- bash apps/dav/tests/travis/carddav/script-old-endpoint.sh
when:
matrix:
TESTS: carddavtester-old-endpoint
sqlite-php7.0-samba-native:
image: nextcloudci/samba-native-php7.0:samba-native-php7.0-3
commands:
- smbd -D -FS &
- ./autotest-external.sh sqlite smb-linux
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-samba-native
sqlite-php7.0-samba-non-native:
image: nextcloudci/samba-non-native-php7.0:samba-non-native-php7.0-4
commands:
- smbd -D -FS &
- ./autotest-external.sh sqlite smb-linux
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-samba-non-native
sqlite-php7.0-webdav-apache:
image: nextcloudci/webdav-apache-php7.0
commands:
- apache2
- ./autotest-external.sh sqlite webdav-apachedrone
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-webdav-apache
nodb-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
matrix:
DB: NODB
PHP: 5.6
nodb-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
matrix:
DB: NODB
PHP: "7.0"
nodb-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
matrix:
DB: NODB
PHP: 7.1
sqlite-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 5.6
sqlite-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: "7.0"
sqlite-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 7.1
mysql-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql
PHP: 5.6
postgres-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
when:
matrix:
DB: postgres
PHP: 5.6
mysqlmb4-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
matrix:
DB: mysqlmb4
PHP: 5.6
integration-capabilities_features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh capabilities_features/capabilities.feature
when:
matrix:
TESTS: integration-capabilities_features
integration-federation_features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh federation_features/federated.feature
when:
matrix:
TESTS: integration-federation_features
integration-auth:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/auth.feature
when:
matrix:
TESTS: integration-auth
integration-maintenance-mode:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/maintenance-mode.feature
when:
matrix:
TESTS: integration-maintenance-mode
integration-ratelimiting:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ config:system:set redis host --value=cache
- ./occ config:system:set redis port --value=6379 --type=integer
- ./occ config:system:set redis timeout --value=0 --type=integer
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
- ./occ app:enable testing
- cd build/integration
- ./run.sh features/ratelimiting.feature
when:
matrix:
TESTS: integration-ratelimiting
integration-carddav:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/carddav.feature
when:
matrix:
TESTS: integration-carddav
integration-dav-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/dav-v2.feature
when:
matrix:
TESTS: integration-dav-v2
integration-ocs-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/ocs-v1.feature
when:
matrix:
TESTS: integration-ocs-v1
integration-sharing-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/sharing-v1.feature
when:
matrix:
TESTS: integration-sharing-v1
integration-sharing-v1-part2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/sharing-v1-part2.feature
when:
matrix:
TESTS: integration-sharing-v1-part2
integration-sharing-v1-part3:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/sharing-v1-part3.feature
when:
matrix:
TESTS: integration-sharing-v1-part3
integration-checksums-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/checksums.feature
when:
matrix:
TESTS: integration-checksums
integration-external-storage:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/external-storage.feature
when:
matrix:
TESTS: integration-external-storage
integration-provisioning-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/provisioning-v1.feature
when:
matrix:
TESTS: integration-provisioning-v1
integration-tags:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/tags.feature
when:
matrix:
TESTS: integration-tags
integration-caldav:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/caldav.feature
when:
matrix:
TESTS: integration-caldav
integration-comments:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/comments.feature
when:
matrix:
TESTS: integration-comments
integration-favorites:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/favorites.feature
when:
matrix:
TESTS: integration-favorites
integration-provisioning-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/provisioning-v2.feature
when:
matrix:
TESTS: integration-provisioning-v2
integration-webdav-related:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/webdav-related.feature
when:
matrix:
TESTS: integration-webdav-related
integration-sharees-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh sharees_features/sharees.feature
when:
matrix:
TESTS: integration-sharees-features
integration-sharees-v2-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh sharees_features/sharees_provisioningapiv2.feature
when:
matrix:
TESTS: integration-sharees-v2-features
integration-setup-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- cd build/integration
- ./run.sh setup_features/setup.feature
when:
matrix:
TESTS: integration-setup-features
integration-filesdrop-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh filesdrop_features/filesdrop.feature
when:
matrix:
TESTS: integration-filesdrop-features
integration-transfer-ownership-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/transfer-ownership.feature
when:
matrix:
TESTS: integration-transfer-ownership-features
integration-ldap-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ app:enable user_ldap
- cd build/integration
- ./run.sh ldap_features/ldap-ocs.feature
when:
matrix:
TESTS: integration-ldap-features
integration-trashbin:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/trashbin.feature
when:
matrix:
TESTS: integration-trashbin
acceptance-access-levels:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
when:
matrix:
TESTS-ACCEPTANCE: access-levels
acceptance-app-files:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
when:
matrix:
TESTS-ACCEPTANCE: app-files
acceptance-app-theming:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature
when:
matrix:
TESTS-ACCEPTANCE: app-theming
acceptance-login:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
when:
matrix:
TESTS-ACCEPTANCE: login
nodb-codecov:
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=NODB ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS: nodb-codecov
db-codecov:
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=QUICKDB ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS: db-codecov
object-store:
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=PRIMARY-${OBJECT_STORE} ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS: object-store
memcache-memcached:
image: nextcloudci/php7.0-memcached:php7.0-memcached-8
commands:
- phpenmod xdebug
- service memcached restart
- ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TEST: memcache-memcached
memcache-redis-cluster:
image: nextcloudci/php7.0:php7.0-17
commands:
- phpenmod xdebug
- sleep 20
- ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TEST: memcache-redis-cluster
matrix:
include:
- TESTS: checkers
- TESTS: nodb-codecov
ENABLE_REDIS: true
- TESTS: db-codecov
ENABLE_REDIS: true
- TESTS: integration-capabilities_features
- TESTS: integration-federation_features
- TESTS: integration-maintenance-mode
- TESTS: integration-ratelimiting
ENABLE_REDIS: true
- TESTS: integration-auth
- TESTS: integration-carddav
- TESTS: integration-dav-v2
- TESTS: integration-ocs-v1
- TESTS: integration-sharing-v1
- TESTS: integration-sharing-v1-part2
- TESTS: integration-sharing-v1-part3
- TESTS: integration-checksums
- TESTS: integration-external-storage
- TESTS: integration-provisioning-v1
- TESTS: integration-tags
- TESTS: integration-caldav
- TESTS: integration-comments
- TESTS: integration-favorites
- TESTS: integration-provisioning-v2
- TESTS: integration-webdav-related
- TESTS: integration-sharees-features
- TESTS: integration-sharees-v2-features
- TESTS: integration-setup-features
- TESTS: integration-filesdrop-features
- TESTS: integration-transfer-ownership-features
- TESTS: integration-ldap-features
- TESTS: integration-trashbin
- TESTS: acceptance
TESTS-ACCEPTANCE: access-levels
- TESTS: acceptance
TESTS-ACCEPTANCE: app-files
- TESTS: acceptance
TESTS-ACCEPTANCE: app-theming
- TESTS: acceptance
TESTS-ACCEPTANCE: login
- TESTS: jsunit
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
- TESTS: syntax-php7.1
- TESTS: litmus-v1
- TESTS: litmus-v2
- TESTS: caldavtester-old-endpoint
- TESTS: caldavtester-new-endpoint
- TESTS: carddavtester-new-endpoint
- TESTS: carddavtester-old-endpoint
- TESTS: object-store
OBJECT_STORE: s3
- TESTS: sqlite-php7.0-samba-native
- TESTS: sqlite-php7.0-samba-non-native
- TEST: memcache-memcached
- TEST: memcache-redis-cluster
ENABLE_REDIS_CLUSTER: true
- TESTS: sqlite-php7.0-webdav-apache
ENABLE_REDIS: true
- DB: NODB
PHP: 5.6
ENABLE_REDIS: true
- DB: NODB
PHP: 7.0
ENABLE_REDIS: true
- DB: NODB
PHP: 7.1
ENABLE_REDIS: true
- DB: sqlite
PHP: 5.6
ENABLE_REDIS: true
- DB: sqlite
PHP: 7.0
ENABLE_REDIS: true
- DB: sqlite
PHP: 7.1
ENABLE_REDIS: true
- DB: mysql
PHP: 5.6
ENABLE_REDIS: true
- DB: postgres
PHP: 5.6
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 5.6
ENABLE_REDIS: true
services:
cache:
image: redis
when:
matrix:
ENABLE_REDIS: true
cache-cluster:
image: morrisjobke/redis-cluster
when:
matrix:
ENABLE_REDIS_CLUSTER: true
postgres:
image: postgres:9
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_DB=oc_autotest_dummy
- POSTGRES_PASSWORD=owncloud
tmpfs:
- /var/lib/postgresql/data
when:
matrix:
DB: postgres
mysql:
image: mysql:5.7.22
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysql
mysqlmb4:
image: mysql:5.7.22
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysqlmb4
fake-s3:
image: lphoward/fake-s3
when:
matrix:
OBJECT_STORE: s3
selenium:
image: selenium/standalone-firefox:2.53.1-beryllium
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
- JAVA_OPTS=-Dselenium.LOGGER.level=WARNING
when:
matrix:
TESTS: acceptance
branches: [ master, stable* ]
+14 -65
View File
@@ -1,51 +1,30 @@
# the default generated dir + db file
/data
/owncloud
/config/config.php
/config/*.config.php
/config/mimetype*.json
/config/mount.php
/apps/inc.php
/assets
/.htaccess
/translationfiles
/translationtool.phar
data
owncloud
config/config.php
config/mount.php
apps/inc.php
3rdparty
# ignore all apps except core ones
/apps*/*
!/apps/comments
!/apps/dav
!/apps/files
!/apps/federation
!/apps/federatedfilesharing
!/apps/sharebymail
!/apps/encryption
!/apps/files_encryption
!/apps/files_external
!/apps/files_sharing
!/apps/files_trashbin
!/apps/files_versions
!/apps/lookup_server_connector
!/apps/user_ldap
!/apps/oauth2
!/apps/provisioning_api
!/apps/systemtags
!/apps/testing
!/apps/admin_audit
!/apps/updatenotification
!/apps/theming
!/apps/twofactor_backupcodes
!/apps/workflowengine
!/apps/user_webdavauth
/apps/files_external/3rdparty/irodsphp/PHPUnitTest
/apps/files_external/3rdparty/irodsphp/web
/apps/files_external/3rdparty/irodsphp/prods/test
/apps/files_external/3rdparty/irodsphp/prods/tutorials
/apps/files_external/3rdparty/irodsphp/prods/test*
/apps/files_external/tests/config.*.php
# ignore themes except the example and the README
# ignore themes except the README
/themes/*
!/themes/example
!/themes/README
# just sane ignores
@@ -76,12 +55,11 @@ RCS/*
.project
.settings
# netbeans
# netbeans
nbproject
# phpStorm
.idea
*.iml
# geany
*.geany
@@ -92,10 +70,7 @@ nbproject
# vim ex mode
.vimrc
# ack(-grep)
.ackrc
# Mac OS
.DS_Store
@@ -103,35 +78,9 @@ nbproject
.well-known
/.buildpath
# Tests
/tests/phpunit.xml
# Node Modules
/build/node_modules/
# nodejs
/build/bin
/build/lib/
/build/jsdocs/
/npm-debug.log
/PhantomJS_*
# puphpet
puphpet
# vagrant
.vagrant
Vagrantfile
# Tests - auto-generated files
/data-autotest
#tests - autogenerated filed
data-autotest
/tests/coverage*
/tests/css
/tests/karma-coverage
/tests/autoconfig*
/tests/autotest*
/tests/data/lorem-copy.txt
/tests/data/testimage-copy.png
/config/config-autotest-backup.php
/config/autoconfig.php
clover.xml
/l10n/.tx/
-3
View File
@@ -1,3 +0,0 @@
[submodule "3rdparty"]
path = 3rdparty
url = https://github.com/nextcloud/3rdparty.git
Regular → Executable
+27 -68
View File
@@ -1,80 +1,39 @@
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
<IfModule mod_setenvif.c>
<IfModule mod_fcgid.c>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
<IfModule mod_proxy_fcgi.c>
SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
</IfModule>
</IfModule>
<IfModule mod_env.c>
# Add security and privacy related headers
Header set X-Content-Type-Options "nosniff"
Header set X-XSS-Protection "1; mode=block"
Header set X-Robots-Tag "none"
Header set X-Download-Options "noopen"
Header set X-Permitted-Cross-Domain-Policies "none"
SetEnv modHeadersAvailable true
</IfModule>
# Add cache control for static resources
<FilesMatch "\.(css|js|svg|gif)$">
Header set Cache-Control "max-age=15778463"
</FilesMatch>
# Let browsers cache WOFF files for a week
<FilesMatch "\.woff$">
Header set Cache-Control "max-age=604800"
</FilesMatch>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
</IfModule>
</IfModule>
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
<IfModule mod_php5.c>
php_value upload_max_filesize 511M
php_value post_max_size 511M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
php_value default_charset 'UTF-8'
php_value output_buffering 0
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
php_value upload_max_filesize 513M
php_value post_max_size 513M
php_value memory_limit 512M
<IfModule env_module>
SetEnv htaccessWorking true
</IfModule>
<IfModule mod_php7.c>
php_value upload_max_filesize 511M
php_value post_max_size 511M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value default_charset 'UTF-8'
php_value output_buffering 0
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
</IfModule>
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTP_USER_AGENT} DavClnt
RewriteRule ^$ /remote.php/webdav/ [L,R=302]
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.*
RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L]
RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
</IfModule>
<IfModule mod_mime.c>
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
</IfModule>
<IfModule mod_dir.c>
DirectoryIndex index.php index.html
<IfModule dir_module>
DirectoryIndex index.php index.html
</IfModule>
AddDefaultCharset utf-8
Options -Indexes
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>
-52
View File
@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="RIGHT_MARGIN" value="80" />
<PHPCodeStyleSettings>
<option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
<option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
<option name="LOWER_CASE_NULL_CONST" value="true" />
</PHPCodeStyleSettings>
<XML>
<option name="XML_KEEP_BLANK_LINES" value="1" />
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="CSS">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="CLASS_BRACE_STYLE" value="1" />
<option name="METHOD_BRACE_STYLE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>
-34
View File
@@ -1,34 +0,0 @@
{
"camelcase": true,
"eqeqeq": true,
"immed": true,
"latedef": false,
"noarg": true,
"nonbsp": true,
"undef": true,
"unused": true,
"trailing": true,
"maxparams": 5,
"curly": true,
"jquery": true,
"maxlen": 120,
"indent": 4,
"browser": true,
"laxbreak": true,
"globals": {
"console": true,
"it": true,
"xit": true,
"expect": true,
"describe": true,
"beforeEach": true,
"afterEach": true,
"sinon": true,
"fakeServer": true,
"_": true,
"OC": true,
"OCA": true,
"t": true,
"n": true
}
}
-2
View File
@@ -1,2 +0,0 @@
pattern = "(?i):shipit:|:\\+1:|LGTM|👍"
self_approval_off = true
-418
View File
@@ -1,418 +0,0 @@
Aamir Khan <ak4u2009@gmail.com>
Aaron Reichman <areichman.kde@gmail.com>
Adam Williamson <awilliam@redhat.com>
Aditya Patawari <adimania@gmail.com>
Administrator <Administrator@WINDOWS-2012>
adrien <adrien.waksberg@believedigital.com>
Aldo "xoen" Giambelluca <xoen@xoen.org>
Alessandro Cosentino <cosenal@gmail.com>
Alexander Bergolth <leo@strike.wu.ac.at> root <leo@strike.wu.ac.at>
Alexander Bogdanov <syn@li.ru>
Alexander Wigen <alex@wigen.net>
Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Anders Nor Berle <anders@berle.cc>
Andreas Fischer <bantu@owncloud.com>
Andreas Schönebeck <aschoenebeck@web.de>
Andreas Ergenzinger <andreas.ergenzinger@gmx.de> AndreasErgenzinger <andreas.ergenzinger@gmx.de>
Andrew Brown <andrew@casabrown.com>
André Gaul <gaul@web-yard.de>
Arthur Schiwon <blizzz@arthur-schiwon.de> Arthur Schiwon <blizzz@owncloud.com>
Arthur Schiwon <blizzz@arthur-schiwon.de> blizzz <blizzz@owncloud.com>
Artur Duque de Souza <asouza@kde.org>
Axel Roenn <axel@mpim-bonn.mpg.de>
Bagera <victor@baquero-wihlborg.se>
Bart Visscher <bartv@thisnet.nl> Bart Visscher <bart@thisnet.nl>
Bart Visscher <bartv@thisnet.nl> Bart Visscher <github@thisnet.nl>
Bartek Przybylski <bart.p.pl@gmail.com>
Bastien Ho <bastienho@urbancube.fr>
ben-denham <bend@catalyst.net.nz>
Benjamin Diele <benjamin@diele.be>
Benjamin Liles <benliles@arch.tamu.edu>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.com>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <BernhardPosselt@users.noreply.github.com>
Bernhard Reiter <ockham@raz.or.at>
Birk Borkason <daniel.niccoli@gmail.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiesbn@woody.(none)>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiesbn@potato.(none)>
Björn Schießle <bjoern@schiessle.org> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>
Brice Maron <brice@bmaron.net>
brumsel <brumsel@losecatcher.de> brumsoel <brumsel@losecatcher.de>
Byron Marohn <combustible@live.com> eMerzh <brice@bmaron.net>
Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Carla Schroder <carla@owncloud.com>
Carlos Cerrillo <ccerrillo@gmail.com>
cbhp <cbhp@users.noreply.github.com>
cbojar <chris@cbojar.net>
Ceri Davies <ceri@submonkey.net>
cetra3 <peter@parashift.com.au>
Charles-Edouard Coste <contact@ccoste.fr>
CharlyCoste <contact@ccoste.fr>
chli1 <chli1@users.noreply.github.com>
Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Chris LeBlanc <chris@leblaaanc.com>
Chris Wilson <chris+github@qwirx.com>
Christian Berendt <berendt@b1-systems.de>
Christian Kampka <christian@kampka.net>
Christian Koch <koch.chris@gmail.com>
Christian Reiner <github@christian-reiner.info> Christian Reiner <arkascha@balder.site>
Christoph Wurst <christoph@owncloud.com> Christoph Wurst <ChristophWurst@users.noreply.github.com>
Christoph Wurst <christoph@owncloud.com> Christoph Wurst <christoph@winzerhof-wurst.at>
Christopher Bunn <b11.chris@gmail.com>
Christopher Schäpers <kondou@ts.unde.re> Christopher <kondou@ts.unde.re>
Christopher Schäpers <kondou@ts.unde.re> kondou <kondou@ts.unde.re>
Christopher Schäpers <kondou@ts.unde.re> root <kondou@ts.unde.re>
Christopher T. Johnson <ctjctj@gmail.com>
Clark Tomlinson <fallen013@gmail.com>
Cloud Dumper <clouddumper@gmail.com>
cmeh <cmeh@users.noreply.github.com>
Cornelius Schumacher <schumacher@kde.org>
Craig Morrissey <craig@owncloud.com>
Côme BERNIGAUD <come.bernigaud@laposte.net>
dampfklon <me@dampfklon.de>
Dan Bartram <daneybartram@gmail.com>
Dan Callahan <dan.callahan@gmail.com>
Dan Jones <dan@danneh.org>
Daniel <daniel@mars.(none)>
Daniel Hansson <enoch85@gmail.com>
Daniel Köb <daniel.koeb@peony.at>
Daniel Molkentin <daniel@molkentin.de>
Daniele E. Domenichelli <daniele.domenichelli@gmail.com>
David <davidventura>
David Iwanowitsch <david+git@unclouded.de> David Iwanowitsch <diw@gmx.de>
David Prévot <taffit@debian.org>
David Reagan <reagand@lanecc.edu>
davidak <davidak@gmx.de>
davidgumberg <davidnoizgumberg@gmail.com>
Dawid Opis <ncore@ncore.com.pl>
Deepak Mittal <dpac.mittal2@gmail.com>
DeLtAfOx <edo@ravers.it>
denis-b <denis.bonnenfant@diderot.org>
Der-Jan <de@r-jan.de>
derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>
Duane Johnson <duane.johnson@gmail.com>
eduardo <eduardo@vnexu.net>
elchi <niklas1b@yahoo.de>
Elias Probst <mail@eliasprobst.eu>
Florian <ente@baer.rwth-aachen.de> ente <ente@baer.rwth-aachen.de>
Erik Sargent <esthepiking@gmail.com>
Evgeni Golov <evgeni@golov.de>
fabian <fabian@web2.0-apps.de>
Fabian Henze <flyser42@gmx.de>
Felix Böhm <felixboehm@gmx.de> felixboehm <felixboehm@gmx.de>
Felix Eckhofer <felix@eckhofer.com>
Felix Moeller <mail@felixmoeller.de>
Felix Niklas <mrflix@gmail.com>
Fernando Rodriguez Sela <frsela@tid.es>
fibsifan <fi@volans.uberspace.de>
Florian Hülsmann <fh@cbix.de>
Florian Jacob <fjacob@lavabit.com>
Florian Preinstorfer <nblock@archlinux.us>
Florian Pritz <bluewind@xinu.at>
Florian Scholz <FlorianScholz@bgstyle.de> Florian Scholz <work@bgstyle.de>
Florian Vichot <florian.vichot@gmail.com>
Florin Peter <github@florin-peter.de> Florin Peter <fp@datawerk.de>
Florin Peter <github@florin-peter.de> FlorinPeter <github@florin-peter.de>
Francesco Piraneo G. <fpiraneo@iface.ch>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@dev.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@devel.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@owncloud.org>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <karlitschek@kde.org>
François Kubler <francois@kubler.org>
Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
Frederik Gladhorn <gladhorn@kde.org>
Gadzy <dev@gadzy.fr>
ganomi <ganomi@gmail.com>
Gaël Beaudoin <gaboo@home.gaboo.org>
geez0x1 <geez0x1@users.noreply.github.com>
gekmihesg <markus@gekmihesg.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
Golnaz Nilieh <g382nilieh@gmail.com>
Grundik <grundik@ololo.cc>
Guillaume AMAT <guillaume.amat@informatique-libre.com>
Hans Bakker <hansmbakker@gmail.com>
helix84 <helix84@centrum.sk>
Hendrik Langer <hendrik.langer@gmx.de>
Henning Becker <h.becker@oedenstockach.de>
Henning Oschwald <h.oschwald@gmx.de>
Henrik Kjölhede <hkjolhede@gmail.com>
herbrechtsmeier <stefan@herbrechtsmeier.net>
hkjolhede <hkjolhede@gmail.com>
IchEben <andreas@reichster.de>
ideaship <ideaship@users.noreply.github.com>
Ignacio Daniel Rostagno <ignaciorostagno@vijona.com.ar>
infoneo <infoneo@yahoo.pl>
Insanemal <insanemal@gmail.com>
Tobias Ramforth <tobias@ramforth.com> Tobias Ramforth <tobias.ramforth@udo.edu>
Tobias Ramforth <tobias@ramforth.com> irgsmirx <tobias.ramforth@udo.edu>
Isaac Rosenberg <irosenb7@gmail.com>
itheiss <ingo.theiss@i-matrixx.de>
j-ed <juergen@eisfair.org>
Jake Wilson <jakew@huebnerpetersen.com>
Jakob Sack <mail@jakobsack.de> Jakob Sack <kde@jakobsack.de>
jamesryanbell <james@james-bell.co.uk>
Jamie McClelland <jm@mayfirst.org>
Jan-Christoph Borchardt <hey@jancborchardt.net> Jan-Christoph Borchardt <jan@unhosted.org>
Jan-Christoph Borchardt <hey@jancborchardt.net> Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
jbtbnl <jbtbnl@users.noreply.github.com>
Jean-Louis Dupond <jean-louis@dupond.be>
Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
Jens-Christian Fischer <jens-christian.fischer@switch.ch>
Jernej Virag <jernej.virag@gmail.com>
Jesus Macias Portela <jesus.macias.portela@gmail.com>
Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com>
jknockaert <jasper@knockaert.nl>
Joan <aseques@gmail.com>
Joar Wandborg <git@wandborg.com>
Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@gmx.de>
Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@owncloud.com>
joel hansson <joel.hansson@gmail.com>
Johan Björk <johanimon@gmail.com>
Johannes Twittmann <github.com@deryo.de>
Johannes Willnecker <johannes@willnecker.com>
John Kristensen <John.Kristensen@dpipwe.tas.gov.au>
Jonathan Riddell <jriddell@ubuntu.com>
Jonny007-MKD <1-23-4-5@web.de>
josh4trunks <joshruehlig@gmail.com>
Joshua Medeiros <Jammerx2@gmail.com>
Juan Carlos Cornejo <jc2@paintblack.com>
Julian Müller <julian.mueller.ffb@kabelmail.de>
Jörn Friedrich Dreyer <jfd@butonic.de> jfd <jfd@lance>
Jörn Friedrich Dreyer <jfd@butonic.de> jfd <jfd@underverse>
Kamil Domanski <kdomanski@kdemail.net>
Kees Huiberts <snowy@derideal.com>
Klaas Freitag <freitag@owncloud.com> Klaas Freitag <freitag@suse.de>
Konstantin Popov <konstantin.popov@globalpointagency.comv> Konstantin.Popov <konstantin.popov@globalpointagency.comv>
krzaczek <pawel@freshmind.pl>
Kshitij Parajuli <kshitijparajuli@gmail.com>
Kunal Ghosh <kunal.t2@gmail.com>
Tobia De Koninck <tobia@ledfan.be> LEDfan <tobia@ledfan.be>
Lennart Rosam <lennart.rosam@medien-systempartner.de>
Sebastian Döll <sebastian.doell@libasys.de> libasys <sebastian.doell@libasys.de>
Lode Hoste <zillode@zillode.be>
lolozere <laurent@chedanne.pro>
Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.com>
Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.org>
Luke Policinski <lpolicinski@gmail.com>
Lyonel Vincent <lyonel@ezix.org>
macjohnny <estebanmarin@gmx.ch>
maelzx <maelzx@gmail.com>
marc0s <marcos@tenak.net>
Marco B <beinbrech@solutica.de>
Marco Michelino <michelinux@gmail.com>
Markus Goetz <markus@woboq.com>
Markus Kalkbrenner <markus.kalkbrenner@bio.logis.de>
Martial Saunois <saunois.martial@gmail.com>
Martin Mattel <martin.mattel@diemattels.at> Martin <martin.mattel@diemattels.at>
Martin Mattel <martin.mattel@diemattels.at> root <martin.mattel@diemattels.at>
Martin Grohmann <martin@medi-inf.org>
# TODO: the same person
Martin Konrad <info@martin-konrad.net>
Martin Konrad <konrad@frib.msu.edu>
Martin Sandsmark <martin.sandsmark@kde.org> Martin T. H. Sandsmark <sandsmark@samfundet.no>
Marvin Thomas Rabe <mrabe@marvinrabe.de> Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Masaki Kawabata Neto <masaki.kawabata@gmail.com> Masaki <masaki.kawabata@gmail.com>
Mat Lipe <mat@lipeimagination.info>
Matthew Caron <matt@mattcaron.net>
Matthew Dawson <matthew@mjdsystems.ca>
Matthias Rieber <matthias@zu-con.org>
Maximilian Ruta <mr@xtain.net>
mh <mh@immerda.ch>
Michael Gapczynski <GapczynskiM@gmail.com> Michael Gapczynski <mtgap@owncloud.com>
Michael Göhler <somebody.here@gmx.de>
Michael Kent <mike@draftx.net>
Michael Kuhn <suraia@ikkoku.de>
Michael Monreal <michael.monreal@gmail.com>
Michael Roitzsch <reactorcontrol@icloud.com>
michag86 <micha_g@arcor.de>
Michiel de Jong <michiel@unhosted.org> Michiel@unhosted <michiel@unhosted.org>
Miguel Prokop <miguel.prokop@vtu.com>
miicha <pfitzner@physik.hu-berlin.de>
Miquel Rodríguez Telep / Michael Rodríguez-Torrent <miquel@designunbound.co.uk>
Morris Jobke <hey@morrisjobke.de> Morris Jobke <morris.jobke@gmail.com>
MTRichards <matt@owncloud.com>
mvn23 <schopdiedwaas@gmail.com>
Myles McNamara <myles@hostt.net> Myles McNamara <myles@smyl.es>
NARUKAWA Hiroki <nhirokinet@nhiroki.net>
Nathan Dauber <nathan@radialogica.com>
Nazar Mokrynskyi <nazar@mokrynskyi.com>
nhirokinet <nhirokinet@nhiroki.net>
Nico Kaiser <nico.kaiser@boerse-go.de>
Nicolai Ehemann <en@enlightened.de>
Nicolas Stamm <nicolas.stamm@gmail.com>
NIEK Antoine <antoineniek@gmail.com>
Niklas Sombert <niklas1b@yahoo.de>
Nils Jansen <nilsjansen@gmail.com>
nishiki <nishiki@yaegashi.fr>
Nmz <nemesiz@nmz.lt>
Normal Ra <normalraw@gmail.com> Normal Ra <NormalRa@users.noreply.github.com>
Oliver Gasser <oliver.gasser@gmail.com> Oliver Gasser <oliver@flowriver.net>
Oliver Kohl D.Sc. <oliver@kohl.bz>
Olivier Paroz <github@oparoz.com> Olivier Paroz <oparoz@users.noreply.github.com>
Olivier Tétard <olivier.tetard@miskin.fr>
Aaron Larisch <aaron.larisch@gmx.de> OpenLarry <aaron.larisch@gmx.de>
opensaucesystems <ashley@opensaucesystems.com>
Oskar Hollmann <oskarhollmann@gmail.com>
Otto Sabart <ottosabart@seberm.com>
Owen Winkler <a_github@midnightcircus.com> Owen Winkler <epithet@gmail.com>
Owen Winkler <a_github@midnightcircus.com> ringmaster <epithet@gmail.com>
Pascal de Bruijn <pmjdebruijn@pcode.nl>
Patrick Paysant <ppaysant@linagora.com>
Patrick Stricker <stricker@hera.dev.iks-hagen.de>
Paul Brown <paul90brown@gmail.com>
pdessauw <pdessauw@gmail.com>
Pellaeon Lin <nfsmwlin@gmail.com>
Pete McFarlane <peterjohnmcfarlane@gmail.com> petemcfarlane <peterjohnmcfarlane@gmail.com>
Philipp Kapfer <philipp.kapfer@gmx.at>
Philipp Knechtges <philipp-dev@knechtges.com>
Philipp Roggan <philipp.roggan@newsletter4free.de>
Philipp Schmitt <philipp@schmitt.co>
Philippe Jung <phil.jung@free.fr>
Philippe Kueck <pk@plusline.de>
prcrst <prcrst@hush.com>
pzy <pzy@d1sturbed.org>
Qingping Hou <dave2008713@gmail.com>
Raghu Nayyar <me@iraghu.com> Raghu Nayyar <raghu.nayyar.007@gmail.com>
Raghu Nayyar <me@iraghu.com> raghunayyar <me@iraghu.com>
Raimund Schlüßler <raimund.schluessler@googlemail.com>
Ramiro Aparicio <rapariciog@gmail.com>
Randolph Carter <RandolphCarter@fantasymail.de>
RealRancor <Fisch.666@gmx.de>
Remco Brenninkmeijer <requist1@starmail.nl>
Riccardo Iaconelli <riccardo@kde.org>
Richard Clarkson <robert@trash-mail.com>
rnveach <rveach02@gmail.com>
Robert Jäckel <rjaeckel@users.noreply.github.com>
Robin Appelman <robin@icewind.nl> icewind1991 <icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> icewind1991 <robin@icewind.nl>
Robin Appelman <robin@icewind.nl> Robin <Robin Appelman icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> Robin <robin@Amaya.(none)>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind@owncloud.com>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>
rolandgeider <roland@geider.net>
Roman Geber <rgeber@owncloudapps.com>
root <root@asterisk03.ceschia.de>
root <root@dev.(none)>
root <root@oc.(none)>
root <root@plug.(none)>
Ross Nicoll <jrn@jrn.me.uk>
runky <philipp.boersteken@googlemail.com>
Sam Tuke <mail@samtuke.com> Sam Tuke <sam@donttravelempty.com>
Sam Tuke <mail@samtuke.com> Sam Tuke <samtuke@jack-laptop.(none)>
Sam Tuke <mail@samtuke.com> Sam Tuke <samtuke@owncloud.com>
Sander <brantje@gmail.com>
Sandro Knauß <bugs@sandroknauss.de> Sandro <hefee@taurin.(none)>
Sascha Schmidt <realriot@realriot.de>
Sascha Schneider <development@suntsu.org>
scambra <sergio@entrecables.com>
scolebrook <scolebrook@mac.com>
Scott Arciszewski <scott@arciszewski.me>
Scott Barnett <scott.n.barnett@gmail.com>
Scott Shambarger <gitorious@shambarger.net>
Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Sean Comeau <sean@ftlnetworks.ca>
Sean Leonard <meanderingcode@silverleafstudios.net>
Sebastian Bolt <sebastian.bolt@gmx.de>
Serge Martin <edb@sigluy.net>
Sergei Shuykov <n1nj4p0w3r@gmail.com>
Sergi Almacellas Abellana <sergi@koolpi.com>
sherbrecher <oss@herbrecher.de>
shkdee <louis.traynard@m4x.org>
Simon Birnbach <simon@simon-birnbach.de>
Simon Könnecke <simonkoennecke@gmail.com>
Simon Whittaker <simon@swbh.net>
Sjors van der Pluijm <sjors@desjors.nl> Sjors van der Pluijm <sjors@youngguns.nl>
st3so <st3so@server.fake>
Stefan <mu.stefan@googlemail.com>
Stefan Göckeritz <admin@s-goecker.de>
Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Stefan Rado <owncloud@sradonia.net>
Stefan Seidel <android@stefanseidel.info>
Steffen Lindner <mail@steffen-lindner.de> Steffen Lindner <gomez@flexiabel.de>
Stephan Arts <stephan@xfce.org>
Stephan Bergemann <st.bergemann@htw-berlin.de>
Stephan Peijnik <speijnik@anexia-it.com>
Stephane Martin <stef.martin@gmail.com> Stephane Martin <stephane.martin@vesperal.eu>
Stephane V <stephane@vergeylen.eu>
Stephen Rees-Carter <stephen@rees-carter.net>
Steven <wokste@gmail.com>
Steven <wokste@Komkommer.(none)>
Steven <wwjd2@web.de>
Sugaroverdose <n1nj4p0w3r@gmail.com>
Susinthiran Sithamparanathan <chesusin@gmail.com>
tbelau666 <thomas.belau@gmx.de>
TheSFReader <TheSFReader@gmail.com>
Thibaut GRIDEL <tgridel@free.fr>
thomas <thomas@thomas-VirtualBox.(none)>
Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
Thomas Olsen <tol@tanghus>
Thomas Schmidt <tschmidt@suse.de>
Thomas Tanghus <thomas@tanghus.net>
Thomas Zander <zander@kde.org>
tiezdne <oswald.84@t-online.de>
Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Tobias Kaminsky <tobias@kaminsky.me> tobiasKaminsky <tobias@kaminsky.me>
Tom Needham <tom@owncloud.com> Tom Needham <needham.thomas@gmail.com>
Tom Needham <tom@owncloud.com> Tom Needham <tom@tre.tomneedham.com>
Tom Needham <tom@owncloud.com> tomneedham <needham.thomas@gmail.com>
Tom Needham <tom@owncloud.com> tomneedham <tom@owncloud.com>
Tony Zelenoff <antonz@parallels.com>
tsumi <mail@tsumi.it>
twood8 <ted.wood@gtri.gatech.edu>
Türker Sezer <turkersezer@tsdesign.info>
unclejamal3000 <andreas.pramhaas@posteo.de>
unknown <Alain@Alain-PC.(none)>
unknown <pnd@.nist.gov>
Valerio Ponte <valerio.ponte@gmail.com>
Victor Dubiniuk <dubiniuk@owncloud.com> Victor Dubiniuk <victor.dubiniuk@gmail.com>
Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <dubiniuk@owncloud.com>
Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
Vincent Cloutier <vincent1cloutier@gmail.com>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
Vitaly Kuznetsov <vitty@altlinux.ru>
Vladimir Sapronov <vladimir.sapronov@gmail.com>
Volkan Gezer <volkangezer@gmail.com> Volkan Gezer <wakeup@users.noreply.github.com>
Volker E. <open@temporaer.net>
voxsim <Simon Vocella>
vsapronov <vladimir.sapronov@gmail.com>
Vsevolod Kukol <v.kukol@rubologic.de>
Weng Xuetian <wengxt@gmail.com>
Wikinaut <mail@tgries.de>
Willi Ballenthin <willi.ballenthin@gmail.com>
windaishi <manuel.strider@web.de>
Witali Rott <info@hlop.eu>
Yann VERRY <yann@verry.org>
yannickoo <github@yannickoo.de>
zafi <zafirakis.daniel@gmail.com>
zombiehugs <gerdsen@gmail.com>
-34
View File
@@ -1,34 +0,0 @@
{
"maxReviewers": 3,
"numFilesToCheck": 5,
"alwaysNotifyForPaths": [
{
"name": "nickvergessen",
"files": [
"lib/private/Activity/**",
"lib/private/Notification/**",
"lib/public/Activity/**",
"lib/public/Notification/**"
]
},
{
"name": "Xenopathic",
"files": [
"apps/files_external/**"
]
}
],
"userBlacklist": [
"DeepDiver1975",
"nextcloud-bot",
"owncloud-bot",
"PVince81",
"scrutinizer-auto-fixer",
"th3fallen",
"zander",
"luckydonald",
"jancborchardt"
],
"createReviewRequest": true,
"createComment": false
}
-27
View File
@@ -1,27 +0,0 @@
before_commands:
- 'git submodule update --init --recursive'
filter:
excluded_paths:
- '3rdparty/*'
- 'apps/*/3rdparty/*'
- 'apps/*/vendor/*'
- 'l10n/*'
- 'core/l10n/*'
- 'apps/*/l10n/*'
- 'apps/*/tests/*'
- 'lib/l10n/*'
- 'core/vendor/*'
- 'core/js/tests/lib/*.js'
- 'core/js/tests/specs/*.js'
- 'core/js/jquery-showpassword.js'
- 'core/js/jquery-tipsy.js'
- 'core/js/placeholders.js'
- 'settings/l10n/*'
- 'tests/*'
- 'build/*'
- 'lib/composer/*'
imports:
- javascript
- php
-1
View File
@@ -1 +0,0 @@
$Format:%H$
-129
View File
@@ -1,129 +0,0 @@
[main]
host = https://www.transifex.com
lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
[nextcloud.core]
file_filter = translationfiles/<lang>/core.po
source_file = translationfiles/templates/core.pot
source_lang = en
type = PO
[nextcloud.files]
file_filter = translationfiles/<lang>/files.po
source_file = translationfiles/templates/files.pot
source_lang = en
type = PO
[nextcloud.settings-1]
file_filter = translationfiles/<lang>/settings.po
source_file = translationfiles/templates/settings.pot
source_lang = en
type = PO
[nextcloud.lib]
file_filter = translationfiles/<lang>/lib.po
source_file = translationfiles/templates/lib.pot
source_lang = en
type = PO
[nextcloud.dav]
file_filter = translationfiles/<lang>/dav.po
source_file = translationfiles/templates/dav.pot
source_lang = en
type = PO
[nextcloud.files_encryption]
file_filter = translationfiles/<lang>/encryption.po
source_file = translationfiles/templates/encryption.pot
source_lang = en
type = PO
[nextcloud.files_external]
file_filter = translationfiles/<lang>/files_external.po
source_file = translationfiles/templates/files_external.pot
source_lang = en
type = PO
[nextcloud.files_sharing]
file_filter = translationfiles/<lang>/files_sharing.po
source_file = translationfiles/templates/files_sharing.pot
source_lang = en
type = PO
[nextcloud.files_trashbin]
file_filter = translationfiles/<lang>/files_trashbin.po
source_file = translationfiles/templates/files_trashbin.pot
source_lang = en
type = PO
[nextcloud.files_versions]
file_filter = translationfiles/<lang>/files_versions.po
source_file = translationfiles/templates/files_versions.pot
source_lang = en
type = PO
[nextcloud.user_ldap]
file_filter = translationfiles/<lang>/user_ldap.po
source_file = translationfiles/templates/user_ldap.pot
source_lang = en
type = PO
[nextcloud.comments]
file_filter = translationfiles/<lang>/comments.po
source_file = translationfiles/templates/comments.pot
source_lang = en
type = PO
[nextcloud.federatedfilesharing]
file_filter = translationfiles/<lang>/federatedfilesharing.po
source_file = translationfiles/templates/federatedfilesharing.pot
source_lang = en
type = PO
[nextcloud.federation]
file_filter = translationfiles/<lang>/federation.po
source_file = translationfiles/templates/federation.pot
source_lang = en
type = PO
[nextcloud.oauth2]
file_filter = translationfiles/<lang>/oauth2.po
source_file = translationfiles/templates/oauth2.pot
source_lang = en
type = PO
[nextcloud.sharebymail]
file_filter = translationfiles/<lang>/sharebymail.po
source_file = translationfiles/templates/sharebymail.pot
source_lang = en
type = PO
[nextcloud.systemtags]
file_filter = translationfiles/<lang>/systemtags.po
source_file = translationfiles/templates/systemtags.pot
source_lang = en
type = PO
[nextcloud.updatenotification]
file_filter = translationfiles/<lang>/updatenotification.po
source_file = translationfiles/templates/updatenotification.pot
source_lang = en
type = PO
[nextcloud.theming]
file_filter = translationfiles/<lang>/theming.po
source_file = translationfiles/templates/theming.pot
source_lang = en
type = PO
[nextcloud.twofactor_backupcodes]
file_filter = translationfiles/<lang>/twofactor_backupcodes.po
source_file = translationfiles/templates/twofactor_backupcodes.pot
source_lang = en
type = PO
[nextcloud.workflowengine]
file_filter = translationfiles/<lang>/workflowengine.po
source_file = translationfiles/templates/workflowengine.pot
source_lang = en
type = PO
-7
View File
@@ -1,7 +0,0 @@
upload_max_filesize=511M
post_max_size=511M
memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
default_charset='UTF-8'
output_buffering=0
Submodule 3rdparty deleted from 361584bd13
+25 -216
View File
@@ -1,222 +1,31 @@
Nextcloud is written by:
- AW-UC <git@a-wesemann.de>
- Aaron Wood <aaronjwood@gmail.com>
- Achim Königs <garfonso@tratschtante.de>
- Adam Williamson <awilliam@redhat.com>
- Administrator <Administrator@WINDOWS-2012>
- Aldo "xoen" Giambelluca <xoen@xoen.org>
- Alex Weirig <alex.weirig@technolink.lu>
- Alexander Bergolth <leo@strike.wu.ac.at>
- Andreas Fischer <bantu@owncloud.com>
- Andrew Brown <andrew@casabrown.com>
- André Gaul <gaul@web-yard.de>
- Arthur Schiwon <blizzz@arthur-schiwon.de>
- Bart Visscher <bartv@thisnet.nl>
- Bartek Przybylski <bart.p.pl@gmail.com>
- Bastien Ho <bastienho@urbancube.fr>
- Benjamin Diele <benjamin@diele.be>
- Benjamin Liles <benliles@arch.tamu.edu>
- Bernhard Posselt <dev@bernhard-posselt.com>
- Bernhard Reiter <ockham@raz.or.at>
- Birk Borkason <daniel.niccoli@gmail.com>
- Bjoern Schiessle <bjoern@schiessle.org>
- Björn Schießle <bjoern@schiessle.org>
- Borjan Tchakaloff <borjan@tchakaloff.fr>
- Brice Maron <brice@bmaron.net>
- Byron Marohn <combustible@live.com>
- Carla Schroder <carla@owncloud.com>
- Carlos Cerrillo <ccerrillo@gmail.com>
- Carlos Damken <carlos@damken.com>
- Christian Berendt <berendt@b1-systems.de>
- Christian Jürges <christian@eqipe.ch>
- Christian Kampka <christian@kampka.net>
- Christian Weiske <cweiske@cweiske.de>
- Christoph Schaefer <christophł@wolkesicher.de>
- Christoph Wurst <christoph@owncloud.com>
- Christopher Schäpers <kondou@ts.unde.re>
- Christopher T. Johnson <ctjctj@gmail.com>
- Clark Tomlinson <fallen013@gmail.com>
- Craig Morrissey <craig@owncloud.com>
- Dan Bartram <daneybartram@gmail.com>
- Daniel Hansson <enoch85@gmail.com>
- Daniel Jagszent <daniel@jagszent.de>
- Daniel Molkentin <daniel@molkentin.de>
- Daniel Tosello <tosello.daniel@gmail.com>
- David Prévot <taffit@debian.org>
- David Toledo <dtoledo@solidgear.es>
- Dominik Schmidt <dev@dominik-schmidt.de>
- Fabian Henze <flyser42@gmx.de>
- Faruk Uzun <farukuzun@collabora.com>
- Felix Böhm <felixboehm@gmx.de>
- Felix Moeller <mail@felixmoeller.de>
- Florian Preinstorfer <nblock@archlinux.us>
- Florian Pritz <bluewind@xinu.at>
- Florin Peter <github@florin-peter.de>
- Francesco Rovelli <francesco.rovelli@gmail.com>
- Frank Karlitschek <frank@karlitschek.de>
- François Kubler <francois@kubler.org>
- Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
- Gadzy <dev@gadzy.fr>
- Georg Ehrke <georg@owncloud.com>
- Guillaume AMAT <guillaume.amat@informatique-libre.com>
- Hasso Tepper <hasso@zone.ee>
- Hendrik Leppelsack <hendrik@leppelsack.de>
- Hugo Gonzalez Labrador <hglavra@gmail.com>
- Individual IT Services <info@individual-it.net>
- Jakob Sack <mail@jakobsack.de>
- Jan-Christoph Borchardt <hey@jancborchardt.net>
- Jarrett <JetUni@users.noreply.github.com>
- Jean-Louis Dupond <jean-louis@dupond.be>
- Jens-Christian Fischer <jens-christian.fischer@switch.ch>
- Jesús Macias <jmacias@solidgear.es>
- Joachim Bauch <bauch@struktur.de>
- Joachim Sokolowski <github@sokolowski.org>
- Joas Schilling <coding@schilljs.com>
- Johan Björk <johanimon@gmail.com>
- Johannes Ernst <jernst@indiecomputing.com>
- Johannes Willnecker <johannes@willnecker.com>
- Jonny007-MKD <1-23-4-5@web.de>
- Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- Julius Haertl <jus@bitgrid.net>
- Jörn Friedrich Dreyer <jfd@butonic.de>
- Kamil Domanski <kdomanski@kdemail.net>
- Klaas Freitag <freitag@owncloud.com>
- Lars <winnetou+github@catolic.de>
- Laurens Post <Crote@users.noreply.github.com>
- Laurens Post <lkpost@scept.re>
- Lennart Rosam <hello@takuto.de>
- Lennart Rosam <lennart.rosam@medien-systempartner.de>
- Leonardo Diez <leio10@users.noreply.github.com>
- Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
- Lukas Reschke <lukas@statuscode.ch>
- Luke Policinski <lpolicinski@gmail.com>
- Lyonel Vincent <lyonel@ezix.org>
- Manish Bisht <manish.bisht490@gmail.com>
- Mario Kolling <mario.kolling@serpro.gov.br>
- Markus Goetz <markus@woboq.com>
- Martin Konrad <info@martin-konrad.net>
- Martin Konrad <konrad@frib.msu.edu>
- Martin Mattel <martin.mattel@diemattels.at>
- Marvin Thomas Rabe <mrabe@marvinrabe.de>
- Masaki Kawabata Neto <masaki.kawabata@gmail.com>
- Michael Gapczynski <GapczynskiM@gmail.com>
- Michael Göhler <somebody.here@gmx.de>
- Michael Kuhn <suraia@ikkoku.de>
- Michael Roitzsch <reactorcontrol@icloud.com>
- Michael Roth <michael.roth@rz.uni-augsburg.de>
- Michael U <mdusher@users.noreply.github.com>
- Miguel Prokop <miguel.prokop@vtu.com>
- Mitar <mitar.git@tnode.com>
- Morris Jobke <hey@morrisjobke.de>
- Nicolai Ehemann <en@enlightened.de>
- Nicolas Grekas <nicolas.grekas@gmail.com>
- Nmz <nemesiz@nmz.lt>
- Normal Ra <normalraw@gmail.com>
- Oliver Gasser <oliver.gasser@gmail.com>
- Oliver Kohl D.Sc. <oliver@kohl.bz>
- Olivier Paroz <github@oparoz.com>
- Otto Sabart <ottosabart@seberm.com>
- Owen Winkler <a_github@midnightcircus.com>
- Pascal de Bruijn <pmjdebruijn@pcode.nl>
- Patrick Paysant <ppaysant@linagora.com>
- Pellaeon Lin <nfsmwlin@gmail.com>
- Petr Svoboda <weits666@gmail.com>
- Phiber2000 <phiber2000@gmx.de>
- Phil Davis <phil.davis@inf.org>
- Philipp Kapfer <philipp.kapfer@gmx.at>
- Philippe Jung <phil.jung@free.fr>
- Pierre Jochem <pierrejochem@msn.com>
- Pierre Ozoux <pierre@ozoux.net>
- Piotr Filiciak <piotr@filiciak.pl>
- Qingping Hou <dave2008713@gmail.com>
- Raghu Nayyar <hey@raghunayyar.com>
- Raghu Nayyar <me@iraghu.com>
- Ralph Krimmel <rkrimme1@gwdg.de>
- Ramiro Aparicio <rapariciog@gmail.com>
- Randolph Carter <RandolphCarter@fantasymail.de>
- RealRancor <Fisch.666@gmx.de>
- Remco Brenninkmeijer <requist1@starmail.nl>
- Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
- Robin Appelman <robin@icewind.nl>
- Robin McCorkell <robin@mccorkell.me.uk>
- Roeland Jago Douma <roeland@famdouma.nl>
- Roman Geber <rgeber@owncloudapps.com>
- Roman Kreisel <mail@romankreisel.de>
- Ross Nicoll <jrn@jrn.me.uk>
- SA <stephen@mthosting.net>
- Sam Tuke <mail@samtuke.com>
- Sander <brantje@gmail.com>
- Sean Comeau <sean@ftlnetworks.ca>
- Sebastian Döll <sebastian.doell@libasys.de>
- Senorsen <senorsen.zhang@gmail.com>
- Serge Martin <edb@sigluy.net>
- Sergio Bertolin <sbertolin@solidgear.es>
- Sergio Bertolín <sbertolin@solidgear.es>
- Simon Könnecke <simonkoennecke@gmail.com>
- Sjors van der Pluijm <sjors@desjors.nl>
- Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
- Stefan Rado <owncloud@sradonia.net>
- Stefan Weil <sw@weilnetz.de>
- Steffen Lindner <mail@steffen-lindner.de>
- Stephan Peijnik <speijnik@anexia-it.com>
- TheSFReader <TheSFReader@gmail.com>
- Thibaut GRIDEL <tgridel@free.fr>
- Thomas Citharel <tcit@tcit.fr>
- Thomas Müller <thomas.mueller@tmit.eu>
- Thomas Pulzer <t.pulzer@kniel.de>
- Thomas Tanghus <thomas@tanghus.net>
- Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
- Tim Dettrick <t.dettrick@uq.edu.au>
- Tobia De Koninck <tobia@ledfan.be>
- Tobias Kaminsky <tobias@kaminsky.me>
- Tom Needham <tom@owncloud.com>
- Torben Dannhauer <torben@dannhauer.de>
- Victor Dubiniuk <dubiniuk@owncloud.com>
- Viktor Szépe <viktor@szepe.net>
- Vincent Chan <plus.vincchan@gmail.com>
- Vincent Cloutier <vincent1cloutier@gmail.com>
- Vincent Petry <pvince81@owncloud.com>
- Volkan Gezer <volkangezer@gmail.com>
- adrien <adrien.waksberg@believedigital.com>
- alexweirig <alex.weirig@technolink.lu>
- brumsel <brumsel@losecatcher.de>
- cetra3 <peter@parashift.com.au>
- cmeh <cmeh@users.noreply.github.com>
- dampfklon <me@dampfklon.de>
- davidgumberg <davidnoizgumberg@gmail.com>
- davitol <dtoledo@solidgear.es>
- derkostka <sebastian.kostka@gmail.com>
- eduardo <eduardo@vnexu.net>
- fabian <fabian@web2.0-apps.de>
- felixboehm <felix@webhippie.de>
- goodkiller <markopraakli@gmail.com>
- helix84 <helix84@centrum.sk>
- hkjolhede <hkjolhede@gmail.com>
- ideaship <ideaship@users.noreply.github.com>
- j-ed <juergen@eisfair.org>
- jknockaert <jasper@knockaert.nl>
- josh4trunks <joshruehlig@gmail.com>
- karakayasemi <karakayasemi@itu.edu.tr>
- macjohnny <estebanmarin@gmx.ch>
- martin-rueegg <martin.rueegg@metaworx.ch>
- martin.mattel@diemattels.at <martin.mattel@diemattels.at>
- michag86 <micha_g@arcor.de>
- mmccarn <mmccarn-github@mmsionline.us>
- nishiki <nishiki@yaegashi.fr>
- oparoz <owncloud@interfasys.ch>
- root <root@oc.(none)>
- scambra <sergio@entrecables.com>
- scolebrook <scolebrook@mac.com>
- shkdee <louis.traynard@m4x.org>
- sualko <klaus@jsxc.org>
- tbartenstein <tbartenstein@users.noreply.github.com>
- tbelau666 <thomas.belau@gmx.de>
- unclejamal3000 <andreas.pramhaas@posteo.de>
- v1r0x <vinzenz.rosenkranz@gmail.com>
- voxsim <Simon Vocella>
ownCloud is written by:
Frank Karlitschek
Robin Appelman
Jakob Sack
Jan-Christoph Borchardt
Michael Gapczynski
Arthur Schiwon
Bart Visscher
Georg Ehrke
Brice Maron
Tom Needham
Marvin Thomas Rabe
Florian Pritz
Bartek Przybylski
Thomas Müller
Klaas Freitag
Sam Tuke
Simon Birnbach
Lukas Reschke
Christian Reiner
Daniel Molkentin
With help from many libraries and frameworks including:
Open Collaboration Services
SabreDAV
jQuery
"Lock” symbol from thenounproject.com collection
"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
-20
View File
@@ -1,20 +0,0 @@
ChangeLog
=========
NC 11 (2016-12-13)
------------------
* PHP 5.4 and 5.5 no longer supported
* PHP 7.1 support
* OC_L10N removed use \OCP\IL10N (#1948)
* Preview handling is improved by sharing previews:
* Preview sharing (shared files/external storages)
* Previews are stored in the AppData
* Previews are served faster by not first converting them to image objects
* Core preview route changed:
* Route for the urlgenerator changed from 'core_ajax_preview' to 'core.Preview.getPreview'
* $urlGenerator->linkToRoute('core_ajax_preview', ...) => $urlGenerator->linkToRoute('core.Preview.getPreview', ...)
* Avatars are cached
* Avatars are moved to AppData
* For existing avatars this happens automatically in a background job which means that on upgrade you might
not see your avatar right away. However after the job has run it should show up again automatically.
+19 -50
View File
@@ -1,68 +1,37 @@
## Submitting issues
If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].
### Short version
* The [**issue template can be found here**][template] but be aware of the different repositories! See list below. Please always use the issue template when reporting issues.
If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
### Guidelines
* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
- Go to one of the repositories, click "issues" and type any word in the top search/command bar.
- You can also filter by appending e. g. "state:open" to the search string.
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
* This repository ([server](https://github.com/nextcloud/server/issues)) is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker.
* The issues in other components should be reported in their respective repositories: You will find them in our [GitHub Organization](https://github.com/nextcloud/)
* Report the issue using our [template][template], it includes all the informations we need to track down the issue.
* This repository is *only* for issues within the ownCloud core code. Issues in other compontents should be reported in their own repositores:
- [Android client](https://github.com/owncloud/android/issues)
- [iOS client](https://github.com/owncloud/ios-issues/issues)
- [Desktop client](https://github.com/owncloud/mirall/issues)
- [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...)
* Search the existing issues first, it's likely that your issue was already reported.
* Report the issue using our [template][template], it includes all the information we need to track down the issue.
If your issue appears to be a bug, and hasn't been reported, open a new issue.
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
[forum]: https://help.nextcloud.com/
[irc]: https://webchat.freenode.net/?channels=nextcloud
[template]: https://raw.github.com/owncloud/core/master/issue_template.md
[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
[forum]: http://forum.owncloud.org/
[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
## Contributing to Source Code
Thanks for wanting to contribute source code to Nextcloud. That's great!
Thanks for wanting to contribute source code to ownCloud. That's great!
Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the Nextcloud code with PHPUnit.
Before we're able to merge your code into the ownCloud core, you need to sign our [Contributor Agreement][agreement].
### Tests
Please read the [Developer Manuals][devmanual] to get useful infos like how to create your first application or how to test the ownCloud code with phpunit.
In order to constantly increase the quality of our software we can no longer accept pull request which submit un-tested code.
It is a must have that changed and added code segments are unit tested.
In some areas unit testing is hard (aka almost impossible) as of today - in these areas refactoring WHILE fixing a bug is encouraged to enable unit testing.
### Sign your work
We use the Developer Certificate of Origin (DCO) as a additional safeguard
for the Nextcloud project. This is a well established and widely used
mechanism to assure contributors have confirmed their right to license
their contribution under the project's license.
Please read [contribute/developer-certificate-of-origin][dcofile].
If you can certify it, then just add a line to every git commit message:
````
Signed-off-by: Random J Developer <random@developer.example.org>
````
Use your real name (sorry, no pseudonyms or anonymous contributions).
If you set your `user.name` and `user.email` git configs, you can sign your
commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
like `git config --global alias.ci 'commit -s'`. Now you can commit with
`git ci` and the commit will be signed.
### Apply a license
In case you are not sure how to add or update the license header correctly please have a look at [contribute/HowToApplyALicense.md][applyalicense]
[devmanual]: https://docs.nextcloud.org/server/12/developer_manual/
[dcofile]: https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin
[applyalicense]: https://github.com/nextcloud/server/blob/master/contribute/HowToApplyALicense.md
[agreement]: http://owncloud.org/about/contributor-agreement/
[devmanual]: http://owncloud.org/dev/
## Translations
Please submit translations via [Transifex][transifex].
[transifex]: https://www.transifex.com/nextcloud
[transifex]: https://www.transifex.com/projects/p/owncloud/
View File
+4 -4
View File
@@ -1,5 +1,5 @@
Files in Nextcloud are licensed under the Affero General Public License version 3,
the text of which can be found in COPYING, or any later version of the AGPL,
Files in ownCloud are licensed under the Affero General Public License version 3,
the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
unless otherwise noted.
Licensing of components:
@@ -8,8 +8,8 @@ Licensing of components:
* MDB2: BSD style custom
* User: AGPL
* XML/RPC: MIT / PHP
* Elementary filetype icons: GPL v3+
* Silk icons: Creative Commons Attribution
All unmodified files from these and other sources retain their original copyright
and license notices: see the relevant individual files.
Attribution information for Nextcloud is contained in the AUTHORS file.
Attribution information for ownCloud is contained in the AUTHORS file.
+20
View File
@@ -0,0 +1,20 @@
ownCloud gives you freedom and control over your own data.
A personal cloud which runs on your own server.
http://ownCloud.org
Installation instructions: http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
Contribution Guidelines: http://owncloud.org/dev/contribute/
Source code: https://github.com/owncloud
Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
IRC channel: https://webchat.freenode.net/?channels=owncloud
Diaspora: https://joindiaspora.com/u/owncloud
Identi.ca: https://identi.ca/owncloud
Important notice on translations:
Please submit translations via Transifex:
https://www.transifex.com/projects/p/owncloud/
For more detailed information about translations:
http://owncloud.org/dev/translation/
-66
View File
@@ -1,66 +0,0 @@
# Nextcloud Server
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud--dev%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-dev)
**A safe home for all your data.**
![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
## Why is this so awesome?
* :file_folder: **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
* :package: **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
* :arrows_counterclockwise: **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
* :rocket: **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentification.
*You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).
## Get your Nextcloud
- [**Install** a server by yourself on your own hardware or by using one of our ready to use **Appliances**](https://nextcloud.com/install/#instructions-server)
- [Buy one of the awesome **devices** coming with a preinstalled Nextcloud](https://nextcloud.com/devices/)
- [Find a service **provider** who is hosting Nextcloud for you or your company](https://nextcloud.com/providers/)
*Enterprise? Public Sector or Education user? You may want to have a look into the [**Enterprise Support Subscription**](https://nextcloud.com/enterprise/) provided by the Nextcloud GmbH*
## Get in touch
* :clipboard: [Forum](https://help.nextcloud.com)
* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)
## Contribution Guidelines
All contributions to this repository from June, 16 2016 on are considered to be
licensed under the AGPLv3 or any later version.
Nextcloud doesn't require a CLA (Contributor License Agreement).
The copyright belongs to all the individual contributors. Therefore we recommend
that every contributor adds following line to the header of a file, if they
changed it substantially:
```
@copyright Copyright (c) <year>, <your name> (<your email address>)
```
Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
Please review the [guidelines for contributing](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) to this repository.
More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/)
## Running master checkouts
Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
Several apps by default included in regular releases like [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually as required.
That aside Git checkouts can be handled the same as release archives.
Note they should never be used on production systems.
-37
View File
@@ -1,37 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$logger = \OC::$server->getLogger();
$userSession = \OC::$server->getUserSession();
$groupManager = \OC::$server->getGroupManager();
$eventDispatcher = \OC::$server->getEventDispatcher();
$auditLogger = new \OCA\Admin_Audit\AuditLogger(
$logger,
$userSession,
$groupManager,
$eventDispatcher
);
$auditLogger->registerHooks();
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0"?>
<info>
<id>admin_audit</id>
<name>Auditing / Logging</name>
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
<licence>AGPL</licence>
<author>Nextcloud</author>
<version>1.2.0</version>
<dependencies>
<nextcloud min-version="12" max-version="12" />
</dependencies>
<types>
<logging/>
</types>
</info>
-88
View File
@@ -1,88 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
use OCP\ILogger;
class Action {
/** @var ILogger */
private $logger;
/**
* @param ILogger $logger
*/
public function __construct(ILogger $logger) {
$this->logger = $logger;
}
/**
* Log a single action with a log level of info
*
* @param string $text
* @param array $params
* @param array $elements
* @param bool $obfuscateParameters
*/
public function log($text,
array $params,
array $elements,
$obfuscateParameters = false) {
foreach($elements as $element) {
if(!isset($params[$element])) {
if ($obfuscateParameters) {
$this->logger->critical(
'$params["'.$element.'"] was missing.',
['app' => 'admin_audit']
);
} else {
$this->logger->critical(
sprintf(
'$params["'.$element.'"] was missing. Transferred value: %s',
print_r($params, true)
),
['app' => 'admin_audit']
);
}
return;
}
}
$replaceArray = [];
foreach($elements as $element) {
if($params[$element] instanceof \DateTime) {
$params[$element] = $params[$element]->format('Y-m-d H:i:s');
}
$replaceArray[] = $params[$element];
}
$this->logger->info(
vsprintf(
$text,
$replaceArray
),
[
'app' => 'admin_audit'
]
);
}
}
-60
View File
@@ -1,60 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
/**
* Class Auth logs all auth related actions
*
* @package OCA\Admin_Audit\Actions
*/
class Auth extends Action {
public function loginAttempt(array $params) {
$this->log(
'Login attempt: "%s"',
$params,
[
'uid',
],
true
);
}
public function loginSuccessful(array $params) {
$this->log(
'Login successful: "%s"',
$params,
[
'uid',
],
true
);
}
public function logout(array $params) {
$this->log(
'Logout occurred',
[],
[]
);
}
}
-164
View File
@@ -1,164 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
/**
* Class Files logs the actions to files
*
* @package OCA\Admin_Audit\Actions
*/
class Files extends Action {
/**
* Logs file read actions
*
* @param array $params
*/
public function read(array $params) {
$this->log(
'File accessed: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs rename actions of files
*
* @param array $params
*/
public function rename(array $params) {
$this->log(
'File renamed: "%s" to "%s"',
$params,
[
'oldpath',
'newpath',
]
);
}
/**
* Logs creation of files
*
* @param array $params
*/
public function create(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File created: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs copying of files
*
* @param array $params
*/
public function copy(array $params) {
$this->log(
'File copied: "%s" to "%s"',
$params,
[
'oldpath',
'newpath',
]
);
}
/**
* Logs writing of files
*
* @param array $params
*/
public function write(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File written to: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs update of files
*
* @param array $params
*/
public function update(array $params) {
$this->log(
'File updated: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs deletions of files
*
* @param array $params
*/
public function delete(array $params) {
$this->log(
'File deleted: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs preview access to a file
*
* @param array $params
*/
public function preview(array $params) {
$this->log(
'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
$params,
[
'path',
'width',
'height',
'crop',
'mode'
]
);
}
}
@@ -1,108 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
use OCA\Admin_Audit\Actions\Action;
use OCP\IGroup;
use OCP\IUser;
/**
* Class GroupManagement logs all group manager related events
*
* @package OCA\Admin_Audit
*/
class GroupManagement extends Action {
/**
* log add user to group event
*
* @param IGroup $group
* @param IUser $user
*/
public function addUser(IGroup $group, IUser $user) {
$this->log('User "%s" added to group "%s"',
[
'group' => $group->getGID(),
'user' => $user->getUID()
],
[
'user', 'group'
]
);
}
/**
* log remove user from group event
*
* @param IGroup $group
* @param IUser $user
*/
public function removeUser(IGroup $group, IUser $user) {
$this->log('User "%s" removed from group "%s"',
[
'group' => $group->getGID(),
'user' => $user->getUID()
],
[
'user', 'group'
]
);
}
/**
* log create group to group event
*
* @param IGroup $group
*/
public function createGroup(IGroup $group) {
$this->log('Group created: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
/**
* log delete group to group event
*
* @param IGroup $group
*/
public function deleteGroup(IGroup $group) {
$this->log('Group deleted: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
}
-191
View File
@@ -1,191 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
use OCP\Share;
/**
* Class Sharing logs the sharing actions
*
* @package OCA\Admin_Audit\Actions
*/
class Sharing extends Action {
/**
* Logs sharing of data
*
* @param array $params
*/
public function shared(array $params) {
if($params['shareType'] === Share::SHARE_TYPE_LINK) {
$this->log(
'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'permissions',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
$this->log(
'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'shareWith',
'permissions',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
$this->log(
'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'shareWith',
'permissions',
'id',
]
);
}
}
/**
* Logs unsharing of data
*
* @param array $params
*/
public function unshare(array $params) {
if($params['shareType'] === Share::SHARE_TYPE_LINK) {
$this->log(
'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
$this->log(
'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'shareWith',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
$this->log(
'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'shareWith',
'id',
]
);
}
}
/**
* Logs the updating of permission changes for shares
*
* @param array $params
*/
public function updatePermissions(array $params) {
$this->log(
'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
$params,
[
'itemType',
'path',
'itemSource',
'permissions',
]
);
}
/**
* Logs the password changes for a share
*
* @param array $params
*/
public function updatePassword(array $params) {
$this->log(
'The password of the publicly shared %s "%s" with ID "%s" has been changed',
$params,
[
'itemType',
'token',
'itemSource',
]
);
}
/**
* Logs the expiration date changes for a share
*
* @param array $params
*/
public function updateExpirationDate(array $params) {
$this->log(
'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
$params,
[
'itemType',
'itemSource',
'date',
]
);
}
/**
* Logs access of shared files
*
* @param array $params
*/
public function shareAccessed(array $params) {
$this->log(
'The shared %s with the token "%s" by "%s" has been accessed.',
$params,
[
'itemType',
'token',
'uidOwner',
]
);
}
}
-42
View File
@@ -1,42 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
class Trashbin extends Action {
public function delete($params) {
$this->log('File "%s" deleted from trash bin.',
['path' => $params['path']], ['path']
);
}
public function restore($params) {
$this->log('File "%s" restored from trash bin.',
['path' => $params['filePath']], ['path']
);
}
}
@@ -1,98 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
use OCP\IUser;
/**
* Class UserManagement logs all user management related actions.
*
* @package OCA\Admin_Audit\Actions
*/
class UserManagement extends Action {
/**
* Log creation of users
*
* @param array $params
*/
public function create(array $params) {
$this->log(
'User created: "%s"',
$params,
[
'uid',
]
);
}
/**
* Log deletion of users
*
* @param array $params
*/
public function delete(array $params) {
$this->log(
'User deleted: "%s"',
$params,
[
'uid',
]
);
}
/**
* Log enabling of users
*
* @param array $params
*/
public function change(array $params) {
if ($params['feature'] === 'enabled') {
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
}
}
/**
* Logs changing of the user scope
*
* @param IUser $user
*/
public function setPassword(IUser $user) {
if($user->getBackendClassName() === 'Database') {
$this->log(
'Password of user "%s" has been changed',
[
'user' => $user->getUID(),
],
[
'user',
]
);
}
}
}
-47
View File
@@ -1,47 +0,0 @@
<?php
/**
* @copyright Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
class Versions extends Action {
public function rollback($params) {
$this->log('Version "%s" of "%s" was restored.',
[
'version' => $params['revision'],
'path' => $params['path']
],
['version', 'path']
);
}
public function delete($params) {
$this->log('Version "%s" was deleted.',
['path' => $params['path']],
['path']
);
}
}
-209
View File
@@ -1,209 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit;
use OC\Files\Filesystem;
use OC\Files\Node\File;
use OCA\Admin_Audit\Actions\Auth;
use OCA\Admin_Audit\Actions\Files;
use OCA\Admin_Audit\Actions\GroupManagement;
use OCA\Admin_Audit\Actions\Sharing;
use OCA\Admin_Audit\Actions\Trashbin;
use OCA\Admin_Audit\Actions\UserManagement;
use OCA\Admin_Audit\Actions\Versions;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IPreview;
use OCP\IUserSession;
use OCP\Util;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
class AuditLogger {
/** @var ILogger */
private $logger;
/** @var IUserSession */
private $userSession;
/** @var IGroupManager */
private $groupManager;
/**
* AuditLogger constructor.
*
* @param ILogger $logger
* @param IUserSession $userSession
* @param IGroupManager $groupManager
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(ILogger $logger,
IUserSession $userSession,
IGroupManager $groupManager,
EventDispatcherInterface $eventDispatcher) {
$this->logger = $logger;
$this->userSession = $userSession;
$this->groupManager = $groupManager;
$this->eventDispatcher = $eventDispatcher;
}
/**
* Register hooks in order to log them
*/
public function registerHooks() {
$this->userManagementHooks();
$this->groupHooks();
$this->sharingHooks();
$this->authHooks();
$this->fileHooks();
$this->trashbinHooks();
$this->versionsHooks();
}
/**
* Connect to user management hooks
*/
private function userManagementHooks() {
$userActions = new UserManagement($this->logger);
Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
}
private function groupHooks() {
$groupActions = new GroupManagement($this->logger);
$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
$this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
$this->groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
$this->groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
}
/**
* connect to sharing events
*/
private function sharingHooks() {
$shareActions = new Sharing($this->logger);
Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
}
/**
* connect to authentication event and related actions
*/
private function authHooks() {
$authActions = new Auth($this->logger);
Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
Util::connectHook('OC_User', 'logout', $authActions, 'logout');
}
/**
* Connect to file hooks
*/
private function fileHooks() {
$fileActions = new Files($this->logger);
$this->eventDispatcher->addListener(
IPreview::EVENT,
function(GenericEvent $event) use ($fileActions) {
/** @var File $file */
$file = $event->getSubject();
$fileActions->preview([
'path' => substr($file->getInternalPath(), 5),
'width' => $event->getArguments()['width'],
'height' => $event->getArguments()['height'],
'crop' => $event->getArguments()['crop'],
'mode' => $event->getArguments()['mode']
]);
}
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_rename,
$fileActions,
'rename'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
$fileActions,
'create'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
$fileActions,
'copy'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
$fileActions,
'write'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_update,
$fileActions,
'update'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_read,
$fileActions,
'read'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_delete,
$fileActions,
'delete'
);
}
public function versionsHooks() {
$versionsActions = new Versions($this->logger);
Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
}
/**
* Connect to trash bin hooks
*/
private function trashbinHooks() {
$trashActions = new Trashbin($this->logger);
Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
}
}
-70
View File
@@ -1,70 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
$eventDispatcher = \OC::$server->getEventDispatcher();
$eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function() {
\OCP\Util::addScript('oc-backbone-webdav');
\OCP\Util::addScript('comments', 'merged');
\OCP\Util::addStyle('comments', 'comments');
}
);
$eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
$event->addEntityCollection('files', function($name) {
$nodes = \OC::$server->getUserFolder()->getById(intval($name));
return !empty($nodes);
});
});
$notificationManager = \OC::$server->getNotificationManager();
$notificationManager->registerNotifier(
function() {
$application = new \OCP\AppFramework\App('comments');
return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
},
function () {
$l = \OC::$server->getL10N('comments');
return ['id' => 'comments', 'name' => $l->t('Comments')];
}
);
$commentsManager = \OC::$server->getCommentsManager();
$commentsManager->registerEventHandler(function () {
$application = new \OCP\AppFramework\App('comments');
/** @var \OCA\Comments\EventHandler $handler */
$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
return $handler;
});
$commentsManager->registerDisplayNameResolver('user', function($id) {
$manager = \OC::$server->getUserManager();
$user = $manager->get($id);
if(is_null($user)) {
$l = \OC::$server->getL10N('comments');
$displayName = $l->t('Unknown user');
} else {
$displayName = $user->getDisplayName();
}
return $displayName;
});
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0"?>
<info>
<id>comments</id>
<name>Comments</name>
<description>Files app plugin to add comments to files</description>
<licence>AGPL</licence>
<author>Arthur Schiwon, Vincent Petry</author>
<default_enable/>
<version>1.2.0</version>
<dependencies>
<nextcloud min-version="12" max-version="12" />
</dependencies>
<types>
<logging/>
</types>
<activity>
<settings>
<setting>OCA\Comments\Activity\Setting</setting>
</settings>
<filters>
<filter>OCA\Comments\Activity\Filter</filter>
</filters>
<providers>
<provider>OCA\Comments\Activity\Provider</provider>
</providers>
</activity>
</info>
-28
View File
@@ -1,28 +0,0 @@
<?php
/**
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
use \OCA\Comments\AppInfo\Application;
$application = new Application();
$application->registerRoutes($this, ['routes' => [
['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
]]);
-174
View File
@@ -1,174 +0,0 @@
/*
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
#commentsTabView .emptycontent {
margin-top: 0;
}
#commentsTabView .newCommentForm {
position: relative;
margin-bottom: 20px;
}
#commentsTabView .newCommentForm .message {
width: calc(100% - 81px); /* 36 (left margin) + 30 (right padding) + 15 (right padding of surrounding box) */
margin-left: 36px;
padding-right: 30px;
display: block;
}
#commentsTabView .newCommentForm .submit {
position: absolute;
bottom: 0px;
right: 8px;
width: 30px;
margin: 0;
padding: 7px 9px;
background-color: transparent;
border: none;
opacity: .3;
}
#commentsTabView .newCommentForm .submit:hover,
#commentsTabView .newCommentForm .submit:focus {
opacity: 1;
}
#commentsTabView .newCommentForm .submitLoading {
background-position: left;
}
#commentsTabView .newCommentForm .cancel {
margin-right: 6px;
}
#commentsTabView .newCommentForm textarea {
resize: none;
}
#commentsTabView .comment {
position: relative;
margin-bottom: 30px;
}
#commentsTabView .comment .avatar {
width: 32px;
height: 32px;
line-height: 32px;
}
#commentsTabView .comment .message .avatar {
display: inline-block;
}
#activityTabView li.comment.collapsed .activitymessage,
#commentsTabView .comment.collapsed .message {
white-space: pre-wrap;
}
#activityTabView li.comment.collapsed .activitymessage,
#commentsTabView .comment.collapsed .message {
max-height: 70px;
overflow: hidden;
}
#activityTabView li.comment .message-overlay,
#commentsTabView .comment .message-overlay {
display: none;
}
#activityTabView li.comment.collapsed .message-overlay,
#commentsTabView .comment.collapsed .message-overlay {
display: block;
position: absolute;
z-index: 2;
height: 50px;
pointer-events: none;
left: 0;
right: 0;
bottom: 0;
background: -moz-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -o-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: -ms-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00FFFFFF', endColorstr='#FFFFFFFF');
background-repeat: no-repeat;
}
#commentsTabView .authorRow>div {
display: inline-block;
vertical-align: middle;
}
#commentsTabView .authorRow>div.hidden {
display: none !important;
}
#commentsTabView .comments li .message .avatar-name-wrapper,
#commentsTabView .comment .authorRow {
position: relative;
cursor: pointer;
}
#commentsTabView .comment .author,
#commentsTabView .comment .date {
opacity: .5;
}
#commentsTabView .comment .author {
margin-left: 5px;
}
#commentsTabView .comment .date {
position: absolute;
right: 0;
top: 5px;
}
#commentsTabView .comments li .message {
padding-left: 40px;
}
#commentsTabView .comment .action {
opacity: 0;
vertical-align: middle;
display: inline-block;
}
#commentsTabView .comment:hover .action {
opacity: 0.3;
}
#commentsTabView .comment .action:hover {
opacity: 1;
}
#commentsTabView .comment .action.delete {
position: absolute;
right: 0;
}
#commentsTabView .comment.disabled {
opacity: 0.3;
}
#commentsTabView .comment.disabled .action {
visibility: hidden;
}
#commentsTabView .message.error {
color: #e9322d;
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7;
}
.app-files .action-comment {
padding: 16px 14px;
}
-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#000" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>

Before

Width:  |  Height:  |  Size: 243 B

-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#fff" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>

Before

Width:  |  Height:  |  Size: 242 B

-59
View File
@@ -1,59 +0,0 @@
/*
* @author Joas Schilling <coding@schilljs.com>
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*/
(function() {
OCA.Comments.ActivityTabViewPlugin = {
/**
* Prepare activity for display
*
* @param {OCA.Activity.ActivityModel} model for this activity
* @param {jQuery} $el jQuery handle for this activity
* @param {string} view The view that displayes this activity
*/
prepareModelForDisplay: function (model, $el, view) {
if (model.get('app') !== 'comments' || model.get('type') !== 'comments') {
return;
}
if (view === 'ActivityTabView') {
$el.addClass('comment');
if (model.get('message') && this._isLong(model.get('message'))) {
$el.addClass('collapsed');
var $overlay = $('<div>').addClass('message-overlay');
$el.find('.activitymessage').after($overlay);
$el.on('click', this._onClickCollapsedComment);
}
}
},
/*
* Copy of CommentsTabView._onClickComment()
*/
_onClickCollapsedComment: function(ev) {
var $row = $(ev.target);
if (!$row.is('.comment')) {
$row = $row.closest('.comment');
}
$row.removeClass('collapsed');
},
/*
* Copy of CommentsTabView._isLong()
*/
_isLong: function(message) {
return message.length > 250 || (message.match(/\n/g) || []).length > 1;
}
};
})();
OC.Plugins.register('OCA.Activity.RenderingPlugins', OCA.Comments.ActivityTabViewPlugin);
-20
View File
@@ -1,20 +0,0 @@
/*
* Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
(function() {
if (!OCA.Comments) {
/**
* @namespace
*/
OCA.Comments = {};
}
})();
-167
View File
@@ -1,167 +0,0 @@
/*
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
(function(OC, OCA) {
/**
* @class OCA.Comments.CommentCollection
* @classdesc
*
* Collection of comments assigned to a file
*
*/
var CommentCollection = OC.Backbone.Collection.extend(
/** @lends OCA.Comments.CommentCollection.prototype */ {
sync: OC.Backbone.davSync,
model: OCA.Comments.CommentModel,
/**
* Object type
*
* @type string
*/
_objectType: 'files',
/**
* Object id
*
* @type string
*/
_objectId: null,
/**
* True if there are no more page results left to fetch
*
* @type bool
*/
_endReached: false,
/**
* Number of comments to fetch per page
*
* @type int
*/
_limit : 20,
/**
* Initializes the collection
*
* @param {string} [options.objectType] object type
* @param {string} [options.objectId] object id
*/
initialize: function(models, options) {
options = options || {};
if (options.objectType) {
this._objectType = options.objectType;
}
if (options.objectId) {
this._objectId = options.objectId;
}
},
url: function() {
return OC.linkToRemote('dav') + '/comments/' +
encodeURIComponent(this._objectType) + '/' +
encodeURIComponent(this._objectId) + '/';
},
setObjectId: function(objectId) {
this._objectId = objectId;
},
hasMoreResults: function() {
return !this._endReached;
},
reset: function() {
this._endReached = false;
this._summaryModel = null;
return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
},
/**
* Fetch the next set of results
*/
fetchNext: function(options) {
var self = this;
if (!this.hasMoreResults()) {
return null;
}
var body = '<?xml version="1.0" encoding="utf-8" ?>\n' +
'<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">\n' +
// load one more so we know there is more
' <oc:limit>' + (this._limit + 1) + '</oc:limit>\n' +
' <oc:offset>' + this.length + '</oc:offset>\n' +
'</oc:filter-comments>\n';
options = options || {};
var success = options.success;
options = _.extend({
remove: false,
parse: true,
data: body,
davProperties: CommentCollection.prototype.model.prototype.davProperties,
success: function(resp) {
if (resp.length <= self._limit) {
// no new entries, end reached
self._endReached = true;
} else {
// remove last entry, for next page load
resp = _.initial(resp);
}
if (!self.set(resp, options)) {
return false;
}
if (success) {
success.apply(null, arguments);
}
self.trigger('sync', 'REPORT', self, options);
}
}, options);
return this.sync('REPORT', this, options);
},
/**
* Returns the matching summary model
*
* @return {OCA.Comments.CommentSummaryModel} summary model
*/
getSummaryModel: function() {
if (!this._summaryModel) {
this._summaryModel = new OCA.Comments.CommentSummaryModel({
id: this._objectId,
objectType: this._objectType
});
}
return this._summaryModel;
},
/**
* Updates the read marker for this comment thread
*
* @param {Date} [date] optional date, defaults to now
* @param {Object} [options] backbone options
*/
updateReadMarker: function(date, options) {
options = options || {};
return this.getSummaryModel().save({
readMarker: (date || new Date()).toUTCString()
}, options);
}
});
OCA.Comments.CommentCollection = CommentCollection;
})(OC, OCA);
-93
View File
@@ -1,93 +0,0 @@
/*
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
(function(OC, OCA) {
_.extend(OC.Files.Client, {
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
PROPERTY_ACTORTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
PROPERTY_ACTORID: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
PROPERTY_ISUNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
PROPERTY_OBJECTID: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectId',
PROPERTY_OBJECTTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectType',
PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions'
});
/**
* @class OCA.Comments.CommentModel
* @classdesc
*
* Comment
*
*/
var CommentModel = OC.Backbone.Model.extend(
/** @lends OCA.Comments.CommentModel.prototype */ {
sync: OC.Backbone.davSync,
defaults: {
actorType: 'users',
objectType: 'files'
},
davProperties: {
'id': OC.Files.Client.PROPERTY_FILEID,
'message': OC.Files.Client.PROPERTY_MESSAGE,
'actorType': OC.Files.Client.PROPERTY_ACTORTYPE,
'actorId': OC.Files.Client.PROPERTY_ACTORID,
'actorDisplayName': OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
'creationDateTime': OC.Files.Client.PROPERTY_CREATIONDATETIME,
'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE,
'objectId': OC.Files.Client.PROPERTY_OBJECTID,
'isUnread': OC.Files.Client.PROPERTY_ISUNREAD,
'mentions': OC.Files.Client.PROPERTY_MENTIONS
},
parse: function(data) {
return {
id: data.id,
message: data.message,
actorType: data.actorType,
actorId: data.actorId,
actorDisplayName: data.actorDisplayName,
creationDateTime: data.creationDateTime,
objectType: data.objectType,
objectId: data.objectId,
isUnread: (data.isUnread === 'true'),
mentions: this._parseMentions(data.mentions)
};
},
_parseMentions: function(mentions) {
if(_.isUndefined(mentions)) {
return {};
}
var result = {};
for(var i in mentions) {
var mention = mentions[i];
if(_.isUndefined(mention.localName) || mention.localName !== 'mention') {
continue;
}
result[i] = {};
for (var child = mention.firstChild; child; child = child.nextSibling) {
if(_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
continue;
}
result[i][child.localName] = child.textContent;
}
}
return result;
}
});
OCA.Comments.CommentModel = CommentModel;
})(OC, OCA);
-526
View File
@@ -1,526 +0,0 @@
/*
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
/* global Handlebars, escapeHTML */
(function(OC, OCA) {
var TEMPLATE =
'<ul class="comments">' +
'</ul>' +
'<div class="emptycontent hidden"><div class="icon-comment"></div>' +
'<p>{{emptyResultLabel}}</p></div>' +
'<input type="button" class="showMore hidden" value="{{moreLabel}}"' +
' name="show-more" id="show-more" />' +
'<div class="loading hidden" style="height: 50px"></div>';
var EDIT_COMMENT_TEMPLATE =
'<div class="newCommentRow comment" data-id="{{id}}">' +
' <div class="authorRow">' +
' <div class="avatar" data-username="{{actorId}}"></div>' +
' <div class="author">{{actorDisplayName}}</div>' +
'{{#if isEditMode}}' +
' <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
'{{/if}}' +
' </div>' +
' <form class="newCommentForm">' +
' <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
' <input class="submit icon-confirm" type="submit" value="" />' +
'{{#if isEditMode}}' +
' <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
'{{/if}}' +
' <div class="submitLoading icon-loading-small hidden"></div>'+
' </form>' +
'</div>';
var COMMENT_TEMPLATE =
'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
' <div class="authorRow">' +
' <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
' <div class="author">{{actorDisplayName}}</div>' +
'{{#if isUserAuthor}}' +
' <a href="#" class="action edit icon icon-rename has-tooltip" title="{{editTooltip}}"></a>' +
'{{/if}}' +
' <div class="date has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>' +
' </div>' +
' <div class="message">{{{formattedMessage}}}</div>' +
'{{#if isLong}}' +
' <div class="message-overlay"></div>' +
'{{/if}}' +
'</li>';
/**
* @memberof OCA.Comments
*/
var CommentsTabView = OCA.Files.DetailTabView.extend(
/** @lends OCA.Comments.CommentsTabView.prototype */ {
id: 'commentsTabView',
className: 'tab commentsTabView',
events: {
'submit .newCommentForm': '_onSubmitComment',
'click .showMore': '_onClickShowMore',
'click .action.edit': '_onClickEditComment',
'click .action.delete': '_onClickDeleteComment',
'click .cancel': '_onClickCloseComment',
'click .comment': '_onClickComment'
},
_commentMaxLength: 1000,
initialize: function() {
OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments);
this.collection = new OCA.Comments.CommentCollection();
this.collection.on('request', this._onRequest, this);
this.collection.on('sync', this._onEndRequest, this);
this.collection.on('add', this._onAddModel, this);
this._commentMaxThreshold = this._commentMaxLength * 0.9;
// TODO: error handling
_.bindAll(this, '_onTypeComment');
},
template: function(params) {
if (!this._template) {
this._template = Handlebars.compile(TEMPLATE);
}
var currentUser = OC.getCurrentUser();
return this._template(_.extend({
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName
}, params));
},
editCommentTemplate: function(params) {
if (!this._editCommentTemplate) {
this._editCommentTemplate = Handlebars.compile(EDIT_COMMENT_TEMPLATE);
}
var currentUser = OC.getCurrentUser();
return this._editCommentTemplate(_.extend({
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName,
newMessagePlaceholder: t('comments', 'New comment …'),
deleteTooltip: t('comments', 'Delete comment'),
submitText: t('comments', 'Post'),
cancelText: t('comments', 'Cancel')
}, params));
},
commentTemplate: function(params) {
if (!this._commentTemplate) {
this._commentTemplate = Handlebars.compile(COMMENT_TEMPLATE);
}
params = _.extend({
editTooltip: t('comments', 'Edit comment'),
isUserAuthor: OC.getCurrentUser().uid === params.actorId,
isLong: this._isLong(params.message)
}, params);
if (params.actorType === 'deleted_users') {
// makes the avatar a X
params.actorId = null;
params.actorDisplayName = t('comments', '[Deleted user]');
}
return this._commentTemplate(params);
},
getLabel: function() {
return t('comments', 'Comments');
},
setFileInfo: function(fileInfo) {
if (fileInfo) {
this.model = fileInfo;
this.render();
this.collection.setObjectId(fileInfo.id);
// reset to first page
this.collection.reset([], {silent: true});
this.nextPage();
} else {
this.model = null;
this.render();
this.collection.reset();
}
},
render: function() {
this.$el.html(this.template({
emptyResultLabel: t('comments', 'No comments yet, start the conversation!'),
moreLabel: t('comments', 'More comments …')
}));
this.$el.find('.comments').before(this.editCommentTemplate({}));
this.$el.find('.has-tooltip').tooltip();
this.$container = this.$el.find('ul.comments');
this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32);
this.delegateEvents();
this.$el.find('.message').on('keydown input change', this._onTypeComment);
autosize(this.$el.find('.newCommentRow textarea'))
},
_formatItem: function(commentModel) {
var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
var data = _.extend({
timestamp: timestamp,
date: OC.Util.relativeModifiedDate(timestamp),
altDate: OC.Util.formatDate(timestamp),
formattedMessage: this._formatMessage(commentModel.get('message'), commentModel.get('mentions'))
}, commentModel.attributes);
return data;
},
_toggleLoading: function(state) {
this._loading = state;
this.$el.find('.loading').toggleClass('hidden', !state);
},
_onRequest: function(type) {
if (type === 'REPORT') {
this._toggleLoading(true);
this.$el.find('.showMore').addClass('hidden');
}
},
_onEndRequest: function(type) {
var fileInfoModel = this.model;
this._toggleLoading(false);
this.$el.find('.emptycontent').toggleClass('hidden', !!this.collection.length);
this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults());
if (type !== 'REPORT') {
return;
}
// find first unread comment
var firstUnreadComment = this.collection.findWhere({isUnread: true});
if (firstUnreadComment) {
// update read marker
this.collection.updateReadMarker(
null,
{
success: function() {
fileInfoModel.set('commentsUnread', 0);
}
}
);
}
},
_onAddModel: function(model, collection, options) {
var $el = $(this.commentTemplate(this._formatItem(model)));
if (!_.isUndefined(options.at) && collection.length > 1) {
this.$container.find('li').eq(options.at).before($el);
} else {
this.$container.append($el);
}
this._postRenderItem($el);
},
_postRenderItem: function($el) {
$el.find('.has-tooltip').tooltip();
$el.find('.avatar').each(function() {
var $this = $(this);
$this.avatar($this.attr('data-username'), 32);
});
var username = $el.find('.avatar').data('username');
if (username !== oc_current_user) {
$el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
username, 0, $el.find('.authorRow'));
}
var $message = $el.find('.message');
this._postRenderMessage($message);
},
_postRenderMessage: function($el) {
$el.find('.avatar').each(function() {
var avatar = $(this);
var strong = $(this).next();
var appendTo = $(this).parent();
$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
});
},
/**
* Convert a message to be displayed in HTML,
* converts newlines to <br> tags.
*/
_formatMessage: function(message, mentions) {
message = escapeHTML(message).replace(/\n/g, '<br/>');
for(var i in mentions) {
var mention = '@' + mentions[i].mentionId;
var avatar = '<div class="avatar" '
+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
+' data-user-display-name="'
+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
// escape possible regex characters in the name
mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
var displayName = ''
+ '<span class="avatar-name-wrapper">'
+ avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>'
+ '</span>';
// replace every mention either at the start of the input or after a whitespace
// followed by a non-word character.
message = message.replace(new RegExp("(^|\\s)(" + mention + ")\\b", 'g'),
function(match, p1) {
// to get number of whitespaces (0 vs 1) right
return p1+displayName;
}
);
}
return message;
},
nextPage: function() {
if (this._loading || !this.collection.hasMoreResults()) {
return;
}
this.collection.fetchNext();
},
_onClickEditComment: function(ev) {
ev.preventDefault();
var $comment = $(ev.target).closest('.comment');
var commentId = $comment.data('id');
var commentToEdit = this.collection.get(commentId);
var $formRow = $(this.editCommentTemplate(_.extend({
isEditMode: true,
submitText: t('comments', 'Save')
}, commentToEdit.attributes)));
$comment.addClass('hidden').removeClass('collapsed');
// spawn form
$comment.after($formRow);
$formRow.data('commentEl', $comment);
$formRow.find('textarea').on('keydown input change', this._onTypeComment);
// copy avatar element from original to avoid flickering
$formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone());
$formRow.find('.has-tooltip').tooltip();
// Enable autosize
autosize($formRow.find('textarea'));
return false;
},
_onTypeComment: function(ev) {
var $field = $(ev.target);
var len = $field.val().length;
var $submitButton = $field.data('submitButtonEl');
if (!$submitButton) {
$submitButton = $field.closest('form').find('.submit');
$field.data('submitButtonEl', $submitButton);
}
$field.tooltip('hide');
if (len > this._commentMaxThreshold) {
$field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', {count: len, max: this._commentMaxLength}));
$field.tooltip({trigger: 'manual'});
$field.tooltip('show');
$field.addClass('error');
}
var limitExceeded = (len > this._commentMaxLength);
$field.toggleClass('error', limitExceeded);
$submitButton.prop('disabled', limitExceeded);
//submits form on ctrl+Enter or cmd+Enter
if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
$submitButton.click();
}
},
_onClickComment: function(ev) {
var $row = $(ev.target);
if (!$row.is('.comment')) {
$row = $row.closest('.comment');
}
$row.removeClass('collapsed');
},
_onClickCloseComment: function(ev) {
ev.preventDefault();
var $row = $(ev.target).closest('.comment');
$row.data('commentEl').removeClass('hidden');
$row.remove();
return false;
},
_onClickDeleteComment: function(ev) {
ev.preventDefault();
var $comment = $(ev.target).closest('.comment');
var commentId = $comment.data('id');
var $loading = $comment.find('.submitLoading');
$comment.addClass('disabled');
$loading.removeClass('hidden');
this.collection.get(commentId).destroy({
success: function() {
$comment.data('commentEl').remove();
$comment.remove();
},
error: function() {
$loading.addClass('hidden');
$comment.removeClass('disabled');
OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId}));
}
});
return false;
},
_onClickShowMore: function(ev) {
ev.preventDefault();
this.nextPage();
},
/**
* takes care of updating comment elements after submit (either new
* comment or edit).
*
* @param {OC.Backbone.Model} model
* @param {jQuery} $form
* @param {string|undefined} commentId
* @private
*/
_onSubmitSuccess: function(model, $form, commentId) {
var self = this;
var $submit = $form.find('.submit');
var $loading = $form.find('.submitLoading');
var $textArea = $form.find('.message');
model.fetch({
success: function(model) {
$submit.removeClass('hidden');
$loading.addClass('hidden');
var $target;
if(!_.isUndefined(commentId)) {
var $row = $form.closest('.comment');
$target = $row.data('commentEl');
$target.removeClass('hidden');
$row.remove();
} else {
$target = $('.commentsTabView .comments').find('li:first');
$textArea.val('').prop('disabled', false);
}
var $message = $target.find('.message');
$message
.html(self._formatMessage(model.get('message'), model.get('mentions')))
.find('.avatar')
.each(function () { $(this).avatar(); });
self._postRenderMessage($message);
},
error: function () {
self._onSubmitError($form, commentId);
}
});
},
_onSubmitComment: function(e) {
var self = this;
var $form = $(e.target);
var commentId = $form.closest('.comment').data('id');
var currentUser = OC.getCurrentUser();
var $submit = $form.find('.submit');
var $loading = $form.find('.submitLoading');
var $textArea = $form.find('.message');
var message = $textArea.val().trim();
e.preventDefault();
if (!message.length || message.length > this._commentMaxLength) {
return;
}
$textArea.prop('disabled', true);
$submit.addClass('hidden');
$loading.removeClass('hidden');
if (commentId) {
// edit mode
var comment = this.collection.get(commentId);
comment.save({
message: $textArea.val()
}, {
success: function(model) {
self._onSubmitSuccess(model, $form, commentId);
},
error: function() {
self._onSubmitError($form, commentId);
}
});
} else {
this.collection.create({
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName,
actorType: 'users',
verb: 'comment',
message: $textArea.val(),
creationDateTime: (new Date()).toUTCString()
}, {
at: 0,
// wait for real creation before adding
wait: true,
success: function(model) {
self._onSubmitSuccess(model, $form);
},
error: function() {
self._onSubmitError($form);
}
});
}
return false;
},
/**
* takes care of updating the UI after an error on submit (either new
* comment or edit).
*
* @param {jQuery} $form
* @param {string|undefined} commentId
* @private
*/
_onSubmitError: function($form, commentId) {
$form.find('.submit').removeClass('hidden');
$form.find('.submitLoading').addClass('hidden');
$form.find('.message').prop('disabled', false);
if(!_.isUndefined(commentId)) {
OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'});
} else {
OC.Notification.show(t('comments', 'Error occurred while posting comment'), {type: 'error'});
}
},
/**
* Returns whether the given message is long and needs
* collapsing
*/
_isLong: function(message) {
return message.length > 250 || (message.match(/\n/g) || []).length > 1;
}
});
OCA.Comments.CommentsTabView = CommentsTabView;
})(OC, OCA);
-68
View File
@@ -1,68 +0,0 @@
/*
* Copyright (c) 2016
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
(function(OC, OCA) {
_.extend(OC.Files.Client, {
PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker'
});
/**
* @class OCA.Comments.CommentSummaryModel
* @classdesc
*
* Model containing summary information related to comments
* like the read marker.
*
*/
var CommentSummaryModel = OC.Backbone.Model.extend(
/** @lends OCA.Comments.CommentSummaryModel.prototype */ {
sync: OC.Backbone.davSync,
/**
* Object type
*
* @type string
*/
_objectType: 'files',
/**
* Object id
*
* @type string
*/
_objectId: null,
davProperties: {
'readMarker': OC.Files.Client.PROPERTY_READMARKER
},
/**
* Initializes the summary model
*
* @param {string} [options.objectType] object type
* @param {string} [options.objectId] object id
*/
initialize: function(attrs, options) {
options = options || {};
if (options.objectType) {
this._objectType = options.objectType;
}
},
url: function() {
return OC.linkToRemote('dav') + '/comments/' +
encodeURIComponent(this._objectType) + '/' +
encodeURIComponent(this.id) + '/';
}
});
OCA.Comments.CommentSummaryModel = CommentSummaryModel;
})(OC, OCA);
-126
View File
@@ -1,126 +0,0 @@
/*
* Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
/* global Handlebars */
(function() {
_.extend(OC.Files.Client, {
PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread'
});
var TEMPLATE_COMMENTS_UNREAD =
'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
'<img class="svg" src="{{iconUrl}}"/>' +
'</a>';
OCA.Comments = _.extend({}, OCA.Comments);
if (!OCA.Comments) {
/**
* @namespace
*/
OCA.Comments = {};
}
/**
* @namespace
*/
OCA.Comments.FilesPlugin = {
ignoreLists: [
'files_trashbin',
'files.public'
],
_formatCommentCount: function(count) {
if (!this._commentsUnreadTemplate) {
this._commentsUnreadTemplate = Handlebars.compile(TEMPLATE_COMMENTS_UNREAD);
}
return this._commentsUnreadTemplate({
count: count,
countMessage: n('comments', '%n unread comment', '%n unread comments', count),
iconUrl: OC.imagePath('core', 'actions/comment')
});
},
attach: function(fileList) {
var self = this;
if (this.ignoreLists.indexOf(fileList.id) >= 0) {
return;
}
fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView'));
var oldGetWebdavProperties = fileList._getWebdavProperties;
fileList._getWebdavProperties = function() {
var props = oldGetWebdavProperties.apply(this, arguments);
props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD);
return props;
};
fileList.filesClient.addFileInfoParser(function(response) {
var data = {};
var props = response.propStat[0].properties;
var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];
if (!_.isUndefined(commentsUnread) && commentsUnread !== '') {
data.commentsUnread = parseInt(commentsUnread, 10);
}
return data;
});
fileList.$el.addClass('has-comments');
var oldCreateRow = fileList._createRow;
fileList._createRow = function(fileData) {
var $tr = oldCreateRow.apply(this, arguments);
if (fileData.commentsUnread) {
$tr.attr('data-comments-unread', fileData.commentsUnread);
}
return $tr;
};
// register "comment" action for reading comments
fileList.fileActions.registerAction({
name: 'Comment',
displayName: t('comments', 'Comment'),
mime: 'all',
permissions: OC.PERMISSION_READ,
type: OCA.Files.FileActions.TYPE_INLINE,
render: function(actionSpec, isDefault, context) {
var $file = context.$file;
var unreadComments = $file.data('comments-unread');
if (unreadComments) {
var $actionLink = $(self._formatCommentCount(unreadComments));
context.$file.find('a.name>span.fileactions').append($actionLink);
return $actionLink;
}
return '';
},
actionHandler: function(fileName, context) {
context.$file.find('.action-comment').tooltip('hide');
// open sidebar in comments section
context.fileList.showDetailsView(fileName, 'commentsTabView');
}
});
// add attribute to "elementToFile"
var oldElementToFile = fileList.elementToFile;
fileList.elementToFile = function($el) {
var fileInfo = oldElementToFile.apply(this, arguments);
var commentsUnread = $el.data('comments-unread');
if (commentsUnread) {
fileInfo.commentsUnread = commentsUnread;
}
return fileInfo;
};
}
};
})();
OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin);
-9
View File
@@ -1,9 +0,0 @@
[
"app.js",
"commentmodel.js",
"commentcollection.js",
"commentsummarymodel.js",
"commentstabview.js",
"filesplugin.js",
"activitytabviewplugin.js"
]
-36
View File
@@ -1,36 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Wysig kommentaar",
"Delete comment" : "Skrap kommentaar",
"New comment …" : "Nuwe kommentaar…",
"Post" : "Plaas",
"Cancel" : "Kanselleer",
"[Deleted user]" : "[Geskrapte gebruiker]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
"More comments …" : "Nog kommentare …",
"Save" : "Bewaar",
"Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
"Error occurred while retrieving comment with ID {id}" : "n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
"Error occurred while updating comment with id {id}" : "n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
"Error occurred while posting comment" : "n Fout het voorgekom toe kommentaar geplaas is",
"_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
"{author} commented" : "{outeur} het kommentaar gelewer",
"You commented on %1$s" : "U het op %1$s kommentaar gelewer",
"You commented on {file}" : "U het op {lêer} kommentaar gelewer",
"%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
"{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in n kommentaar oor “{lêer}” genoem",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “%s” genoem",
"A (now) deleted user mentioned you in a comment on “{file}”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “{lêer}” genoem",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is."
},
"nplurals=2; plural=(n != 1);");
-34
View File
@@ -1,34 +0,0 @@
{ "translations": {
"Edit comment" : "Wysig kommentaar",
"Delete comment" : "Skrap kommentaar",
"New comment …" : "Nuwe kommentaar…",
"Post" : "Plaas",
"Cancel" : "Kanselleer",
"[Deleted user]" : "[Geskrapte gebruiker]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
"More comments …" : "Nog kommentare …",
"Save" : "Bewaar",
"Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
"Error occurred while retrieving comment with ID {id}" : "n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
"Error occurred while updating comment with id {id}" : "n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
"Error occurred while posting comment" : "n Fout het voorgekom toe kommentaar geplaas is",
"_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
"{author} commented" : "{outeur} het kommentaar gelewer",
"You commented on %1$s" : "U het op %1$s kommentaar gelewer",
"You commented on {file}" : "U het op {lêer} kommentaar gelewer",
"%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
"{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in n kommentaar oor “{lêer}” genoem",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “%s” genoem",
"A (now) deleted user mentioned you in a comment on “{file}”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “{lêer}” genoem",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-6
View File
@@ -1,6 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Kanselleer"
},
"nplurals=2; plural=(n != 1);");
-4
View File
@@ -1,4 +0,0 @@
{ "translations": {
"Cancel" : "Kanselleer"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-26
View File
@@ -1,26 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "تعديل التعليق",
"Delete comment" : "حذف التعليق",
"New comment …" : "تعليق جديد",
"Post" : "ارسال",
"Cancel" : "إلغاء",
"[Deleted user]" : "[مستخدم محذوف]",
"Comments" : "تعليقات",
"No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
"More comments …" : "مزيد من التعليقات...",
"Save" : "حفظ",
"Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
"Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
"Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
"Comment" : "تعليق",
"You commented" : "قمت بكتابة تعليق",
"%1$s commented" : "%1$s كتب تعليق",
"You commented on {file}" : "علقت على {file}",
"%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
"{author} commented on {file}" : "{author} علّق على {file}",
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
"Unknown user" : "مستخدم غير معروف"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
-24
View File
@@ -1,24 +0,0 @@
{ "translations": {
"Edit comment" : "تعديل التعليق",
"Delete comment" : "حذف التعليق",
"New comment …" : "تعليق جديد",
"Post" : "ارسال",
"Cancel" : "إلغاء",
"[Deleted user]" : "[مستخدم محذوف]",
"Comments" : "تعليقات",
"No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
"More comments …" : "مزيد من التعليقات...",
"Save" : "حفظ",
"Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
"Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
"Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
"Comment" : "تعليق",
"You commented" : "قمت بكتابة تعليق",
"%1$s commented" : "%1$s كتب تعليق",
"You commented on {file}" : "علقت على {file}",
"%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
"{author} commented on {file}" : "{author} علّق على {file}",
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
"Unknown user" : "مستخدم غير معروف"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
}
-33
View File
@@ -1,33 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentariu",
"Delete comment" : "Desaniciar comentariu",
"New comment …" : "Comentariu nuevu...",
"Post" : "Espublizar",
"Cancel" : "Encaboxar",
"[Deleted user]" : "[Usuariu desaniciáu]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
"More comments …" : "Más comentarios...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
"Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
"Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
"_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
"Comment" : "Comentariu",
"You commented" : "Comentesti",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Comentesti en %1$s",
"You commented on {file}" : "Comentesti en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
"Unknown user" : "Usuariu desconocíu",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
},
"nplurals=2; plural=(n != 1);");
-31
View File
@@ -1,31 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentariu",
"Delete comment" : "Desaniciar comentariu",
"New comment …" : "Comentariu nuevu...",
"Post" : "Espublizar",
"Cancel" : "Encaboxar",
"[Deleted user]" : "[Usuariu desaniciáu]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
"More comments …" : "Más comentarios...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
"Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
"Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
"_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
"Comment" : "Comentariu",
"You commented" : "Comentesti",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Comentesti en %1$s",
"You commented on {file}" : "Comentesti en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
"Unknown user" : "Usuariu desconocíu",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Dayandır",
"Save" : "Saxla",
"Comment" : "Komentariya"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Dayandır",
"Save" : "Saxla",
"Comment" : "Komentariya"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-35
View File
@@ -1,35 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Редактирай коментра",
"Delete comment" : "Изтрий коментар",
"New comment …" : "Нов коментар...",
"Post" : "Публикация",
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Unknown user" : "Непознат потребител",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит"
},
"nplurals=2; plural=(n != 1);");
-33
View File
@@ -1,33 +0,0 @@
{ "translations": {
"Edit comment" : "Редактирай коментра",
"Delete comment" : "Изтрий коментар",
"New comment …" : "Нов коментар...",
"Post" : "Публикация",
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Unknown user" : "Непознат потребител",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-39
View File
@@ -1,39 +0,0 @@
OC.L10N.register(
"comments",
{
"Comments" : "Коментари",
"Unknown user" : "Непознат потребител",
"New comment …" : "Нов коментар...",
"Delete comment" : "Изтрий коментар",
"Post" : "Публикация",
"Cancel" : "Отказ",
"Edit comment" : "Редактирай коментра",
"[Deleted user]" : "[Изтрит потребител]",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while retrieving comment with id {id}" : "Възникна грешка по време на извличане на коментар с код {id}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Type in a new comment..." : "Напиши нов коментар...",
"No other comments available" : "Няма други коментари",
"More comments..." : "Още коментари...",
"{count} unread comments" : "{count} непрочетени коментари",
"You commented on %2$s" : "Ти коментира за %2$s"
},
"nplurals=2; plural=(n != 1);");
-37
View File
@@ -1,37 +0,0 @@
{ "translations": {
"Comments" : "Коментари",
"Unknown user" : "Непознат потребител",
"New comment …" : "Нов коментар...",
"Delete comment" : "Изтрий коментар",
"Post" : "Публикация",
"Cancel" : "Отказ",
"Edit comment" : "Редактирай коментра",
"[Deleted user]" : "[Изтрит потребител]",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while retrieving comment with id {id}" : "Възникна грешка по време на извличане на коментар с код {id}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Type in a new comment..." : "Напиши нов коментар...",
"No other comments available" : "Няма други коментари",
"More comments..." : "Още коментари...",
"{count} unread comments" : "{count} непрочетени коментари",
"You commented on %2$s" : "Ти коментира за %2$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "বাতিল",
"Save" : "সংরক্ষণ",
"Comment" : "মন্তব্য"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "বাতিল",
"Save" : "সংরক্ষণ",
"Comment" : "মন্তব্য"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "বাতিল করা",
"Save" : "সেভ"
},
"nplurals=2; plural=(n != 1);");
-5
View File
@@ -1,5 +0,0 @@
{ "translations": {
"Cancel" : "বাতিল করা",
"Save" : "সেভ"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Odustani",
"Save" : "Spremi",
"Comment" : "Komentar"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Odustani",
"Save" : "Spremi",
"Comment" : "Komentar"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
}
-35
View File
@@ -1,35 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentari",
"Delete comment" : "Esborrar comentari",
"New comment …" : "Nou comentari...",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"[Deleted user]" : "[usuari Esborrat]",
"Comments" : "Comentaris",
"No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
"More comments …" : "Més comentaris...",
"Save" : "Desa",
"Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
"Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
"Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
"_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
"You commented" : "Heu comentat",
"%1$s commented" : "%1$s ha comentat",
"{author} commented" : "{author} ha comentat",
"You commented on %1$s" : "Heu comentat a %1$s",
"You commented on {file}" : "Heu comentat a {file}",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
"{author} commented on {file}" : "{author} ha comentat a {file}",
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
"{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
"Unknown user" : "Usuari desconegut",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix"
},
"nplurals=2; plural=(n != 1);");
-33
View File
@@ -1,33 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentari",
"Delete comment" : "Esborrar comentari",
"New comment …" : "Nou comentari...",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"[Deleted user]" : "[usuari Esborrat]",
"Comments" : "Comentaris",
"No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
"More comments …" : "Més comentaris...",
"Save" : "Desa",
"Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
"Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
"Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
"_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
"You commented" : "Heu comentat",
"%1$s commented" : "%1$s ha comentat",
"{author} commented" : "{author} ha comentat",
"You commented on %1$s" : "Heu comentat a %1$s",
"You commented on {file}" : "Heu comentat a {file}",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
"{author} commented on {file}" : "{author} ha comentat a {file}",
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
"{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
"Unknown user" : "Usuari desconegut",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-37
View File
@@ -1,37 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Upravit komentář",
"Delete comment" : "Smazat komentář",
"New comment …" : "Nový komentář…",
"Post" : "Zveřejnit",
"Cancel" : "Storno",
"[Deleted user]" : "[Smazaný uživatel]",
"Comments" : "Komentáře",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů…",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with ID {id}" : "Došlo k chybě při načítání komentáře s ID {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentovali jste",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval(a)",
"You commented on %1$s" : "Okomentovali jste %1$s",
"You commented on {file}" : "Okomentovali jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
"Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán"
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
-35
View File
@@ -1,35 +0,0 @@
{ "translations": {
"Edit comment" : "Upravit komentář",
"Delete comment" : "Smazat komentář",
"New comment …" : "Nový komentář…",
"Post" : "Zveřejnit",
"Cancel" : "Storno",
"[Deleted user]" : "[Smazaný uživatel]",
"Comments" : "Komentáře",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů…",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with ID {id}" : "Došlo k chybě při načítání komentáře s ID {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentovali jste",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval(a)",
"You commented on %1$s" : "Okomentovali jste %1$s",
"You commented on {file}" : "Okomentovali jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
"Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
}
-39
View File
@@ -1,39 +0,0 @@
OC.L10N.register(
"comments",
{
"Comments" : "Komentáře",
"Unknown user" : "Neznámý uživatel",
"New comment …" : "Nový komentář ...",
"Delete comment" : "Smazat komentář",
"Post" : "Zveřejnit",
"Cancel" : "Zrušit",
"Edit comment" : "Upravit komentář",
"[Deleted user]" : "[Smazaný uživatel]",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů ...",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentoval(a) jsi",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval(a)",
"You commented on %1$s" : "Okomentoval(a) jste %1$s",
"You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Type in a new comment..." : "Zadat nový komentář...",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
"{count} unread comments" : "{count} nepřečtených komentářů",
"You commented on %2$s" : "Okomentoval(a) jsi %2$s"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
-37
View File
@@ -1,37 +0,0 @@
{ "translations": {
"Comments" : "Komentáře",
"Unknown user" : "Neznámý uživatel",
"New comment …" : "Nový komentář ...",
"Delete comment" : "Smazat komentář",
"Post" : "Zveřejnit",
"Cancel" : "Zrušit",
"Edit comment" : "Upravit komentář",
"[Deleted user]" : "[Smazaný uživatel]",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů ...",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentoval(a) jsi",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval(a)",
"You commented on %1$s" : "Okomentoval(a) jste %1$s",
"You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Type in a new comment..." : "Zadat nový komentář...",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
"{count} unread comments" : "{count} nepřečtených komentářů",
"You commented on %2$s" : "Okomentoval(a) jsi %2$s"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Diddymu",
"Save" : "Cadw"
},
"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
-5
View File
@@ -1,5 +0,0 @@
{ "translations": {
"Cancel" : "Diddymu",
"Save" : "Cadw"
},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
}
-35
View File
@@ -1,35 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Rediger kommentar",
"Delete comment" : "Slet kommentar",
"New comment …" : "Ny kommentar ...",
"Post" : "Indlæg",
"Cancel" : "Annullér",
"[Deleted user]" : "[Slettet user]",
"Comments" : "Kommentarer",
"No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
"More comments …" : "Flere kommentarer...",
"Save" : "Gem",
"Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
"Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
"Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
"_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
"Comment" : "Kommentér",
"You commented" : "Du kommenterede",
"%1$s commented" : "%1$s kommenterede",
"{author} commented" : "{author} kommenterede",
"You commented on %1$s" : "Du kommenterede %1$s",
"You commented on {file}" : "Du kommenterede {file}",
"%1$s commented on %2$s" : "%1$s kommenterede %2$s",
"{author} commented on {file}" : "{author} kommenterede {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
"{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
"Unknown user" : "Ukendt bruger",
"A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende"
},
"nplurals=2; plural=(n != 1);");
-33
View File
@@ -1,33 +0,0 @@
{ "translations": {
"Edit comment" : "Rediger kommentar",
"Delete comment" : "Slet kommentar",
"New comment …" : "Ny kommentar ...",
"Post" : "Indlæg",
"Cancel" : "Annullér",
"[Deleted user]" : "[Slettet user]",
"Comments" : "Kommentarer",
"No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
"More comments …" : "Flere kommentarer...",
"Save" : "Gem",
"Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
"Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
"Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
"_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
"Comment" : "Kommentér",
"You commented" : "Du kommenterede",
"%1$s commented" : "%1$s kommenterede",
"{author} commented" : "{author} kommenterede",
"You commented on %1$s" : "Du kommenterede %1$s",
"You commented on {file}" : "Du kommenterede {file}",
"%1$s commented on %2$s" : "%1$s kommenterede %2$s",
"{author} commented on {file}" : "{author} kommenterede {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
"{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
"Unknown user" : "Ukendt bruger",
"A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-37
View File
@@ -1,37 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"[Deleted user]" : "[Gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
"More comments …" : "Weitere Kommentare…",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Von Dir kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Du hast %1$s kommentiert",
"You commented on {file}" : "Du hast {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt"
},
"nplurals=2; plural=(n != 1);");
-35
View File
@@ -1,35 +0,0 @@
{ "translations": {
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"[Deleted user]" : "[Gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
"More comments …" : "Weitere Kommentare…",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Von Dir kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Du hast %1$s kommentiert",
"You commented on {file}" : "Du hast {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Abbrechen",
"Save" : "Speichern"
},
"nplurals=2; plural=(n != 1);");
-5
View File
@@ -1,5 +0,0 @@
{ "translations": {
"Cancel" : "Abbrechen",
"Save" : "Speichern"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-37
View File
@@ -1,37 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"[Deleted user]" : "[gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
"More comments …" : "Weitere Kommentare …",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt"
},
"nplurals=2; plural=(n != 1);");
-35
View File
@@ -1,35 +0,0 @@
{ "translations": {
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"[Deleted user]" : "[gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
"More comments …" : "Weitere Kommentare …",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-33
View File
@@ -1,33 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Επεξεργασία σχολίου",
"Delete comment" : "Διαγραφή σχολίου",
"New comment …" : "Νέο σχόλιο ...",
"Post" : "Δημοσίευση",
"Cancel" : "Ακύρωση",
"[Deleted user]" : "[Διαγραμμένος χρήστης]",
"Comments" : "Σχόλια",
"No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
"More comments …" : "Περισσότερα σχόλια ...",
"Save" : "Αποθήκευση",
"Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
"_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
"Comment" : "Σχόλιο",
"You commented" : "Σχολιάσατε",
"%1$s commented" : "%1$s σχολίασε",
"{author} commented" : "Ο {author} σχολίασε",
"You commented on %1$s" : "Σχολιάσατε στο %1$s",
"You commented on {file}" : "Σχολιάσατε στο {file}",
"%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
"Unknown user" : "Άγνωστος χρήστης",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
},
"nplurals=2; plural=(n != 1);");
-31
View File
@@ -1,31 +0,0 @@
{ "translations": {
"Edit comment" : "Επεξεργασία σχολίου",
"Delete comment" : "Διαγραφή σχολίου",
"New comment …" : "Νέο σχόλιο ...",
"Post" : "Δημοσίευση",
"Cancel" : "Ακύρωση",
"[Deleted user]" : "[Διαγραμμένος χρήστης]",
"Comments" : "Σχόλια",
"No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
"More comments …" : "Περισσότερα σχόλια ...",
"Save" : "Αποθήκευση",
"Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
"_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
"Comment" : "Σχόλιο",
"You commented" : "Σχολιάσατε",
"%1$s commented" : "%1$s σχολίασε",
"{author} commented" : "Ο {author} σχολίασε",
"You commented on %1$s" : "Σχολιάσατε στο %1$s",
"You commented on {file}" : "Σχολιάσατε στο {file}",
"%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
"Unknown user" : "Άγνωστος χρήστης",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-36
View File
@@ -1,36 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Edit comment",
"Delete comment" : "Delete comment",
"New comment …" : "New comment …",
"Post" : "Post",
"Cancel" : "Cancel",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Comments",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"More comments …" : "More comments …",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
"Error occurred while retrieving comment with ID {id}" : "Error occurred while retrieving comment with ID {id}",
"Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
"Error occurred while posting comment" : "Error occurred while posting comment",
"_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
"Comment" : "Comment",
"You commented" : "You commented",
"%1$s commented" : "%1$s commented",
"{author} commented" : "{author} commented",
"You commented on %1$s" : "You commented on %1$s",
"You commented on {file}" : "You commented on {file}",
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"{author} commented on {file}" : "{author} commented on {file}",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"Unknown user" : "Unknown user",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted"
},
"nplurals=2; plural=(n != 1);");
-34
View File
@@ -1,34 +0,0 @@
{ "translations": {
"Edit comment" : "Edit comment",
"Delete comment" : "Delete comment",
"New comment …" : "New comment …",
"Post" : "Post",
"Cancel" : "Cancel",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Comments",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"More comments …" : "More comments …",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
"Error occurred while retrieving comment with ID {id}" : "Error occurred while retrieving comment with ID {id}",
"Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
"Error occurred while posting comment" : "Error occurred while posting comment",
"_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
"Comment" : "Comment",
"You commented" : "You commented",
"%1$s commented" : "%1$s commented",
"{author} commented" : "{author} commented",
"You commented on %1$s" : "You commented on %1$s",
"You commented on {file}" : "You commented on {file}",
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"{author} commented on {file}" : "{author} commented on {file}",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"Unknown user" : "Unknown user",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-20
View File
@@ -1,20 +0,0 @@
OC.L10N.register(
"comments",
{
"Type in a new comment..." : "Tajpu novan komenton...",
"Delete comment" : "Forigi komenton",
"Post" : "Afiŝi",
"Cancel" : "Nuligi",
"Edit comment" : "Redakti komenton",
"[Deleted user]" : "[Forigita uzanto]",
"Comments" : "Komentoj",
"No other comments available" : "Neniu alia komento disponeblas",
"More comments..." : "Pli da komentoj...",
"Save" : "Konservi",
"Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
"{count} unread comments" : "{count} nelegitaj komentoj",
"Comment" : "Komento",
"%1$s commented" : "%1$s komentis",
"%1$s commented on %2$s" : "%1$s komentis %2$s"
},
"nplurals=2; plural=(n != 1);");
-18
View File
@@ -1,18 +0,0 @@
{ "translations": {
"Type in a new comment..." : "Tajpu novan komenton...",
"Delete comment" : "Forigi komenton",
"Post" : "Afiŝi",
"Cancel" : "Nuligi",
"Edit comment" : "Redakti komenton",
"[Deleted user]" : "[Forigita uzanto]",
"Comments" : "Komentoj",
"No other comments available" : "Neniu alia komento disponeblas",
"More comments..." : "Pli da komentoj...",
"Save" : "Konservi",
"Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
"{count} unread comments" : "{count} nelegitaj komentoj",
"Comment" : "Komento",
"%1$s commented" : "%1$s komentis",
"%1$s commented on %2$s" : "%1$s komentis %2$s"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-37
View File
@@ -1,37 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se ha producido un error al obtener el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
"Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
"Comment" : "Comentar",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Has comentado en %1$s",
"You commented on {file}" : "Has comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado"
},
"nplurals=2; plural=(n != 1);");
-35
View File
@@ -1,35 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se ha producido un error al obtener el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
"Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
"Comment" : "Comentar",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Has comentado en %1$s",
"You commented on {file}" : "Has comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-35
View File
@@ -1,35 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},
"nplurals=2; plural=(n != 1);");
-33
View File
@@ -1,33 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-33
View File
@@ -1,33 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario ...",
"Post" : "Post",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
"Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentar",
"You commented" : "Ud. ha comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Ud. ah comentado en %1$s",
"You commented on {file}" : "Ud. ha comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
-31
View File
@@ -1,31 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario ...",
"Post" : "Post",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
"Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentar",
"You commented" : "Ud. ha comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Ud. ah comentado en %1$s",
"You commented on {file}" : "Ud. ha comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-36
View File
@@ -1,36 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},
"nplurals=2; plural=(n != 1);");
-34
View File
@@ -1,34 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-36
View File
@@ -1,36 +0,0 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},
"nplurals=2; plural=(n != 1);");
-34
View File
@@ -1,34 +0,0 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}

Some files were not shown because too many files have changed in this diff Show More