Compare commits

..

560 Commits

Author SHA1 Message Date
C Montero-Luque 5bb7743f87 8.2.5 2016-05-12 11:10:05 -04:00
C Montero-Luque 08c798a45d 8.2.5 RC2 2016-05-10 15:49:25 -04:00
C Montero-Luque ccdfccc891 8.2.5 RC1 2016-05-09 18:42:48 -04:00
Thomas Müller d9a409606f Merge pull request #24508 from owncloud/backport-23901-app-disabled-on-legacy-job
[8.2] Catch the AutoloadNotAllowedException also for legacy jobs
2016-05-09 16:01:02 +02:00
Joas Schilling 027eaa4b2c Catch the AutoloadNotAllowedException also for legacy jobs 2016-05-09 13:31:47 +02:00
C Montero-Luque f5c39b70d8 8.2.4 2016-05-03 04:38:56 -04:00
C Montero-Luque ec0a29cd52 8.2.4 RC2 2016-05-02 04:15:36 -04:00
C. Montero Luque fe26682644 Merge pull request #24344 from owncloud/stable8.2_24326
[Stable 8.2] Make ownCloud work again in php 7.0.6
2016-05-02 04:09:39 -04:00
Roeland Jago Douma 2fef88c5a6 Make ownCloud work again in php 7.0.6
See https://bugs.php.net/bug.php?id=72117
2016-04-29 11:27:20 +02:00
C Montero-Luque 2b18334162 8.2.4 RC1 2016-04-26 21:24:24 -04:00
Vincent Petry cac5afd85f Merge pull request #24283 from owncloud/backport-24262-stable8.2
[stable8.2] check whether index is set before using it
2016-04-26 20:49:29 +02:00
Roeland Douma 96ce579adc Merge pull request #24288 from owncloud/local-invalid-82
[8.2] error out if a local storage isn't setup correctly
2016-04-26 20:23:25 +02:00
Robin Appelman e2437c51b5 add tests 2016-04-26 16:10:09 +02:00
Robin Appelman dca1945e87 error out if a local storage isn't setup correctly 2016-04-26 16:10:06 +02:00
Arthur Schiwon 898266f0dc check whether index is set before using it 2016-04-26 14:47:59 +02:00
blizzz f5f5dffd86 Merge pull request #24243 from owncloud/stable8.2-backport-24052
[stable8.2] Fix LDAP race conditions
2016-04-26 13:04:42 +02:00
Morris Jobke 9828ae4b3f Merge pull request #24260 from owncloud/scanner-locking-82
[8.2] add locks in the scanner to prevent multiple scanners running on the …
2016-04-26 10:57:49 +02:00
Robin Appelman c58f16899b add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 18:25:54 +02:00
Robin Appelman 6c0d61c9a8 Revert "add locks in the scanner to prevent multiple scanners running on the same files"
This reverts commit fd8e3f7301.
2016-04-25 18:23:26 +02:00
Morris Jobke 94aa8f9306 Merge pull request #24237 from owncloud/backport-24214-stable8.2
[stable8.2] on clone Connection, do not take over the existing LDAP resource
2016-04-25 16:37:44 +02:00
Robin Appelman fd8e3f7301 add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 15:48:03 +02:00
Morris Jobke 80052995d5 Fix LDAP race conditions
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
2016-04-25 13:44:22 +02:00
Arthur Schiwon 26869c1a93 on clone Connection, do not take over the existing LDAP resource
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-25 12:43:33 +02:00
blizzz 505e2b35b0 Merge pull request #24144 from owncloud/stable8.2-filelist-redirectonstoragenotavailable
Fix StorageNotAvailable exception string detection
2016-04-23 01:25:12 +02:00
Thomas Müller 3ab41be506 Merge pull request #24181 from owncloud/backport-24145-limit-background-job-runtime-8.2
[8.2] Make sure that CLI cron doesn't run for ever, but makes use of the ne…
2016-04-22 17:25:14 +02:00
Thomas Müller 4ed979df5f Merge pull request #24197 from owncloud/backport-24183-change-background-job-sort-order-8.2
[8.2] Change the sort order of background jobs to be DESC instead of ASC
2016-04-22 15:17:32 +02:00
Joas Schilling 6c1680addc Change the sort order of background jobs to be DESC instead of ASC
In theory, if your instance ever creates more jobs then your system cron can
handle, the default background jobs get never executed anymore. Because
everytime when the joblist returns the next job it looks for the next ID,
however there is always a new next ID, so it will never wrap back to execute
the low IDs. But when we change the sort order to be DESC, we make sure that
these low IDs are always executed, before the system jumps back up to
execute the new IDs.
2016-04-22 14:17:45 +02:00
Joas Schilling db6b6d832e Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-22 10:01:22 +02:00
Thomas Müller 05b9503400 Merge pull request #24171 from owncloud/stable8.2-certificate
[stable8.2] Ignore certificate file if it starts with file://
2016-04-22 09:36:17 +02:00
Vincent Petry 1e017ea69f Merge pull request #24162 from owncloud/backport-23461-activity-without-sharing-8.2
Fix "AutoloadNotAllowedException" when files_sharing is disabled
2016-04-22 09:23:45 +02:00
Vincent Petry e912db00a8 Merge pull request #23807 from owncloud/backport-of-#23760-1
[stable8.2] Fix conditional check in MySQL setup
2016-04-22 09:18:35 +02:00
Christoph Wurst 4648f63431 Merge pull request #24152 from owncloud/remember-email-when-setting-expiration
[stable8.2] remember email when setting expiration date
2016-04-21 20:31:59 +02:00
Lukas Reschke d3f585c329 [stable8.2] Ignore certificate file if it starts with file:// 2016-04-21 18:56:58 +02:00
Thomas Müller 8bd3ea08eb Merge pull request #24113 from owncloud/backport-24111-chunking-users-in-background-jobs-8.2
[8.2] Chunk the users correctly in the trashbin and versions background job
2016-04-21 16:21:27 +02:00
Joas Schilling d727ade11d Fix "AutoloadNotAllowedException" when files_sharing is disabled 2016-04-21 16:13:28 +02:00
Thomas Müller 8f2759de21 Merge pull request #23548 from owncloud/stable8.2-quota-recognizeremoteunlimitedquota
[stable8.2] Workaround to be able to recognize unlimited quota in fed shares
2016-04-21 12:56:57 +02:00
Christoph Wurst 699691f910 remember email when setting expiration date
fixes #22947
2016-04-21 12:32:41 +02:00
Vincent Petry 88613ded7f Fix StorageNotAvailable exception string detection 2016-04-21 10:23:21 +02:00
Morris Jobke 2aed501f7f Merge pull request #24130 from owncloud/stable82_24108
[stable8.2] Allow setting can edit permissions on federated shares in webUI
2016-04-20 22:34:47 +02:00
Morris Jobke af5d08d97f Merge pull request #23984 from owncloud/fix-infinite-loop-in-unavailable-mount
[stable8.2] Fixes a possible infinite change-dir-loop
2016-04-20 21:07:20 +02:00
Roeland Jago Douma c53acac91e Allow setting can edit permissions on federated shares in webUI
Fixes #24032

Since we have a slightly different UI for the federated shares our
normal logic fails us. This makes sure to add the correct permissions
when it is a federated share.
2016-04-20 19:19:21 +02:00
Björn Schießle 3a83912300 Merge pull request #24100 from owncloud/fix_23632_8.2
[stable8.2] init users mount point before recovery
2016-04-20 17:05:45 +02:00
Vincent Petry b54faa994b Merge pull request #23363 from owncloud/smb-1.0.8-82
[8.2] update icewind/smb to 1.0.8
2016-04-20 11:04:32 +02:00
Vincent Petry 2d59027064 Merge pull request #24000 from owncloud/shared-islocal-82
[8.2] implement isLocal for shared storage
2016-04-20 10:56:59 +02:00
Joas Schilling 85a860a369 Copy the 9.0 method for the background jobs 2016-04-20 10:43:58 +02:00
Vincent Petry aa408deef9 Merge pull request #23402 from owncloud/backport-23282-stable8.2
[stable8.2] fix writing to cache when fallback server should be used immediately
2016-04-20 10:42:59 +02:00
Joas Schilling f052f0e59a Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:41:56 +02:00
Roeland Douma 36c43bad53 Merge pull request #24008 from owncloud/fix_repeating_user_list
Fix repeating user list in webUI
2016-04-19 20:12:37 +02:00
Roeland Jago Douma 60680cb28c Fix repeating user list in webUI
Steps:

1. create a folder A
2. share A with user1, user2 and user3
3. create a folder A/B
4. share A/B with user4 ("Shared in A with user1, user2, user3" appears in the sidebar below the share input field)
5. share A/B with user5 (the text is expanded with ", user1, user2, user3")

After:

user1, user2, user3 is only shown once
2016-04-19 19:31:20 +02:00
Björn Schießle d5b2d94f78 we need to initialize the mount points of the given user before we recover
access to his files
2016-04-19 17:18:26 +02:00
Morris Jobke b818e24e28 Merge pull request #24044 from owncloud/stable8.2-autoload
[stable8.2] Exclude autoload_static.php
2016-04-18 08:47:55 +02:00
Lukas Reschke fdc157fe97 Exclude autoload_static.php 2016-04-17 11:14:04 +02:00
Robin Appelman fd3f090280 implement isLocal for shared storage 2016-04-14 15:50:28 +02:00
Arthur Schiwon 39004c2b7b Fixes a possible infinite change-dir-loop
Those can occure when browsing in a mount that got unavailable
2016-04-13 22:43:33 +02:00
Morris Jobke d45ecadba7 Merge pull request #23785 from owncloud/stable8.2-backport-23304
[stable8.2] Fix PHP memory leak in file_get_contents()
2016-04-12 10:42:10 +02:00
Joas Schilling 511487e961 Correctly return an empty string for empty files 2016-04-08 15:12:01 +02:00
Daniel Hansson f07323d6c0 [stable9] Fix conditional check in MySQL setup
Backport of "Fix conditional check in MySQL setup #23760"
2016-04-05 16:06:17 +02:00
Morris Jobke acb67a84c2 Fix PHP memory leak in file_get_contents()
* ref https://bugs.php.net/bug.php?id=61961
* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256
* code is based on the proposal of @chriseqipe
* fixes #20261
2016-04-04 18:19:08 +02:00
Lukas Reschke cb9d0b9c7c Merge pull request #23711 from owncloud/fix_encryption_versions_on_external_storages_8.2
[stable8.2] fix creation of versions of encrypted files on external storages
2016-04-01 08:49:40 +02:00
Bjoern Schiessle 1b663a875a fix creation of versions of encrypted files on external storages
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
2016-03-31 23:19:51 +02:00
Vincent Petry 7c86d79374 Workaround to be able to recognize unlimited quota in fed shares
Fixes issues where a user cannot upload to a fed share on OC >= 9.0
where the sharer has unlimited quota (-3)
2016-03-24 14:11:06 +01:00
Vincent Petry 3b3780f532 Merge pull request #23505 from owncloud/ee-1149-share-propagation-entries-in-db
Grab the values for share propagation manually from the DB
2016-03-23 14:40:56 +01:00
Morris Jobke 579f50bc9b Merge pull request #23457 from owncloud/backport-23329-stable8.2
[stable8.2] Avatar must be saved after login is done and external storages set up…
2016-03-23 13:04:22 +01:00
Joas Schilling aa95ac6bc8 Chunk the shareId query 2016-03-23 11:16:37 +01:00
Joas Schilling a951858000 Grab the values for share propagation manually from the DB 2016-03-23 10:54:30 +01:00
Thomas Müller 0d8617a1f0 Merge pull request #23481 from owncloud/smb-handle-forbidden-82
[8.2] handle forbidden exceptions in smb backend
2016-03-23 09:12:22 +01:00
Robin Appelman 2b36716b18 handle forbidden exceptions in smb backend 2016-03-22 15:37:21 +01:00
Thomas Müller d0ad124505 Merge pull request #23433 from owncloud/stable82_fix_22128
Do not show hash if parent is shared by link
2016-03-22 10:18:12 +01:00
Arthur Schiwon cf73db11b5 Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-21 22:38:18 +01:00
Roeland Jago Douma 22ca4c5654 Do not show hash if parent is shared by link
fixes #22128

Since we store the password in the shared_with field of the database we
need to do some extra processing not to show it.
2016-03-21 19:51:00 +01:00
Morris Jobke 8ba36692bf Merge pull request #23391 from owncloud/stable8.2-share-keepoptioncheckboxinblocks
[stable8.2] Keep share checkboxes together
2016-03-21 14:13:08 +01:00
Arthur Schiwon 01d12ec74e fix writing to cache when fallback server should be used immediately 2016-03-18 20:41:00 +01:00
Roeland Douma efad504707 Merge pull request #23379 from owncloud/stable8.2-backport-23370
[stable8.2] Update avatar on username change if avatar is set
2016-03-18 15:53:34 +01:00
Vincent Petry b706ba41e0 Keep share checkboxes together
- removed leading spaces before markup which can affect rendering in
  some cases
- added shareOption CSS class to group and keep share option checkbox +
  label
- moved ".showCruds" arrow into the matching shareOption to keep the
  arrow together with the checkbox
2016-03-18 14:31:37 +01:00
Vincent Petry 65971f16d1 Merge pull request #22766 from owncloud/ceph-keystone-readiness-stable8.2
Synchronise files_external and objectstore Docker tests with master
2016-03-18 11:24:58 +01:00
Morris Jobke 1179462f4e Update avatar on username change if avatar is set
* fixes #20455
2016-03-18 08:59:47 +01:00
Thomas Müller 9c00957da0 Merge pull request #23354 from owncloud/stable8.2_backport_23346
[Stable 8.2] Set proper public webdav permissions when public upload disabled
2016-03-17 20:50:53 +01:00
Robin Appelman b88acd51d2 update icewind/smb to 1.0.8 2016-03-17 16:16:37 +01:00
Roeland Jago Douma 499eba593e Set proper public webdav permissions when public upload disabled
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
2016-03-17 13:56:24 +01:00
Vincent Petry a110bdb10f Merge pull request #23312 from owncloud/check-syntax-travis-stable8.2
[stable8.2] Execute parallel-lint
2016-03-16 18:10:28 +01:00
Lukas Reschke aee10f0281 [stable8.2] Execute parallel-lint
Backport of https://github.com/owncloud/core/pull/22994 and https://github.com/owncloud/core/pull/23303
2016-03-16 15:10:45 +01:00
Morris Jobke 7e92ef37e3 Merge pull request #23234 from owncloud/stable8.2-fix_21678
[stable8.2] Gracefull handle link shares rename hook
2016-03-16 13:21:00 +01:00
Lukas Reschke cd78b90daf Merge pull request #23266 from owncloud/fix_22907_8.2
allow group shares, even if not all public keys are available
2016-03-15 19:07:06 +01:00
Bjoern Schiessle 38f8f2837e allow group shares, even if not all public keys are available 2016-03-15 15:14:45 +01:00
Roeland Jago Douma 1acc045e0c Gracefull handle link shares rename hook
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-03-14 17:29:18 +01:00
Vincent Petry a5de6b3713 Merge pull request #22934 from owncloud/stable8.2-backport-22872
[stable8.2] Update error text for link passwords
2016-03-14 16:17:00 +01:00
Thomas Müller 4b8094abc1 Merge pull request #22944 from owncloud/backport-22800-stable8.2
[8.2] don't hide server not available exception, fixes #20536
2016-03-14 16:15:31 +01:00
Morris Jobke 127f764ee5 Merge pull request #23103 from owncloud/stable8.2-backport-23094
[stable8.2] Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-13 14:53:17 +01:00
Morris Jobke 24f94eeffc Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 16:01:06 +01:00
Morris Jobke 236d16e57b Merge pull request #23025 from owncloud/stable8.2-backport-22986
[stable8.2] Remove disabled autocorrect for new file names
2016-03-09 17:31:30 +01:00
Morris Jobke 755ca52e48 Remove disabled autocorrect for new file names
* ref #22784
2016-03-09 15:01:51 +01:00
Morris Jobke 0010c874c4 Merge pull request #22842 from owncloud/stable82_22830
[Stable 8.2] Rename and move permissions are set when a file is updatable
2016-03-09 08:44:18 +01:00
Morris Jobke a03173caee Merge pull request #22923 from owncloud/stable8.2-share-archivenamedownloadall
[stable8.2] Fix archive file name when downloading public share
2016-03-09 08:43:11 +01:00
Morris Jobke 7a94a58543 Merge pull request #22935 from owncloud/stable8.2-remove-wrongly-backported-test
Remove wrongly backported test
2016-03-09 08:42:33 +01:00
Morris Jobke 6ebaef54f0 Merge pull request #22927 from owncloud/stable8.2-files-newmenu-removebrowsercomplete
[stable8.2] Remove browser autocomplete in new file menu
2016-03-09 08:34:57 +01:00
C Montero-Luque fc18c0506a 8.2.3 2016-03-08 09:02:46 -05:00
Arthur Schiwon 35200de653 don't hide server not available exception, fixes #20536 2016-03-08 12:48:26 +01:00
Thomas Müller c2f3127d24 Fix casing - causes failure on php 5.4 2016-03-08 10:31:38 +01:00
Morris Jobke 9464d71d75 Remove wrongly backported test
* backported with #22752
2016-03-08 09:57:53 +01:00
Morris Jobke 9cd2ef6e8a Update error text for link passwords
* this removes the old tooltip first before showing
  the new one to update the text - otherwise the old
  text will be shown
2016-03-08 09:06:12 +01:00
Vincent Petry 9b22ecd1c0 Remove browser autocomplete in new file menu 2016-03-07 22:04:57 +01:00
Vincent Petry 4bc0eb546c Remove "files" arg from download URL in public link page
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 21:50:45 +01:00
Vincent Petry f9a14e5c54 Fix archive file name when downloading public share
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 21:50:41 +01:00
C Montero-Luque c51ae5f8ee 8.2.3 RC2 2016-03-04 18:15:14 -05:00
C. Montero Luque 0c03e7c384 Merge pull request #22868 from owncloud/stable8.2-backport-22865
[stable8.2] Run cleanup of expired DB file locks to background job
2016-03-04 14:25:53 -05:00
C. Montero Luque bf9be4b2c8 Merge pull request #22862 from owncloud/stable8.2-trashbin-checkpath
[stable8.2] Properly check path validity before deleting to trash
2016-03-04 13:33:43 -05:00
Morris Jobke 12e006c1f5 Run cleanup of expired DB file locks to background job
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 17:03:41 +01:00
Vincent Petry 152e2e361d Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:34:35 +01:00
Roeland Jago Douma b66d536fc1 Rename and move permissions are set when a file is updatable
* Fix unit tests
2016-03-04 09:38:34 +01:00
Frank Karlitschek 78f40de835 Merge pull request #22802 from RealRancor/backport_22776_stable8.2
Add Versions app header to config.sample.php
2016-03-03 14:10:22 -05:00
RealRancor dd36bed3e0 Add Versions app header to config.sample.php 2016-03-03 08:44:27 +01:00
C Montero-Luque 61a71c6f69 8.2.3 RC1 2016-03-01 20:27:56 -05:00
Robin McCorkell 1fa95c3a4c Synchronise files_external and objectstore Docker tests with master
Checkout files from 4d69e562a0
2016-03-01 23:01:57 +00:00
Vincent Petry 5200baa966 Merge pull request #22752 from owncloud/part-file-root-82
[stable8.2] allow putting the part file in the view root
2016-03-01 20:43:54 +01:00
Thomas Müller ee4d57660d Merge pull request #22751 from owncloud/stable8.2-codecheckeruses
[stable8.2] Fixing CodeChecker usage
2016-03-01 15:26:10 +01:00
Vincent Petry d32fc2d771 Don't apply quota in stream wrapper for part files
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
2016-03-01 15:25:33 +01:00
Robin Appelman cf63a16935 add config sample 2016-03-01 14:51:31 +01:00
Robin Appelman c120578735 allow putting the part file in the view root 2016-03-01 14:43:40 +01:00
Thomas Müller af44b5e573 Fixing CodeChecker usage 🙈 2016-03-01 13:42:54 +01:00
Vincent Petry f19ba49c60 Merge pull request #22325 from owncloud/dav-upload-scan-in-lock-82
[8.2] scan the file in the write lock when uploading over dav
2016-03-01 13:26:06 +01:00
Morris Jobke b74ad0c457 Merge pull request #22705 from owncloud/backport-22677-theme-overwriting-language
[8.2] Allow to overwrite a single language string via the theme folder
2016-03-01 11:54:21 +01:00
Vincent Petry d774cbe546 Merge pull request #22657 from owncloud/stable8.2-backport-21854
[stable8.2] Fix addUserToGroup hook of the share code
2016-03-01 10:24:29 +01:00
Vincent Petry 9987424496 Improved JS L10N bundle merging + tests 2016-03-01 09:54:56 +01:00
Morris Jobke 1820dc2fbe Merge pull request #22712 from owncloud/kill-coverage-on-scrutinizer-stable8.2
Update .scrutinizer.yml
2016-02-29 18:03:14 +01:00
Thomas Müller 0b965a4344 Update .scrutinizer.yml 2016-02-29 11:03:02 +01:00
Thomas Müller b7780a71fd Merge pull request #22665 from owncloud/backport-22599-stable8.2
[backport] [stable8.2] take the first result of that array, if present. Fixes 2nd display na…
2016-02-29 11:01:46 +01:00
Joas Schilling d9824ca9f4 Allow to overwrite a single language string via the theme folder 2016-02-29 09:14:05 +01:00
Morris Jobke 98e94de18f Merge pull request #22685 from owncloud/stable8.2-fix-thrashbin-cronjob
[Stable8.2] fix thrashbin cronjob
2016-02-29 08:31:10 +01:00
Victor Dubiniuk 3285f5e585 Skip users with no trashbin 2016-02-26 18:34:15 +03:00
Morris Jobke bbfc5bbf30 Merge pull request #22676 from owncloud/fed-share-etag-82
[8.2] use the default view for propagation if possible
2016-02-26 14:56:31 +01:00
Robin Appelman 1384bf5066 use the default view for propagation if possible 2016-02-26 13:55:12 +01:00
Robin Appelman e17bc565b7 Add test for owner etag propagation 2016-02-26 13:50:35 +01:00
Roeland Douma 54f8ec8be0 Merge pull request #22574 from owncloud/backport-22419-console-add-user-group-with-shares
[8.2] Make sure to init the users Filesystem so we can add group shares
2016-02-26 08:18:10 +01:00
Arthur Schiwon 36a8f22dc3 take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-26 02:09:25 +01:00
Morris Jobke 2ef8483b6d Fix addUserToGroup hook of the share code
* sets up the filesystem of the user that is added to a group
  to properly accept shares
* fixes #18499
2016-02-25 18:42:41 +01:00
Thomas Müller 696ee349ea Merge pull request #22649 from owncloud/external-share-manager-82
inject the correct external share manager into the storage
2016-02-25 17:13:00 +01:00
Thomas Müller 83fa9a1f54 Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404
[stable8.2] Properly trigger testRemote after getting a 404 from remote fed share
2016-02-25 16:56:38 +01:00
Vincent Petry 4c3f9bd489 Merge pull request #22633 from owncloud/stable8.2-backport-22565
[stable8.2] Avoids scanning the root storage
2016-02-25 16:49:11 +01:00
Robin Appelman 3415933bd8 inject the correct external share manager into the storage 2016-02-25 15:43:38 +01:00
Björn Schießle 75f9587915 Merge pull request #22626 from owncloud/fix_broken_unencrypted_size_8.2
[stable8.2] Heal unencrypted file sizes at download time
2016-02-25 14:51:04 +01:00
Bjoern Schiessle f8e25419e5 recalculate unencrypted size if we assume that the size stored in the db is not correct 2016-02-25 11:16:15 +01:00
Morris Jobke 60ff1de286 Avoids scanning the root storage
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.

Fixes #22501
2016-02-24 17:27:07 +01:00
Morris Jobke a0bd774ca5 Merge pull request #22614 from owncloud/backport-22358-stable8.2
[Backport][stable8.2] Fix race condition when switching filter mode.
2016-02-24 17:07:03 +01:00
Vincent Petry bb1db1ef5b Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-24 16:33:20 +01:00
Arthur Schiwon 5102458c3f Fix race condition when switching filter mode. Fixes #22278 2016-02-24 11:14:52 +01:00
Morris Jobke 300953c3ef Merge pull request #22571 from owncloud/stable8.2-backport-21544
[stable8.2] set etag and permission fields for trashbin entries
2016-02-24 11:10:43 +01:00
Joas Schilling 0e999ab3b4 Make sure to init the users Filesystem so we can add group shares 2016-02-22 15:52:26 +01:00
Roeland Douma 2a29d7a4ff Merge pull request #22557 from owncloud/backport-22496-share-group-problem
[8.2] Fix on shared groups assignment.
2016-02-22 15:47:28 +01:00
Robin Appelman bdbdd27e47 set etag and permission fields for trashbin entries 2016-02-22 15:29:16 +01:00
Morris Jobke 8614497f91 Merge pull request #22562 from owncloud/stable8.2-ie-publicpagefooter
[stable8.2] Fix public page footer position in IE
2016-02-22 13:30:07 +01:00
Vincent Petry 4a156bb9d1 Fix public page footer position in IE
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:40:53 +01:00
Vincent Petry 5bda7f84b5 Merge pull request #22556 from owncloud/stable8.2-fix-pagination-in-ie
[stable8.2] Fixes pagination in IE
2016-02-22 11:40:27 +01:00
Leonardo Diez 7affaeb906 Fix on shared groups assignment. 2016-02-22 10:41:35 +01:00
Morris Jobke 1f87d1aff1 Fixes pagination in IE
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 10:30:13 +01:00
Morris Jobke 3f16fae206 Merge pull request #22456 from owncloud/stable8.2-files-select-closesidebar
[stable8.2] Close file detail sidebar when selecting/unselecting files
2016-02-17 15:29:26 +01:00
Vincent Petry 550983bd02 Close file detail sidebar when selecting/unselecting files
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
2016-02-17 10:35:17 +01:00
Morris Jobke 91aa1bb045 Merge pull request #22372 from owncloud/stable8.2-backport-22369
[stable8.2] Fix BMP support
2016-02-16 09:16:25 +01:00
Roeland Douma 95c815fcd2 Merge pull request #22364 from owncloud/backport-20152-stable8.2
[stable8.2] Remove invalid type-cast
2016-02-15 19:40:45 +01:00
Morris Jobke ce4d5185fa Fix BMP support
* fixes #16461
2016-02-14 09:32:04 +01:00
Lukas Reschke 81b1ce4db0 Remove invalid type-cast
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.

Fixes https://github.com/owncloud/core/issues/20095
2016-02-13 14:30:37 +01:00
Thomas Müller 5bbf8eda23 Merge pull request #22040 from owncloud/stable8.2-backport-21999
[stable8.2] [user_ldap] properly decode cached objects
2016-02-11 18:52:50 +01:00
Robin Appelman afeb3f3eec scan the file in the write lock when uploading over dav 2016-02-11 14:44:22 +01:00
Thomas Müller aef1def9be Merge pull request #22323 from owncloud/stable8.2-22322
[stable8.2] Fix typo
2016-02-11 14:25:45 +01:00
Morris Jobke 38470ef317 Fix typo
backport of #22322
2016-02-11 14:06:19 +01:00
Vincent Petry a580785da8 Merge pull request #22262 from owncloud/stable8.2-backport-21251
[stable8.2] occ command can only be called from ownCloud root directory
2016-02-11 11:46:00 +01:00
Morris Jobke 70817a61e4 Merge pull request #22293 from owncloud/stable8.2-versions-fixpathasrecipient
[stable8.2] Fix versions path as share recipient when different than owner path
2016-02-10 17:34:36 +01:00
Vincent Petry 4457323878 Use full path of known file when handling versions
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 16:49:23 +01:00
Vincent Petry e40abfbbfe Remove path from versions response
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.

The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 16:49:18 +01:00
Morris Jobke 57fc56b5f3 Merge pull request #22261 from owncloud/stable8.2-backport-21459
[stable8.2] Make LDAP more robust to exceptions and log them properly
2016-02-10 15:23:58 +01:00
Morris Jobke e23c67b0fd occ command can only be called from ownCloud root directory
* this changes into the ownCloud root directory and then should run just fine
* avoids weird error messages that are caused by this
2016-02-10 09:51:31 +01:00
Morris Jobke 1911fd5d9f Make LDAP more robust to exceptions and log them properly 2016-02-10 09:46:21 +01:00
Vincent Petry 3350d62b75 Merge pull request #22250 from owncloud/stable8.2-ldap_2nddispname
Backport of LDAP second display name
2016-02-09 18:37:15 +01:00
Arthur Schiwon eedf9a6b8a adjust test 2016-02-09 18:19:58 +01:00
Arthur Schiwon b858550e66 Backport of LDAP second display name
From c1871f5787
2016-02-09 16:29:08 +01:00
Thomas Müller b4bbd4a70f Merge pull request #22185 from farukuzun/stable8.2
[stable8.2] Introduce some mimetypes for richdocuments
2016-02-09 11:25:48 +01:00
Faruk Uzun 0d3b333210 Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote

Backport of #21766
2016-02-08 05:52:44 +02:00
Morris Jobke 47b1b67b4c Merge pull request #22172 from owncloud/stable8.2-backport-22143
[stable 8,2] When a user is removed we should remove the right shares
2016-02-06 09:26:20 +01:00
Roeland Jago Douma 814ca88398 When a user is removed we should remove the right shares
* This means all the shares directly shared with them
* Or all group shares having a special share with them

This patch fixes the operator precedece (AND before OR).
So before this patch:

(share_with = <deleted user> AND share_type = 0) OR share_type=2

So it deleted all user specific shares

Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
2016-02-05 20:07:26 +01:00
Lukas Reschke decd956683 Merge pull request #22147 from owncloud/stable8.2-backport-22146
[stable8.2] Allow to delete the email address in user management
2016-02-05 16:21:29 +01:00
Morris Jobke bca6c78d24 Allow to delete the email address in user management 2016-02-05 10:31:03 +01:00
Roeland Douma 4e10c8b8f6 Merge pull request #22087 from RealRancor/RealRancor-patch-2
Backport #22086 to stable8.2
2016-02-03 13:21:44 +01:00
RealRancor 2843ced28b Backport #22086 to stable8.2 2016-02-03 09:42:43 +01:00
Thomas Müller 2b9fcac462 Merge pull request #22047 from owncloud/stable8.2-backport-21953
[stable8.2] Make enable_avatars setting more robust
2016-02-01 16:16:53 +01:00
Thomas Müller 0fd92a2851 Merge pull request #22006 from owncloud/backport-21987-background-job-get-all
[8.2] Do not create a loop that generates thousands of jobs
2016-02-01 14:16:45 +01:00
Morris Jobke 85692194d5 Make enable_avatars setting more robust
* handles the setting in the same way everywhere
* fixes #21949
2016-02-01 14:13:41 +01:00
Morris Jobke 7f327ab5ab [user_ldap] properly decode cached objects
* fixes #21896
2016-02-01 09:50:26 +01:00
Joas Schilling e6780b164f Remove other broken usages in deprecated methods 2016-01-29 10:10:38 +01:00
Joas Schilling 950ce22118 Deprecate the method and warn against using it
Conflicts:
	lib/private/backgroundjob/joblist.php
2016-01-29 10:10:16 +01:00
Joas Schilling 882b34b01e Do not create a loop that generates thousands of jobs
Conflicts:
	cron.php
2016-01-29 10:08:57 +01:00
Thomas Müller 3b40e85c42 Merge pull request #21938 from owncloud/stable8.2_sabre_2_1_9
[Stable8.2] Bump sabre/dav 2 1 9
2016-01-29 07:43:03 +01:00
Roeland Jago Douma 4390526c27 Bump sabre/dav to 2.1.9 2016-01-28 20:44:24 +01:00
Morris Jobke fb943f0c8a Merge pull request #21863 from owncloud/sync-certificates-with-upstream-82
[stable8.2] Sync certificates with upstream
2016-01-25 08:23:43 +01:00
Lukas Reschke e6fd925650 Sync certificates with upstream 2016-01-22 22:11:18 +01:00
Vincent Petry 19b8359600 Merge pull request #21799 from owncloud/stable8.2-backport-21705
[stable8.2] improve background job error message
2016-01-22 14:43:02 +01:00
Thomas Müller 22bba7c46a Add message key to context of logException 2016-01-20 11:06:34 +01:00
Morris Jobke c27dee56ac use logException() to properly log the exception 2016-01-20 11:06:27 +01:00
Morris Jobke 67fb58b4ee Improved error message for failing background job 2016-01-20 11:06:18 +01:00
Morris Jobke 821663e397 Merge pull request #21747 from owncloud/stable8.2-backport-20927
[stable8.2] Handle return code of streamCopy in WebDAV put
2016-01-19 00:30:23 +01:00
Morris Jobke bb3d257eef Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
2016-01-16 11:29:19 +01:00
Thomas Müller 66f1ca36fc Merge pull request #21693 from owncloud/stable8.2-users-scrolltop
[stable8.2] Keep scroll position in users page when sorting
2016-01-15 13:19:03 +01:00
Vincent Petry 2a9a1b8a4d Keep scroll position in users page when sorting
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.

This fix saves the scroll position before sorting and sets it back
afterwards.
2016-01-13 15:37:10 +01:00
Vincent Petry f56e05fde0 Merge pull request #21666 from owncloud/smb-statcache-cap-82
[8.2] cap the number of entries we cache in smb's statcache
2016-01-13 10:41:49 +01:00
Robin Appelman aa51fe1095 cap the number of entries we cache in smb's statcache 2016-01-12 18:12:27 +01:00
Morris Jobke 47a1fbe248 Merge pull request #21631 from owncloud/backport-17924-stable8.2
[backport] [stable8.2] always use an LDAP URL when connecting to LDAP
2016-01-12 10:33:13 +01:00
Arthur Schiwon a0760ca489 always use an LDAP URL when connecting to LDAP 2016-01-11 21:31:33 +01:00
Morris Jobke 458a90c5a1 Merge pull request #21614 from owncloud/fix_21598_8.2
[stable8.2] fix public link sharing if the master key is enabled
2016-01-11 15:35:46 +01:00
Björn Schießle 640f12706f only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:53:07 +01:00
Morris Jobke d97aba0ca5 Merge pull request #21611 from owncloud/stable8.2-users-dropdownscroll
[stable8.2] Fix users list dropdown position after scroll
2016-01-11 13:47:31 +01:00
Vincent Petry f9980de6fc Fix users list dropdown position after scroll
When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.
2016-01-11 12:47:25 +01:00
Morris Jobke d32f5c1280 Merge pull request #21565 from owncloud/ext-smb-dep-stable8.2
[stable8.2] Check libsmbclient-php as well as smbclient binary
2016-01-11 11:36:14 +01:00
Vincent Petry a047983ebb Merge pull request #21585 from owncloud/bakport-21575
[stable8.2] Use ISession::clear
2016-01-11 11:24:52 +01:00
Vincent Petry 693067e6cf Merge pull request #21603 from owncloud/backport-21548-correctly-display-notify-option-for-shares
[8.2] Check the correct config for displaying the "notify by email" option
2016-01-11 11:22:05 +01:00
Joas Schilling ea5b7585f9 Check the correct config for displaying the "notify by email" option
Conflicts:
	core/js/tests/specs/sharedialogshareelistview.js
2016-01-11 10:08:46 +01:00
Lukas Reschke ba66805ece Use ISession::clear
The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
2016-01-10 16:50:31 +01:00
Robin McCorkell d948687caa Check libsmbclient-php as well as smbclient binary 2016-01-09 09:19:39 +00:00
Thomas Müller dce584e7f3 Merge pull request #21539 from endocode/kayrus/cookies_auth_fix
[stable8.2] Fixed double file upload on failed auth using WebDAV
2016-01-08 20:09:27 +01:00
Thomas Müller f4a7991562 Merge pull request #21118 from owncloud/makeurltypeconfigurable
[stable8.2] make swift url type configurable
2016-01-08 13:46:01 +01:00
kayrus 9e5bb2b241 Fixed double file upload on failed auth using WebDAV
Backport of this fix: https://github.com/owncloud/core/pull/21491
  Fixes https://github.com/owncloud/core/issues/21486
2016-01-08 11:54:16 +01:00
Jörn Friedrich Dreyer 18379cd1f6 add isset for optional params 2016-01-07 09:46:53 +01:00
Morris Jobke 5e76f5e020 Merge pull request #21265 from owncloud/backport20996-remove-password-reset
Backport 20996 remove password reset
2016-01-05 10:08:51 +01:00
Joas Schilling 3b59de7e33 Fix missing import of IUser 2016-01-05 09:47:23 +01:00
Thomas Müller c74fe461b2 Merge pull request #21441 from owncloud/fix-dutch-typo
Fix the markup for the dutch translation
2016-01-04 14:58:18 +01:00
Morris Jobke f450603fdd Merge pull request #21439 from owncloud/backport-21289-retain-background-jobs
[8.2] Do not delete background jobs, in case an exception occured
2016-01-04 14:47:55 +01:00
Joas Schilling 9a4dd056c4 Fix the markup for the dutch translation 2016-01-04 14:13:09 +01:00
Joas Schilling b995862723 Fix the test to expect the new behaviour 2016-01-04 13:29:03 +01:00
Joas Schilling fa206d550f Do not delete background jobs, in case an exception occured
This approach is not valid anymore. It initially was added for jobs
of non existing apps. But jobs of non-existing apps can not be created
so they will never be executed and so this call just catches other
cases which were not intended.

This reverts commit 4f4ad72460.
2016-01-04 13:28:32 +01:00
Thomas Müller 4e3ace33d1 Merge pull request #21391 from owncloud/stable8.2-backport-undefined-user-agent
[stable8.2] Fix undefined HTTP_USER_AGENT
2015-12-29 17:20:31 +01:00
Thomas Müller 8e205c6854 Fix undefined HTTP_USER_AGENT 2015-12-29 11:45:34 +01:00
Vincent Petry 6b9b12e0c0 Merge pull request #21262 from owncloud/backport-21260-stable8.2
[backport] [stable8.2] initialize l10n instance earlier, fixes an undefined var warning foll…
2015-12-24 15:55:10 +01:00
Vincent Petry 6707df6470 Merge pull request #21313 from owncloud/scanner-skip-not-available-82
[8.2] Skip unavailable storages in scanner
2015-12-24 15:50:02 +01:00
Roeland Douma e9036a0cad Merge pull request #21295 from owncloud/backport-21255-stable8.2
user management: show password error temporary (backport for stable8.2)
2015-12-23 08:25:46 +01:00
Thomas Müller fad03d639e Merge pull request #21341 from owncloud/fix-unit-tests-stable8.1
[stable8.2] Fix unit tests
2015-12-23 07:09:40 +01:00
Lukas Reschke fa1a9a5cc6 Fix unit tests 2015-12-22 21:26:02 +01:00
Morris Jobke c4964f710b Merge pull request #21261 from owncloud/stable8.2-backport-21244
[stable8.2] enforce_home_folder_naming_rule cannot be configured in config.php
2015-12-22 19:14:28 +01:00
Morris Jobke f628c21f08 Merge pull request #21274 from owncloud/stable82_20884
[Stable 8.2] [Sharing] Respect disabled incoming federated shares
2015-12-22 19:13:49 +01:00
Morris Jobke e51da34aa9 Merge pull request #21234 from owncloud/stable8.2-backport-21232
[stable8.2] Use name of ICollection for exception message
2015-12-22 19:11:37 +01:00
Robin Appelman 369ec64709 also log exception 2015-12-21 16:21:18 +01:00
Robin Appelman 188857c691 Skip unavailable storages in scanner 2015-12-21 16:21:13 +01:00
C Montero-Luque d60d903e75 8.2.2 2015-12-21 07:22:04 -05:00
C Montero-Luque 6a7399808f 8.2.2 RC2 2015-12-18 17:30:17 -05:00
michag86 1a6e3e8b08 Update users.js 2015-12-18 17:04:36 +01:00
Roeland Jago Douma b720c9616d [Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
2015-12-18 09:11:00 +01:00
Robin Appelman f85ee56a01 Check if user isset in $_REQUEST first 2015-12-17 16:37:48 +01:00
Joas Schilling 04c2247b0d Allow specifying a custom reset-password-url
Conflicts:
	core/js/config.php
2015-12-17 16:35:46 +01:00
Joas Schilling 5fe8f5a254 Remove password reset when the user can not change the password 2015-12-17 16:33:38 +01:00
Arthur Schiwon 6c5c14fc69 initialize l10n instance earlier, fixes an undefined var warning followed by a php error 2015-12-17 15:48:45 +01:00
blizzz 8dc74d9b52 enforce_home_folder_naming_rule cannot be configured in config.php 2015-12-17 15:43:44 +01:00
Morris Jobke 6e3648cc2f add unit test for #21230 2015-12-16 16:16:35 +01:00
Morris Jobke e66e33f12c Use name of ICollection for exception message
* fixes #21230
2015-12-16 16:16:27 +01:00
C Montero-Luque f152228f4c 8.2.2 RC1 2015-12-15 16:05:32 -05:00
Vincent Petry 346d8452c8 Merge pull request #21197 from owncloud/backport-21133-stable8.2
[backport] [stable8.2] Fix shared files of deleted users, detect DN change when checking for existence on LDAP
2015-12-15 18:42:13 +01:00
Vincent Petry 36701a2865 Merge pull request #21211 from owncloud/stable8.2-handle-enforce-home-folder-rule-setting
[stable8.2] properly preserve home folder naming enforcement setting
2015-12-15 18:42:00 +01:00
Thomas Müller 9154c5d8f4 Merge pull request #21198 from owncloud/fix_20296_8.2
[stable8.2] don't allow to create a federated share if source and target are the same
2015-12-15 13:17:46 +01:00
Morris Jobke 5ac6cacd90 properly preserve home folder naming enforcement setting 2015-12-15 10:23:50 +01:00
Arthur Schiwon 780b97d7b1 throw NoUserException in getHome when the requested user does not exist anymore
look for DN changes before marking a user as deleted
2015-12-14 22:46:54 +01:00
Vincent Petry 3fc5039054 Fixed JS unit tests for fed owner display name 2015-12-14 18:12:09 +01:00
Björn Schießle c21e055c36 show display name but internally use the user name 2015-12-14 17:35:10 +01:00
Björn Schießle 171062fed3 don't allow to create a federated share if source and target server are the same 2015-12-14 17:30:50 +01:00
Morris Jobke 486fdcb34f Merge pull request #21152 from owncloud/backport-20978-stable8.2
reset mailadress/displayname on blur (backport for stable8.2)
2015-12-14 17:30:04 +01:00
Lukas Reschke c3c642740f Merge pull request #21194 from owncloud/preview-non-existing-82
[8.2] Handle non existing files in version previews
2015-12-14 17:23:14 +01:00
Robin Appelman b7c217290f Handle non existing files in version previews 2015-12-14 16:07:31 +01:00
Vincent Petry c47f214cf3 Merge pull request #21182 from owncloud/stable8.2-share-allowdeleteinshareoverview
[stable8.2] Bring back delete permission in share overview
2015-12-14 13:58:23 +01:00
Vincent Petry 709f9231e9 Bring back delete permission in share overview 2015-12-14 10:55:28 +01:00
Thomas Müller a042ffafac Merge pull request #21157 from owncloud/trashbin-loggedout-82
[8.2] Fix trashbin wrapper when no user is loggedin
2015-12-14 10:26:42 +01:00
Lukas Reschke cccf4b6073 Use XMLWriter to generate response
Gets rid of manual XML generation.
2015-12-14 09:40:07 +01:00
Morris Jobke cd4cc15ac9 Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontext
[stable8.2] Stable8.2 files deleteactiontext
2015-12-11 16:09:45 +01:00
Robin Appelman 71f4877816 skip test if we cant use the filesystem when not logged in 2015-12-11 15:41:08 +01:00
Robin Appelman b0842228f0 Fix thrashbin wrapper when no user is loggedin 2015-12-11 15:41:03 +01:00
Vincent Petry 5da3d5616c Bring back file delete action text to be based on context
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
2015-12-11 15:20:11 +01:00
michag86 8ec7faa26d reset mailadress/displayname on blur 2015-12-11 14:59:52 +01:00
Lukas Reschke 411e400705 Merge pull request #21127 from owncloud/stable8.2-backport-21119
[stable8.2] Make AppManager->checkAppForUser more robust
2015-12-11 14:01:27 +01:00
Thomas Müller 19d15938e3 Merge pull request #21046 from owncloud/stable8.2-catchexceptionindirectdownloadurl
[stable8.2] Catch exception when querying direct download link
2015-12-11 10:49:42 +01:00
Roeland Douma 30b54d3853 Merge pull request #21115 from owncloud/stable8.2-backport-21109
[stable8.2] Deduplicate version expire jobs
2015-12-10 21:14:34 +01:00
Morris Jobke 7748faf362 Merge pull request #21113 from owncloud/memcache-lock-ttl-82
[8.2] Add ttl for redis based locking
2015-12-10 18:58:26 +01:00
Vincent Petry acc2291f9e Merge pull request #21124 from owncloud/remove-db-locking-performance-warning-stable8.2
Remove info about database locking performance
2015-12-10 18:10:59 +01:00
Morris Jobke 6cdf398a41 Make AppManager->checkAppForUser more robust
* if the JSON that is stored in the DB is corrupt an error was thrown
* with this change it is properly handled and the app is disabled
2015-12-10 16:58:16 +01:00
Thomas Müller 066db75c14 Remove info about database locking performance 2015-12-10 16:12:54 +01:00
Jörn Friedrich Dreyer b314da9a25 make url type configurable 2015-12-10 14:37:53 +01:00
Vincent Petry a83b3dd736 Merge pull request #21090 from owncloud/backport-20995-stable8.2
[backport] [stable8.2] ensure multiselect always receives an array when setting its value, f…
2015-12-10 14:31:42 +01:00
Morris Jobke 049f7f9af1 Merge pull request #21101 from owncloud/stable8.2_20989
[Stable 8.2] Update parent when moving share into recieved share
2015-12-10 13:57:17 +01:00
Vincent Petry a96cf5d01c Merge pull request #21112 from owncloud/db-lock-ttl-82
[8.2] Remove all locks after ttl from the db
2015-12-10 13:52:23 +01:00
Vincent Petry f829ddfea5 Merge pull request #21100 from owncloud/stable8.2_21005
[Stable 8.2] The ajax code path unshares a link share when updating the password
2015-12-10 13:46:27 +01:00
Morris Jobke 6890933e4a Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 13:42:26 +01:00
Robin Appelman 5ea5d7fa52 ttl for memcache locking backends that support it 2015-12-10 13:07:27 +01:00
Robin Appelman e15792a6aa Add interface for memcache backends that support setting ttl on exisiting keys 2015-12-10 13:07:18 +01:00
Robin Appelman b2eecfb946 Remove all locks after ttl from the db 2015-12-10 13:04:39 +01:00
Vincent Petry c02381243c Merge pull request #21044 from owncloud/group-propagation-82
[8.2] Group share etag propagation
2015-12-10 11:24:34 +01:00
Roeland Douma e1809dbaf6 Merge pull request #21099 from owncloud/stable8.2_20949
[Stable 8.2] [Sharing] Properly check if a group already has access
2015-12-10 11:22:48 +01:00
Thomas Müller ab6a34b0e2 Merge pull request #20985 from owncloud/fix-mysql-setup-unix-socket-stable8.2
Add unix_socket support for mysql during initial installation - fixes…
2015-12-10 10:14:32 +01:00
Roeland Douma 96bb4672c3 Merge pull request #21080 from owncloud/stable8.2-share-computesharepermissions-notstore
[stable8.2] Fix (re)share permission checks in a few code paths
2015-12-10 09:09:18 +01:00
Roeland Jago Douma 0dae2b8296 Update parent when moving share into recieved share
Fixes #20769

When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-10 08:16:58 +01:00
Roeland Jago Douma 59c27e0fb4 The ajax code path unshares a link share when updating the password
In order to not mess up existing shares if the password gets verified we
should first fire this validation.
2015-12-10 08:10:16 +01:00
Roeland Jago Douma 3bdca9beb4 [Sharing] Properly check if a group already has access
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.

Fixes 20892
2015-12-10 08:04:10 +01:00
Arthur Schiwon eba656c748 ensure multiselect always receives an array when setting its value, fixes #18734 2015-12-09 20:07:38 +01:00
Vincent Petry fc0e6f2b11 Merge pull request #21069 from owncloud/personal-mount-mountid-82
[8.2] Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 20:03:52 +01:00
Vincent Petry 9bc3a9cddd Merge pull request #21084 from owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.2
Don't load commands of apps when in maintenance mode
2015-12-09 19:57:09 +01:00
Vincent Petry 565d7b2b12 Catch exception when querying direct download link 2015-12-09 18:01:28 +01:00
Thomas Müller 5755d16b6e Don't load commands of apps when in maintenance mode - fixes #20939 2015-12-09 16:38:52 +01:00
Vincent Petry da83c854f0 Add explicit check for groups excluded from sharing
Since isSharable() doesn't do the check for groups excluded from
sharing, adding an explicit check in the sharing code.
2015-12-09 15:47:32 +01:00
Vincent Petry 6004eb5edf Fix more unit tests to pass a mock storage instead of null to FileInfo 2015-12-09 15:47:24 +01:00
Vincent Petry edffde2f28 Add reshare permission checks
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-09 15:46:00 +01:00
Vincent Petry fccafd915b Compute share permissions in the view
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-09 15:45:05 +01:00
Robin Appelman 63a2e36816 fix etag propagation with group reshares 2015-12-09 13:35:31 +01:00
Robin Appelman f72db4ea07 Add test case for group share propagation 2015-12-09 13:13:56 +01:00
Robin Appelman 163d92109b Add tests 2015-12-09 12:24:11 +01:00
Robin Appelman b5a7408193 Dont set the string storage id to the numeric storage id for personal mounts 2015-12-09 12:24:07 +01:00
Morris Jobke a581b8b20f Merge pull request #21041 from owncloud/backport-21037-stable8.2
[backport][stable8.2] passing an empty base in this diagnosis call will not result  in LDAP…
2015-12-08 18:01:45 +01:00
Arthur Schiwon c1b2d2549c passing an empty base in this diagnosis call will not result in LDAP errors
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 15:03:26 +01:00
Thomas Müller ff638bd331 Merge pull request #21024 from owncloud/stable8.2-share-unsharelinkpapercut
[stable8.2] Fix unshare link click element
2015-12-08 13:50:52 +01:00
Vincent Petry e84c58a13f Fix unshare link click element
When clicking on the unshare link (trash icon), the correct link element
needs to be used instead of whatever child was clicked. Then, that
element might contain a visible loading icon.

This fixes the spinner detection and also prevents a full page reload in
case the spinner was visible.
2015-12-08 08:44:02 +01:00
Morris Jobke 21adfe77d2 Merge pull request #21012 from owncloud/stable8.2-share-forbidlinkshare-duplicatefield
[stable8.2] Fix duplicate bogus share field when link sharing is not allowed
2015-12-08 00:21:19 +01:00
Vincent Petry 66f11f461f Fix duplicate bogus share field when link sharing is not allowed
Whenever link share is not allowed, it was outputting a bogus sharing
field which name would conflict with the regular sharing field.

This fix makes sure that the bogus sharing field with "Resharing not
allowed" message only appears when triggered by removed share
permissions.
2015-12-07 17:32:24 +01:00
Vincent Petry 7b2d3a933c Merge pull request #21007 from owncloud/backport-20993-stop-overwriting-language
[8.2] Do not overwrite the language when it's just missing for one app
2015-12-07 17:08:18 +01:00
Joas Schilling a091b3f588 Do not overwrite the language when it's just missing for one app 2015-12-07 16:52:32 +01:00
Morris Jobke e1bb567a8c Merge pull request #20997 from owncloud/backport-20981-multiple-emails-for-sharelink
[8.2] Allow sending a share email to multiple users
2015-12-07 16:26:04 +01:00
Joas Schilling 3cd0770e32 Add a unit test for single user case as well 2015-12-07 15:46:54 +01:00
Joas Schilling 96be3a4a7d Allow sending a share email to multiple users 2015-12-07 15:46:46 +01:00
Thomas Müller ac3c323144 Add unix_socket support for mysql during initial installation - fixes #20210 2015-12-07 12:01:40 +01:00
Vincent Petry 16c057e076 Merge pull request #20955 from owncloud/stable8.2-backport-20877
[stable8.2] Check the expiration date for null
2015-12-04 16:47:56 +01:00
Morris Jobke 9aff749ea5 Check the expiration date for null
* null is always less than any value -> expirationDate gets null
  which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
2015-12-04 14:58:11 +01:00
Lukas Reschke 5ad07552b6 Merge pull request #20915 from owncloud/backport-20900-invalid-sharee
[8.2] Only return the exact match for sharees when it's allowed
2015-12-03 12:02:22 +01:00
Joas Schilling 1d6d756f73 Only return the exact match, when it's allowed 2015-12-03 10:11:00 +01:00
Morris Jobke 06428bb75f Merge pull request #20869 from owncloud/backport-l10n-for-20842
[stable8.2] update germand translation to fit into the UI
2015-12-01 14:37:08 +01:00
Morris Jobke 676ae6d87b update germand translation to fit into the UI 2015-12-01 13:49:10 +01:00
Thomas Müller 152952be68 Merge pull request #20488 from owncloud/backport-20487-8.2
[8.2] Activity oracle sql error for favorites
2015-12-01 09:38:01 +01:00
Thomas Müller 741392b8a8 Merge pull request #20846 from owncloud/stable8.2-backport-20843
[stable8.2] Fix the width of the share with input
2015-11-30 22:46:53 +01:00
Morris Jobke 42f2ae6326 Fix the width of the share with input
* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes
2015-11-30 17:38:31 +01:00
Morris Jobke 506dbdfca5 Merge pull request #20794 from owncloud/stable8.2-backport-20790
[stable8.2] Deduplicate queued trashbin expire jobs
2015-11-30 15:59:52 +01:00
Morris Jobke 5275a71c40 Merge pull request #20830 from owncloud/catch-missing-route-82
[8.2] Dont die when we're missing a route
2015-11-30 14:28:21 +01:00
Robin Appelman c9ac47a593 Dont die when we're missing a route 2015-11-30 14:10:00 +01:00
Morris Jobke 36d9328afc Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
2015-11-27 14:43:08 +01:00
Vincent Petry dde7c8b8fc Merge pull request #20761 from owncloud/scan-eventsource-no-paths-82
[8.2] Dont output paths in scan.php
2015-11-26 16:39:47 +01:00
Robin Appelman 703b6d1803 Dont output paths in scan.php 2015-11-26 16:32:33 +01:00
Vincent Petry 73b8518f2f Merge pull request #20457 from owncloud/backport-checkbox-accessibility
Backport: Make new checkbox style accessible for screenreaders
2015-11-25 16:39:17 +01:00
Vincent Petry 30518ec1be Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-mac
[stable8.2] Add fake locker plugin
2015-11-25 16:32:26 +01:00
Morris Jobke 76dde0f1e6 Merge pull request #20690 from owncloud/stable8.2-redis-password
[stable8.2] Add support for Redis password auth
2015-11-24 00:03:27 +01:00
Lukas Reschke a57f153ad7 Add support for Redis password auth
For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security)

This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution.
2015-11-23 17:14:39 +01:00
Morris Jobke b2d9a3a08d Merge pull request #20677 from owncloud/backport-joblist-fix
[8.2] Make the JobList test more robust by sorting the result of getAll bef…
2015-11-23 11:39:10 +01:00
Joas Schilling 92b1c865d3 Make the JobList test more robust by sorting the result of getAll before comparison 2015-11-23 10:43:26 +01:00
Morris Jobke d4ab933e61 Merge pull request #20596 from owncloud/stable8.2-backport-use-proper-variable
[stable8.2] Use proper variable
2015-11-19 09:43:55 +01:00
Lukas Reschke 900b646447 Use proper variable
`$shares` is not defined. Introduced with https://github.com/owncloud/core/commit/c3e7d324c5e61eb087fb2ea5102d332f9f08db3d and thus also in stable8.2
2015-11-18 22:55:48 +01:00
Joas Schilling 61dbfb996f Add a unit test that executes the query 2015-11-18 10:37:23 +01:00
Joas Schilling e3434fecfe Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0
2015-11-18 10:36:50 +01:00
C Montero-Luque 8f71705c2e 8.2.1 2015-11-17 11:27:51 -05:00
C Montero-Luque 64a6bfd2b5 8.2.1 RC4 2015-11-17 06:16:17 -05:00
Thomas Müller d68d41f3c6 Merge pull request #20542 from owncloud/password_policy-is-not-experimantal-stable8.2
password_policy is a shipped app
2015-11-16 16:51:01 +01:00
Thomas Müller 22d43d0d82 password_policy is a shipped app 2015-11-16 16:38:00 +01:00
Lukas Reschke 5641e4c103 [stable8.2] Add fake locker plugin 2015-11-16 15:03:59 +01:00
C Montero-Luque 583dd64458 8.2.1 RC3 (previous commit incorrect) 2015-11-13 14:48:08 +01:00
C Montero-Luque 00d6bdc86d 8.2.1 2015-11-13 14:42:22 +01:00
Hendrik Leppelsack c8cb8f5bbd make new checkbox style accessible for screenreaders 2015-11-11 15:09:36 +01:00
C Montero-Luque d7aadcb5df 8.2.1 RC2 2015-11-10 22:54:28 +01:00
C. Montero Luque 3447381186 Merge pull request #20446 from owncloud/backport-20093+20124-stable8.2
[stable8.2] [Backport] of #20093 and #20124
2015-11-10 18:54:37 +01:00
Vincent Petry febfa83e5f Merge pull request #20443 from owncloud/stable8.2-set-ie-class-for-ie10plus
[stable8.2] Set "ie" CSS class for IE10, IE11
2015-11-10 17:45:03 +01:00
Arthur Schiwon 17219162de Backport of #20093 and #20124
#20093 LDAP fix quota and case
 #20124 remove uselessly used parameter, read all user attributes also when looking up users in groups

fix update quota with known value

fix attribute casing to ensure array keys work

remove uselessly used parameter, read all user attributes also when looking up users in groups
2015-11-10 17:34:07 +01:00
Vincent Petry 0c813ce231 Set "ie" CSS class for IE10, IE11
Fixed border in file action menu
2015-11-10 17:06:24 +01:00
Morris Jobke c4154e5374 Merge pull request #20440 from owncloud/stable8.2-checkbox
use new checkbox style for Apps mgmt settings
2015-11-10 16:32:40 +01:00
Vincent Petry 7b0c27fcc4 Merge pull request #20432 from owncloud/cache-escape-like-82
[8.2] Escape like parameter in cache operations
2015-11-10 16:30:09 +01:00
Morris Jobke 2f03557290 Merge pull request #20441 from owncloud/stable8.2-font-style
[stable8.2] move font back from Light to Regular for body text on normal-res screens, fix #18954
2015-11-10 16:27:51 +01:00
Jan-Christoph Borchardt 0d03452822 move font back from Light to Regular for body text on normal-res screens, fix #18954 2015-11-10 16:20:37 +01:00
Jan-Christoph Borchardt 824205f860 use new checkbox style for Apps mgmt settings 2015-11-10 16:17:54 +01:00
Morris Jobke 4fcad83a06 Merge pull request #20308 from owncloud/stable8.2-backport-use-actual-mimetype-detection-instead-of-oath
[stable8.2] Use actual mimetype detection instead of extension
2015-11-10 15:55:58 +01:00
Robin Appelman 0b9b91fc60 escape like parameter in cache move 2015-11-10 13:14:32 +01:00
Robin Appelman 0c2dc0158f Add test for special character during move 2015-11-10 13:10:01 +01:00
Robin Appelman e3c52022a8 define escape character for like statements on oracle 2015-11-10 13:09:54 +01:00
Robin Appelman 6b53de48dc define escape character for like statements on sqlite 2015-11-10 13:09:47 +01:00
Vincent Petry be4d758981 Merge pull request #20392 from owncloud/storage_not_available_8.2
[stable8.2] use a HintException to have some useful user output in case of an error
2015-11-10 11:54:10 +01:00
Vincent Petry eaad2d2c5b Merge pull request #20411 from owncloud/stable8.2-20383
[stable8.2] Properly detect setup check messages set in the HTML template
2015-11-10 11:52:11 +01:00
Björn Schießle 94d483caf8 use a HintException to have some useful user output in case of an error 2015-11-10 10:55:18 +01:00
Morris Jobke cd393d9275 Merge pull request #20417 from owncloud/stable82_20403_backport
[Stable8.2] Fix Error message when sharing outside of group
2015-11-10 09:16:32 +01:00
Vincent Petry abb6026e24 Merge pull request #20410 from owncloud/backport-20333-stable8.2
[backport][stable8.2] make all the buttons beautiful
2015-11-10 08:51:32 +01:00
Roeland Jago Douma 5a50445bd5 Fix Error message when sharing outside of group
For #19788
2015-11-10 08:13:33 +01:00
Robin McCorkell db3209a4d9 Properly detect setup check messages set in the HTML template 2015-11-09 17:26:11 +00:00
Arthur Schiwon a354b07773 make all the buttons beautiful 2015-11-09 18:19:07 +01:00
Vincent Petry 3a754b68c7 Merge pull request #20328 from owncloud/stable8.2-users-fixeveryonecount
[stable8.2] Fix everyone count for subadmins
2015-11-09 13:23:09 +01:00
Vincent Petry 4ab6452679 Merge pull request #20361 from owncloud/stable8.2-extstorage-gdrive-forceapproval
[stable8.2] Force approval in GDrive oauth to get refresh_token
2015-11-09 13:00:00 +01:00
Vincent Petry 0110fe001d Merge pull request #20387 from owncloud/backport-20348-integer-group-names
Make sure that group names are strings not integers
2015-11-09 11:11:11 +01:00
Vincent Petry 1095d22e48 Merge pull request #20326 from owncloud/getfileinfo-locking82
[8.2] Don't lock if we're only reading cache metadata
2015-11-09 10:55:53 +01:00
Vincent Petry 070e874fe1 Merge pull request #20331 from owncloud/fix_20234_8.2
[stable8.2] make sure that we update the unencrypted size for the versions
2015-11-09 09:57:09 +01:00
Joas Schilling ad64a24081 Make sure that group names are strings not integers 2015-11-09 09:51:06 +01:00
Morris Jobke 71b18939dc Merge pull request #20357 from owncloud/backport-20271-stable8.2
[Backport] [stable8.2] attempt to connect to backup server again
2015-11-06 15:14:40 +01:00
Thomas Müller 279bdc574e Merge pull request #20366 from owncloud/stable8.2-backport-20346
[stable8.2] Show the language code in personal settings for unknown languages
2015-11-06 14:51:35 +01:00
Thomas Müller dfecc6eb0f Merge pull request #20364 from owncloud/stable8.2-backport-20359
Mark files_drop as shipped
2015-11-06 14:14:20 +01:00
Morris Jobke 774d9b7643 Show the language code in personal settings for unknown languages
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
2015-11-06 13:41:18 +01:00
Lukas Reschke 5424e00e4b Mark files_drop as shipped
Fixes https://github.com/owncloud/enterprise/issues/895
2015-11-06 13:38:48 +01:00
Vincent Petry 2f99ee4fe5 Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 12:47:47 +01:00
Arthur Schiwon 7b76c7788f integration tests 2015-11-06 12:25:37 +01:00
Arthur Schiwon 86289d70f4 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-06 12:25:30 +01:00
Morris Jobke 8cea444f4e Merge pull request #20344 from owncloud/backport-20215
[8.2] Close user menu when clicking on other menus
2015-11-06 09:09:16 +01:00
Joas Schilling b08861c603 Use the normal OC.menu JS for handling the Settings menu 2015-11-06 08:42:37 +01:00
Joas Schilling d732a7b32f Close the user menu when clicking it again 2015-11-06 08:39:46 +01:00
Morris Jobke 9f550fa33d Merge pull request #20337 from owncloud/stable8.2-error-button-color
fix button text color
2015-11-05 22:53:59 +01:00
Morris Jobke 3de6e3fbc8 Merge pull request #20338 from owncloud/l10n-8.2-backport
Backport translations for 8.2
2015-11-05 20:35:10 +01:00
Vincent Petry a68fbcfa53 Merge pull request #20245 from owncloud/backport-20192-stable8.2
[backport] [stable8.2] if a user that is flag as deleted shows up again, remove that flag. F…
2015-11-05 17:26:11 +01:00
Joas Schilling b688de07f8 Backport translations for 8.2 2015-11-05 16:31:50 +01:00
Jan-Christoph Borchardt da99c8f456 fix button text color 2015-11-05 16:10:23 +01:00
Morris Jobke 75858264ba Merge pull request #20324 from owncloud/stable8.2-backport-20301
[stable8.2] [files_external] fix empty user mounts setting
2015-11-05 13:15:50 +01:00
Björn Schießle 6d6e5c1b37 make sure that we update the unencrypted size for the versions 2015-11-05 13:12:24 +01:00
Vincent Petry e5035494a7 Fix everyone count for subadmins
Also moved the logic to the UsersController

Backport of 781bca2437 from master,
adjusted to use the old SubadminFactory way
2015-11-05 12:35:10 +01:00
Robin Appelman 7fb5092a39 when a file is locked use old cache data 2015-11-05 12:04:09 +01:00
Robin Appelman 046c72c84a only lock in getDirectoryContent if we need to update the cache 2015-11-05 12:04:06 +01:00
Robin Appelman 7d9f190079 only lock in getFileInfo if we need to update the cache 2015-11-05 12:03:44 +01:00
Robin Appelman 6d711fbde2 Split checkUpdate 2015-11-05 12:03:40 +01:00
Morris Jobke 44ab8dde33 [files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
2015-11-05 11:40:15 +01:00
Joas Schilling c89058bc49 Merge pull request #20159 from owncloud/cache-move-final-update-transaction-82
[8.2] Cache move final update transaction 82
2015-11-05 10:57:39 +01:00
Lukas Reschke 5814e636fb Use actual mimetype detection instead of extension
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-11-04 17:58:25 +01:00
Morris Jobke ffb73fa012 Merge pull request #20297 from owncloud/backport-20155-8.2
[backport] [stable8.2] add port to host only, if an URL is used instead of a plain hostname
2015-11-04 15:26:57 +01:00
Arthur Schiwon c247ef87fa add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:37:39 +01:00
Morris Jobke 40bffcda3b Merge pull request #20221 from owncloud/files-filter-triger-once-82
[8.2] dont trigger the scroll event of every single item we filter in the file list
2015-11-04 11:32:46 +01:00
C Montero-Luque af1077637d fix in $OC_VersionString 2015-11-03 17:58:29 -05:00
C Montero-Luque abe65fd70f fix typo in $OV_Version 2015-11-03 17:50:26 -05:00
C Montero-Luque 304cf28f4a 8.2.1 RC1 2015-11-03 17:33:55 -05:00
Morris Jobke 6073704ace Merge pull request #20241 from owncloud/backport-20191-stable8.2
[backport] [stable8.2] add method to count users by loginname and use it for diagnose test, …
2015-11-03 08:45:29 +01:00
Vincent Petry bc1c247a13 Merge pull request #20240 from owncloud/backport-ldap-tooltip
Backport of "Add tooltip to ldap server wizard"
2015-11-03 07:54:02 +01:00
Arthur Schiwon eef80b0d30 if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 2015-11-02 22:20:28 +01:00
Hendrik Leppelsack 3a5ba033d5 add tooltip to ldap server wizard 2015-11-02 21:31:43 +01:00
Arthur Schiwon 6fd0734944 add method to count users by loginname and use it for diagnose test, fixes #20151 2015-11-02 21:26:00 +01:00
Robin Appelman 9a461d31e4 dont trigger the scroll event of every single item we filter in the file list 2015-11-02 13:14:44 +01:00
Raghu Nayyar ee05b1b6d6 Merge pull request #20187 from owncloud/stable8.2-login-arrow
Stable8.2: remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-11-02 17:27:31 +05:30
Jan-Christoph Borchardt af7616743e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 16:43:47 +01:00
Thomas Müller 0cd61b01fd Merge pull request #20158 from owncloud/stable8.2-files-consolidateiconupdate
[stable8.2] Fix icon update to be more consistent
2015-10-29 23:49:27 +01:00
Robin Appelman fe0e567bbc include the final update in the transaction when moving a folder in the cache 2015-10-29 16:52:30 +01:00
Vincent Petry 1c370506e4 Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
2015-10-29 16:49:52 +01:00
Morris Jobke b61bb83680 Merge pull request #20154 from owncloud/backport-19871
[8.2] Backport 19871
2015-10-29 15:36:54 +01:00
Joas Schilling 01816a2ba2 Use the method 2015-10-29 15:13:36 +01:00
Joas Schilling 3f3bcbeb47 Add a repair step that checks for group membership on shares 2015-10-29 15:13:25 +01:00
Joas Schilling b71cf0b903 Remove shares where the parent does not exist anymore 2015-10-29 15:13:11 +01:00
Morris Jobke 07257762e2 Merge pull request #20138 from owncloud/LukasReschke-patch-3
[stable8.2] Update certificate bundle
2015-10-29 14:27:14 +01:00
Thomas Müller 5a177b42df Merge pull request #19991 from owncloud/stable8.2_3rdparty_sabre_2.1.7
[stable8.2] 3rdparty bump for full upgrade of sabre/dav-2.1.7
2015-10-29 10:43:37 +01:00
Lukas Reschke 24be4e5add [stable8.2] Update certificate bundle
Backport of #20126
2015-10-29 10:37:53 +01:00
Roeland Jago Douma efe8384f5c 3rdparty bump for full upgrade of sabre/dav-2.1.7 2015-10-29 09:26:15 +01:00
Thomas Müller 044db63190 Merge pull request #20104 from owncloud/stable8.2-backport-20097
[stable8.2] Revert "setting to skip migration tests by default"
2015-10-28 12:43:41 +01:00
Vincent Petry 5fc440b98a Merge pull request #20101 from owncloud/stable8.2-ie9-share-donotsendplaceholderaspassword
[stable8.2] [IE9] Don't send link share password placeholder
2015-10-28 12:41:19 +01:00
Morris Jobke 99b26d6916 Revert "setting to skip migration tests by default"
This reverts commit 7cbdd9b90b.
2015-10-28 09:51:17 +01:00
Vincent Petry ee1e7d9726 [IE9] Don't send link share password placeholder
When exiting the password field in the share dialog, IE9 would
mistakenly think that the password has changed and would send the
placeholder.

This fix prevents changing the password whenever the placeholder is set
as value.
2015-10-28 09:03:58 +01:00
Morris Jobke daf14861e4 Merge pull request #20091 from owncloud/backport-tipsy-body
Backport: append tipsys to body
2015-10-27 17:53:29 +01:00
Hendrik Leppelsack cbcdcda436 append tipsys to body 2015-10-27 16:49:52 +01:00
Joas Schilling 4e9e85816d Merge pull request #20077 from owncloud/stable8.2-20076
[Stable8.2] Verify the src exists in webdav MOVE
2015-10-27 13:28:22 +01:00
Roeland Jago Douma 997c307251 Verify the src exists in webdav MOVE
* Unit test added
2015-10-27 10:30:36 +01:00
Joas Schilling e627c7942e Merge pull request #20072 from owncloud/backport-apps-donotdisplaybrokenappiconininternetexplorer-stable8.2
Disable app icon preview in apps page for IE
2015-10-27 08:39:44 +01:00
Vincent Petry 54ad29c3ed Disable app icon preview in apps page for IE
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
2015-10-26 23:25:47 +01:00
Thomas Müller 7573ba9a4d Merge pull request #19976 from owncloud/db-keep-shared-locks-82
[8.2] Keep shared locks until the end of the request so we can reuse them
2015-10-26 17:14:15 +01:00
Thomas Müller 0dc31ee2fe Merge pull request #20052 from owncloud/stable8.2-share-clicklinkfocus
[stable8.2] Fix share link focus on click
2015-10-26 17:13:44 +01:00
Thomas Müller 24eb04f724 Merge pull request #20041 from owncloud/backport-fix-link-sharing-regression-master-stable8.2
Backport fix link sharing regression master stable8.2
2015-10-26 15:22:05 +01:00
Vincent Petry e1b59ad7f0 Fix share link focus on click
Clicking on the link share must focus and select it
2015-10-26 15:14:27 +01:00
Lukas Reschke 73750f0c1e Merge pull request #20048 from owncloud/dont-lock-user-files-82
[8.2] Dont lock /$user/files
2015-10-26 14:31:52 +01:00
Robin Appelman ad95e308ba Dont lock /$user/files 2015-10-26 13:50:47 +01:00
Morris Jobke 937a1b2b93 Merge pull request #20042 from owncloud/stable8.2-ext-dropbox-removecacheafterupload
[stable8.2] Remove Dropbox metadata from cache after upload
2015-10-26 13:50:10 +01:00
Vincent Petry 019e72040a Remove Dropbox metadata from cache after upload
This will make sure that the next calls that read the mtime will get the
correct value.
2015-10-26 11:55:39 +01:00
Roeland Jago Douma 6d0e167c4d Fix for broken ajax/share.php endpoint
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-26 11:54:55 +01:00
Thomas Müller 2a0460d885 Ensure the password is only hashed in case it's changed on the client - fixes #19950 2015-10-26 11:54:48 +01:00
Morris Jobke 7d2bb6c028 Merge pull request #20036 from owncloud/stable8.2-backport-19957
Stable8.2 backport 19957
2015-10-26 10:59:22 +01:00
Steffen Lindner dbec295647 Add syslog_tag docu to sample config 2015-10-26 10:01:44 +01:00
Volker Fröhlich a2be470dce Expose syslog tag in the configuration 2015-10-26 10:01:31 +01:00
Lukas Reschke 0aca631216 Merge pull request #19997 from owncloud/backport-fix-deleted-ldap-user-sharing-stable8.2
[8.2] handle NoUserException in sharing code
2015-10-23 18:14:33 +02:00
Thomas Müller d935bdfd6a Merge pull request #20001 from owncloud/make-getCurrentUser-behave-similar-to-auth
[stable8.2] Make get current user behave similar to auth
2015-10-23 14:38:13 +02:00
Joas Schilling 25ef9909f0 Merge pull request #19999 from owncloud/backport-19970
[8.2] Fix "Call to a member function getUID() on boolean" in Crypt
2015-10-23 14:22:07 +02:00
Lukas Reschke e1642400f5 Make getCurrentUser behaviour similar to auth
If DAV_AUTHENTICATED is a null value this is a valid web session and we should return the user name as we also do in `auth`.
2015-10-23 13:39:12 +02:00
Joas Schilling 2b4ac38a08 Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-23 13:01:57 +02:00
Morris Jobke eb12cac973 handle NoUserException in sharing code
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-23 12:20:11 +02:00
Robin Appelman 86b822dd52 Keep shared locks until the end of the request so we can reuse them 2015-10-22 14:50:43 +02:00
Lukas Reschke 79932c6d98 Merge pull request #19942 from owncloud/backport-19918
[8.2] Update: state which step we are going to start and warn if it might b…
2015-10-22 00:13:23 +02:00
Lukas Reschke 6209b40647 Merge pull request #19955 from owncloud/backport-19954
[stable8.2] Use IRequest's `getScriptName` functionality instead of $_SERVER
2015-10-21 20:44:14 +02:00
Lukas Reschke 8f04555e22 Merge pull request #19956 from owncloud/stable8.2-fix-webui-upload-and-conflicts
[stable8.2] Fix file upload, conflict dialog, also in public link
2015-10-21 20:19:37 +02:00
Vincent Petry d3d18b1abc Fix file upload, conflict dialog, also in public link
- Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public
link page.
- Fix public link upload by properly adding the form data using a new
  utility function "addFormData". That one is needed because IE8 upload
  and regular upload use a different format...
2015-10-21 18:19:55 +02:00
Lukas Reschke 4035bcf26a Use IRequest's getScriptName functionality instead of $_SERVER['SCRIPT_NAME'] 2015-10-21 17:41:49 +02:00
Lukas Reschke 74e54da304 Remove dependency on ICrypto + use XOR 2015-10-21 17:41:43 +02:00
Joas Schilling 70be8a309f Update: state which step we are going to start and warn if it might be slow 2015-10-21 14:51:14 +02:00
Lukas Reschke 74a33b0e56 Merge pull request #19939 from owncloud/stable8.2-detailsview-donotopenonrename
[stable8.2] Do not display details bar after rename
2015-10-21 14:27:26 +02:00
Vincent Petry ea6917d18a Do not display details bar after rename 2015-10-21 14:16:07 +02:00
Thomas Müller a399905aff Merge pull request #19913 from owncloud/fix-memcached-warning-stable8.2
[stable8.2] Fix memcached/memcache module check
2015-10-21 10:33:47 +02:00
Vincent Petry aba6b938f9 Merge pull request #19896 from owncloud/backport-19895
Backport #19895
2015-10-21 10:19:54 +02:00
Thomas Müller 84e69f4931 Merge pull request #19882 from owncloud/backport-ceph-stop-script-changes
Backport objectstore fixes to 8.2
2015-10-21 09:50:58 +02:00
Robin McCorkell ab87fc7d3a Fix memcached/memcache module check 2015-10-20 22:57:33 +01:00
Hendrik Leppelsack 234d9d8a58 fix pagination on public file list 2015-10-20 16:14:15 +02:00
Morris Jobke c2f5fd44c5 Merge pull request #19893 from owncloud/locking_exception_8.2
[stable8.2] catch all exception if table doesn't exists
2015-10-20 15:56:06 +02:00
Morris Jobke 06036df9f7 Merge pull request #19777 from owncloud/backport-19764
Variables don't have a class, so we can't use toString() on it
2015-10-20 15:54:22 +02:00
Morris Jobke 462fc21b06 Merge pull request #19765 from owncloud/backport-19580
[8.2.1] Make sure that remote shares use the correct uid casing
2015-10-20 15:52:47 +02:00
Morris Jobke 7a2ef950b3 Merge pull request #19876 from owncloud/backport-19820-stable8.2
[stable8.2] When sharing with the owner show the path
2015-10-20 15:51:56 +02:00
Morris Jobke a4d9d9f845 Merge pull request #19766 from owncloud/stable8.2-proppatch-lastmodified
[stable8.2] Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
2015-10-20 15:50:30 +02:00
Morris Jobke 7164178cd3 Merge pull request #19844 from owncloud/stable8.2-share-fix-spinner-position
[stable8.2] Fix spinner positions in share tab
2015-10-20 15:49:28 +02:00
Morris Jobke 0f3adb856f Merge pull request #19819 from owncloud/stable8.2-filelist-preventerrorwhennosidebar
[stable8.2] Do not register sidebar panels when no sidebar
2015-10-20 15:48:52 +02:00
Morris Jobke a2b5a2f109 Merge pull request #19782 from owncloud/stable8.2-passwordchange-hidestrengthify-2
[stable8.2] [resend] Properly hide strengthify after password change
2015-10-20 15:48:16 +02:00
Morris Jobke f3d58eebfc Merge pull request #19780 from owncloud/stable8.2-files-delete-hidenotif
[stable8.2] Hide notification on delete
2015-10-20 15:47:30 +02:00
Morris Jobke 0ea4274c8d Merge pull request #19779 from owncloud/stable8.2-trash-deletesectionposition-2
[stable8.2] Move trashbin specific CSS that modifies sidebar
2015-10-20 15:45:26 +02:00
Morris Jobke b0cecfb92a Merge pull request #19772 from owncloud/stable8.2-sidebar-alt-favorite
[stable8.2] Move alt text for favorite action to image
2015-10-20 15:44:54 +02:00
Morris Jobke cddf111dbb Merge pull request #19778 from owncloud/stable8.2-files-canceluploaddebounce-re
[stable8.2] Debounce cancel upload message
2015-10-20 15:43:06 +02:00
Morris Jobke 1cf1119b0b Merge pull request #19774 from owncloud/stable8.2-notif-showtemporary
[stable8.2] showTemporary instead of show for notifications
2015-10-20 15:42:27 +02:00
Morris Jobke 394751a985 Merge pull request #19775 from owncloud/stable8.2-trashbin-removesidebar
[stable8.2] Remove sidebar for trashbin view
2015-10-20 15:37:24 +02:00
Thomas Müller 26d98e9772 Merge pull request #19800 from owncloud/backport-19731
[8.2] Update list of deprecated methods
2015-10-20 15:35:17 +02:00
Thomas Müller 7ddbaf649f Merge pull request #19835 from owncloud/stable8.2-share-checkboxuniqueids
[stable8.2] Fix DOM element ids in share dialog
2015-10-20 15:34:54 +02:00
Morris Jobke 9c5dcb4cbf Merge pull request #19771 from owncloud/stable8.2-share-emailsenterror
[stable8.2] Fix share email sending feedback
2015-10-20 15:33:48 +02:00
Morris Jobke dbf5c266c7 Merge pull request #19769 from owncloud/stable8.2-users-deletebeforecreate
[stable8.2] Delete last undoable user before user creation
2015-10-20 15:27:05 +02:00
Morris Jobke 7010f42986 Merge pull request #19770 from owncloud/stable8.2-fix-ie-pain
[stable8.2] Fix more IE issues
2015-10-20 15:21:10 +02:00
Björn Schießle 530f313dff catch all exception if table doesn't exists 2015-10-20 14:57:40 +02:00
Thomas Müller f4e68ca36a Fix termination of the ceph docker 2015-10-20 09:52:05 +02:00
Thomas Müller 4408507fc7 Fix termination of the ceph docker 2015-10-20 09:52:05 +02:00
Robin Appelman 68a92f8186 fix encryption migration test 2015-10-20 09:51:27 +02:00
Robin Appelman 541474d5ec Fix listing of trash files in test 2015-10-20 09:51:27 +02:00
Robin Appelman cf84a1128d Fix trashbin handling of unknown/unlimited free space 2015-10-20 09:51:27 +02:00
Robin Appelman 490101a3a1 Fix rename shared versions test 2015-10-20 09:51:27 +02:00
Robin Appelman 7cbc348780 handle versions expire for home storages with unlimited quota 2015-10-20 09:51:27 +02:00
Robin Appelman 331750a3b7 fix delete orphan shares test with object home storage 2015-10-20 09:51:27 +02:00
Robin Appelman ca811d3079 Fix preserving file ids when restoring a file with object storage 2015-10-20 09:51:27 +02:00
Robin Appelman 37efd1d001 fix objectstore files having create permissions 2015-10-20 09:50:24 +02:00
Robin Appelman 4dd5efd464 dont assume home storage is local in trash test 2015-10-20 09:50:06 +02:00
Robin Appelman 9ca706b046 Make shared folder size propagation test work with object home storage 2015-10-20 09:49:59 +02:00
Robin Appelman 970a9c2382 detect object homestorage in share code 2015-10-20 09:49:52 +02:00
Robin Appelman be9df999fc Fix shared storage tests for non local home storage 2015-10-20 09:49:44 +02:00
Robin Appelman 96feb6f05b fix sabre connector tests when using a non local home storage 2015-10-20 09:49:36 +02:00
Robin Appelman be9e72084d Add tests for double cache rename 2015-10-20 09:49:29 +02:00
Robin Appelman 38c7902795 Skip checkupdate test for swift 2015-10-20 09:49:17 +02:00
Jörn Friedrich Dreyer 36066e1382 don't move files in cache twice, fixes renaming for objectstores 2015-10-20 09:49:02 +02:00
Thomas Müller e3a35506c4 Fix error in stop script 2015-10-20 09:43:57 +02:00
Roeland Jago Douma 99b78345a0 Check for error when resharing 2015-10-19 20:31:06 +02:00
Roeland Jago Douma 206eb29331 When sharing with the owner show the path
The error message should contain the path that is being shared not the
numeric id.
2015-10-19 20:28:41 +02:00
C Montero-Luque 8ee2009de3 8.2.0 2015-10-19 08:24:40 -04:00
C. Montero Luque ab0fc36a5f Merge pull request #19867 from owncloud/stable8.2-GreenArchon-fix-memberof-regression
[stable8.2] green archon fix memberof regression
2015-10-19 07:48:02 -04:00
Lukas Reschke 0cdece9bd4 Adjust unit tests 2015-10-19 13:20:39 +02:00
Lukas Reschke f8870a07b4 Fix style 2015-10-19 13:20:35 +02:00
Frédéric Fortier 01bff3bc24 Revert "adjust to nested group fix
This reverts commit 845485cfe, which fixes #19816 regression.
2015-10-19 13:20:32 +02:00
Morris Jobke 6bd1b03288 Merge pull request #19860 from owncloud/fix-streamed-download-of-subfolders-stable8.2
The full name has to be tested if it's a dir
2015-10-19 10:43:37 +02:00
Thomas Müller 90d436e1e0 The full name has to be tested if it's a dir - fixes #19854 2015-10-19 10:09:27 +02:00
Lukas Reschke bd835f9ecc Merge pull request #19850 from owncloud/increase-app-versions-8.2
Increase the 2nd digit of shipped apps for 8.2
2015-10-18 19:29:13 +02:00
Joas Schilling 0d868a9843 Increase the 2nd digit of shipped apps for 8.2 2015-10-17 08:54:12 +02:00
C Montero-Luque ab84f785d3 8.2 RC3 2015-10-16 14:30:26 -04:00
Vincent Petry 063c2db084 Fix spinner positions in share tab
Also fix missing spinner when removing link share
2015-10-16 18:38:54 +02:00
Vincent Petry 68f0d107f5 Fix DOM element ids in share dialog
- Rely on class names instead of global ids
- When global ids are needed for label+checkbox, append the view id
  (cid) to the element's id

This fixes the checkboxes when multiple sidebars exist in the DOM.
2015-10-16 15:27:42 +02:00
Vincent Petry 1d04317fbc Do not register sidebar panels when no sidebar 2015-10-16 08:40:39 +02:00
Thomas Müller dc3aee5acc Merge pull request #19783 from owncloud/stable8.2_backport_19727
[Stable8.2] Return path instead of itemsource
2015-10-15 19:58:05 +02:00
Morris Jobke 2729c0417d Merge pull request #19796 from owncloud/stable8.2-language-compat
[stable8.2] Remove arbitrary expression in empty
2015-10-15 10:41:58 +02:00
Joas Schilling c4c8296495 The constant is now deprecated 2015-10-15 08:40:26 +02:00
Morris Jobke 0eb374fe12 update deprecation message 2015-10-15 08:40:18 +02:00
Joas Schilling 8165c08cc5 Update list of deprecated methods 2015-10-15 08:40:08 +02:00
Frank Karlitschek 614a22cf32 Merge pull request #19763 from owncloud/backport-19744
Backport admin checkboxes #19744 to stable8.2
2015-10-14 21:18:55 -03:00
Lukas Reschke 6f20f60f5c Remove arbitrary expression in empty
Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
2015-10-14 22:40:31 +02:00
Roeland Jago Douma 8ac5398f4e Return path instead of itemsource
Fixes #19678

Errors should contain paths and not internal ids
2015-10-14 15:46:10 +02:00
Vincent Petry ba46cfed3a Properly hide strengthify after password change 2015-10-14 15:11:17 +02:00
Lukas Reschke c8da73667b Merge pull request #19781 from owncloud/revert-19768-stable8.2-passwordchange-hidestrengthify
Revert "[stable8.2] Properly hide strengthify after password change"
2015-10-14 15:09:14 +02:00
Lukas Reschke a50643ebc9 Revert "[stable8.2] Properly hide strengthify after password change" 2015-10-14 15:09:07 +02:00
Lukas Reschke 718edf7828 Merge pull request #19768 from owncloud/stable8.2-passwordchange-hidestrengthify
[stable8.2] Properly hide strengthify after password change
2015-10-14 15:08:45 +02:00
Vincent Petry 71144522c9 Hide notification on delete
In case a permanent notification "storage full" was displayed, it will
be hidden after deleting a file.

Directly after that a getstoragestats.php call is made that will decide
whether to reshow the notification based on the new free space.
2015-10-14 15:02:06 +02:00
Vincent Petry 9f052e44c8 Move trashbin specific CSS that modifies sidebar
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
2015-10-14 14:56:08 +02:00
Vincent Petry cc03a1df0b Debounce cancel upload message 2015-10-14 14:44:42 +02:00
Joas Schilling a470b4917c Variables don't have a class, so we can't use toString() on it 2015-10-14 14:32:33 +02:00
Vincent Petry 4a0ca37cb3 Remove sidebar for trashbin view 2015-10-14 14:28:11 +02:00
Vincent Petry a4cbdfdc1f showTemporary instead of show for notifications 2015-10-14 14:26:16 +02:00
Vincent Petry b6f5e13b32 Move alt text for favorite action to image 2015-10-14 14:22:01 +02:00
Roeland Jago Douma da3cfb8710 Add unit tests for sending e-mail for link shares 2015-10-14 14:20:09 +02:00
Vincent Petry b0abb583c9 Fix share email sending feedback
Redisplay email address after failure
2015-10-14 14:20:04 +02:00
Vincent Petry f2ed3e726a [IE8] Fix button background color
IE8 doesn't support rgba...
2015-10-14 14:17:49 +02:00
Vincent Petry 2ff3e87f74 [IE8] Fix "new" button width 2015-10-14 14:17:45 +02:00
Vincent Petry f4ffa94e7f [IE9] Set explicit height to file actions menu icon
IE9 flattened the icons, so give it an explicit height.
2015-10-14 14:17:42 +02:00
Vincent Petry a1ce7ac872 [IE] Add border to dropdown menus
As a fallback because box-shadow doesn't give the same effect and drop
shadow doesn't work with IE.
2015-10-14 14:17:38 +02:00
Vincent Petry f7b62abcce Delete last undoable user before user creation 2015-10-14 14:14:50 +02:00
Vincent Petry baac1ad489 Properly hide strengthify after password change 2015-10-14 14:13:41 +02:00
Vincent Petry 7b00b943ee Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
Fix regression that makes PROPPATCH of mtime work like it did in OC <=
8.0.
The PROPPATCH must be done on the "lastmodified" property.
The "getlastmodified" now return 403 again.
2015-10-14 14:02:59 +02:00
Joas Schilling 02493563a2 Make sure that remote shares use the correct uid casing 2015-10-14 13:30:42 +02:00
Hendrik Leppelsack ee80cea2bd apply new checkbox style to admin settings 2015-10-14 13:08:06 +02:00
C Montero-Luque 06bfe1139b 8.2 RC2 2015-10-13 19:13:27 -04:00
3890 changed files with 38845 additions and 175711 deletions
-155
View File
@@ -1,155 +0,0 @@
pipeline:
clone:
image: plugins/git
depth: 1
jsunit:
image: nextcloudci/jsunit:jsunit-5
commands:
- ./autotest-js.sh
when:
matrix:
TESTS: jsunit
syntax-php5.4:
image: nextcloudci/php5.4:php5.4-5
commands:
- composer install
- vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php5.4
syntax-php5.5:
image: nextcloudci/php5.5:php5.5-5
commands:
- composer install
- vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php5.5
syntax-php5.6:
image: nextcloudci/php5.6:php5.6-7
commands:
- composer install
- vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/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-7
commands:
- composer install
- vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php7.0
litmus-v1:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
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-4
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/litmus-v2/script.sh
when:
matrix:
TESTS: litmus-v2
caldavtester:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/caldav/install.sh
- bash apps/dav/tests/travis/caldav/script.sh
when:
matrix:
TESTS: caldavtester
carddavtester:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/carddav/install.sh
- bash apps/dav/tests/travis/carddav/script.sh
when:
matrix:
TESTS: carddavtester
sqlite-php5.4:
image: nextcloudci/php5.4:php5.4-5
commands:
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
- NOCOVERAGE=true ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 5.4
sqlite-php5.5:
image: nextcloudci/php5.5:php5.5-5
commands:
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
- NOCOVERAGE=true ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 5.5
sqlite:
image: nextcloudci/php5.6:php5.6-7
commands:
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
- ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 5.6
postgres:
image: nextcloudci/php5.6:php5.6-7
commands:
- sleep 10 # gives the database enough time to initialize
- ./autotest.sh pgsql
when:
matrix:
DB: postgres
PHP: 5.6
integration:
image: nextcloudci/php5.6:php5.6-7
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh
when:
matrix:
TESTS: integration
matrix:
include:
- TESTS: integration
- TESTS: jsunit
- TESTS: syntax-php5.4
- TESTS: syntax-php5.5
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
- TESTS: litmus-v1
- TESTS: litmus-v2
- TESTS: caldavtester
- TESTS: carddavtester
- DB: sqlite
PHP: 5.4
- DB: sqlite
PHP: 5.5
- DB: sqlite
PHP: 5.6
- DB: postgres
PHP: 5.6
services:
cache:
image: redis
postgres:
image: postgres
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_PASSWORD=oc_autotest
when:
matrix:
DB: postgres
+4 -14
View File
@@ -9,22 +9,17 @@
# ignore all apps except core ones
/apps*/*
!/apps/comments
!/apps/dav
!/apps/files
!/apps/federation
!/apps/federatedfilesharing
!/apps/files_encryption
!/apps/encryption
!/apps/encryption_dummy
!/apps/files_external
!/apps/files_sharing
!/apps/files_trashbin
!/apps/files_versions
!/apps/user_ldap
!/apps/provisioning_api
!/apps/systemtags
!/apps/admin_audit
!/apps/updatenotification
!/apps/theming
!/apps/user_webdavauth
!apps/provisioning_api
/apps/files_external/3rdparty/irodsphp/PHPUnitTest
/apps/files_external/3rdparty/irodsphp/web
/apps/files_external/3rdparty/irodsphp/prods/test
@@ -83,9 +78,6 @@ nbproject
# vim ex mode
.vimrc
# ack(-grep)
.ackrc
# Mac OS
.DS_Store
@@ -104,7 +96,6 @@ nbproject
/build/lib/
/build/jsdocs/
/npm-debug.log
/PhantomJS_*
# puphpet
puphpet
@@ -123,4 +114,3 @@ Vagrantfile
/tests/data/testimage-copy.png
/config/config-autotest-backup.php
/config/autoconfig.php
clover.xml
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "3rdparty"]
path = 3rdparty
url = https://github.com/nextcloud/3rdparty.git
url = https://github.com/owncloud/3rdparty.git
+7 -21
View File
@@ -1,12 +1,10 @@
# Version: 8.2.5
<IfModule mod_headers.c>
<IfModule mod_setenvif.c>
<IfModule mod_fcgid.c>
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.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>
@@ -15,8 +13,6 @@
Header set X-XSS-Protection "1; mode=block"
Header set X-Robots-Tag "none"
Header set X-Frame-Options "SAMEORIGIN"
Header set X-Download-Options "noopen"
Header set X-Permitted-Cross-Domain-Policies "none"
SetEnv modHeadersAvailable true
</IfModule>
@@ -37,27 +33,17 @@
SetEnv htaccessWorking true
</IfModule>
</IfModule>
<IfModule mod_php7.c>
php_value upload_max_filesize 513M
php_value post_max_size 513M
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
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 ^\.well-known/carddav /remote.php/carddav/ [R=301,L]
RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R=301,L]
RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
</IfModule>
<IfModule mod_mime.c>
-2
View File
@@ -1,2 +0,0 @@
pattern = "(?i):shipit:|:\\+1:|LGTM"
self_approval_off=true
+26 -35
View File
@@ -16,8 +16,8 @@ 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>
Arthur Schiwon <blizzz@owncloud.com> Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon <blizzz@owncloud.com> blizzz <blizzz@owncloud.com>
Artur Duque de Souza <asouza@kde.org>
Axel Roenn <axel@mpim-bonn.mpg.de>
Bagera <victor@baquero-wihlborg.se>
@@ -30,16 +30,14 @@ 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>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>
@@ -63,8 +61,6 @@ 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>
@@ -127,13 +123,12 @@ 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>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@dev.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@devel.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
Frank Karlitschek <frank@owncloud.org> 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>
@@ -178,13 +173,12 @@ 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 <jmacias@full-on-net.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>
Joas Schilling <nickvergessen@owncloud.com> Joas Schilling <nickvergessen@gmx.de>
joel hansson <joel.hansson@gmail.com>
Johan Björk <johanimon@gmail.com>
Johannes Twittmann <github.com@deryo.de>
@@ -211,8 +205,8 @@ 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>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@owncloud.org>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@statuscode.ch>
Luke Policinski <lpolicinski@gmail.com>
Lyonel Vincent <lyonel@ezix.org>
macjohnny <estebanmarin@gmx.ch>
@@ -303,18 +297,16 @@ 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>
Robin Appelman <icewind@owncloud.com> icewind1991 <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> icewind1991 <robin@icewind.nl>
Robin Appelman <icewind@owncloud.com> Robin <Robin Appelman icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
Robin McCorkell <rmccorkell@karoshi.org.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>
Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>
@@ -374,7 +366,6 @@ 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>
-30
View File
@@ -1,30 +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"
]
}
-4
View File
@@ -6,7 +6,6 @@ filter:
- 'l10n/*'
- 'core/l10n/*'
- 'apps/*/l10n/*'
- 'apps/*/tests/*'
- 'lib/l10n/*'
- 'core/vendor/*'
- 'core/js/tests/lib/*.js'
@@ -14,9 +13,6 @@ filter:
- 'core/js/jquery-showpassword.js'
- 'core/js/jquery-tipsy.js'
- 'core/js/placeholders.js'
- 'settings/l10n/*'
- 'tests/*'
- 'build/*'
imports:
+25
View File
@@ -0,0 +1,25 @@
sudo: false
language: php
php:
- 5.4
branches:
only:
- master
- /^stable\d+(\.\d+)?$/
script:
- sh -c "if [ '$TC' = 'syntax' ]; then composer install && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi"
matrix:
include:
- php: 5.4
env: DB=sqlite;TC=syntax
- php: 5.5
env: DB=sqlite;TC=syntax
- php: 5.6
env: DB=sqlite;TC=syntax
- php: 7.0
env: DB=sqlite;TC=syntax
fast_finish: true
+23 -207
View File
@@ -1,210 +1,26 @@
Nextcloud is written by:
- AW-UC <git@a-wesemann.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 Böhler <dev@aboehler.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 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 <daniel@techandme.se>
- 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>
- Dominik Schmidt <dev@dominik-schmidt.de>
- Edward Crompton <edward.crompton@gmail.com>
- 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>
- Florian Scholz <FlorianScholz@bgstyle.de>
- Florin Peter <github@florin-peter.de>
- 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>
- 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 Willnecker <johannes@willnecker.com>
- Jonny007-MKD <1-23-4-5@web.de>
- Jost Baron <Jost.Baron@gmx.de>
- Juan Pablo Villafañez <jvillafanez@solidgear.es>
- 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>
- 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 Telatynski <7t3chguy@gmail.com>
- 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>
- Philippe Le Brouster <plb@nebkha.net>
- 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>
- Serge Martin <edb@sigluy.net>
- Sergio Bertolin <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>
- Steffen Lindner <mail@steffen-lindner.de>
- Stephan Peijnik <speijnik@anexia-it.com>
- TheSFReader <TheSFReader@gmail.com>
- Thibaut GRIDEL <tgridel@free.fr>
- Thomas Müller <thomas.mueller@tmit.eu>
- Thomas Schmidt <tschmidt@suse.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>
- 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>
- 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>
- macjohnny <estebanmarin@gmx.ch>
- marc0s <marcos@tenak.net>
- martin-rueegg <martin.rueegg@metaworx.ch>
- martin.mattel@diemattels.at <martin.mattel@diemattels.at>
- michag86 <micha_g@arcor.de>
- 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
Vincent Petry
With help from many libraries and frameworks including:
Open Collaboration Services
+33 -12
View File
@@ -1,6 +1,6 @@
## 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].
If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
### Short version
@@ -11,31 +11,52 @@ If you have questions about how to install or use Nextcloud, please direct these
- 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 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/)
* This repository ([core](https://github.com/owncloud/core/issues)) is *only* for issues within the ownCloud core 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 security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* The issues in other components should be reported in their respective repositories:
- [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)
- [Documentation](https://github.com/owncloud/documentation/issues)
- Apps:
- [Activity](https://github.com/owncloud/activity/issues)
- [Bookmarks](https://github.com/owncloud/bookmarks/issues)
- [Calendar](https://github.com/owncloud/calendar/issues)
- [Contacts](https://github.com/owncloud/contacts/issues)
- [Documents](https://github.com/owncloud/documents/issues)
- [Gallery](https://github.com/owncloud/gallery/issues)
- [Mail](https://github.com/owncloud/mail/issues)
- [Music](https://github.com/owncloud/music/issues)
- [News](https://github.com/owncloud/news/issues)
- [Notes](https://github.com/owncloud/notes/issues)
- [Shorty](https://github.com/owncloud/shorty/issues)
- [Tasks](https://github.com/owncloud/tasks/issues)
- [All other apps](https://github.com/owncloud/apps/issues)
* Report the issue using our [template][template], it includes all the information we need to track down the issue.
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
[template]: https://raw.github.com/nextcloud/core/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://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: https://forum.owncloud.org/
[irc]: https://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].
Please read the [Developer Manuals][devmanual] to learn 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.
[devmanual]: https://docs.nextcloud.org/server/10/developer_manual/
[agreement]: https://owncloud.org/about/contributor-agreement/
[devmanual]: https://owncloud.org/dev
## Translations
Please submit translations via [Transifex][transifex].
[transifex]: https://www.transifex.com/nextcloud
[transifex]: https://www.transifex.com/projects/p/owncloud/
+26 -43
View File
@@ -1,55 +1,38 @@
# Nextcloud
[![Build Status](https://drone.weasel.rocks/api/badges/nextcloud/server/status.svg)](https://drone.weasel.rocks/nextcloud/server)
[![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)
# ownCloud
Please stay tuned while we get all the repositories up.
[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
A personal cloud which runs on your own server.
Meanwhile check out https://nextcloud.com and follow us on https://twitter.com/nextclouders
### Build Status on [Jenkins CI](https://ci.owncloud.org/)
Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
If you want to [contribute](https://nextcloud.com/contribute/), you are very welcome:
Quality:
- Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
- CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
- on our IRC channels #nextcloud & #nextcloud-dev irc://#nextcloud-dev@freenode.net (on freenode) and
- our forum at https://help.nextcloud.com
Dependencies:
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.
[![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
if you want to join the Github organization just let us know and well add you! :)
[![Dependency Status](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0)
*This is by the community, for the community. Everyone is welcome! :)*
### Installation instructions
https://doc.owncloud.org/server/8.2/developer_manual/app/index.html
![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
### Contribution Guidelines
https://owncloud.org/contribute/
## 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** You share your data with others, and give them access to your latest photo galleries, your calendar or anything else you want them to see.
* :rocket: **Expandable with dozens of Apps** ...like Calendar, Contacts, Mail or News.
* :cloud: **All Benefits of the Cloud** ...on your own Server.
* :lock: **Encryption** You can encrypt data in transit with secure https connections. You can enable the encryption app to encrypt data on storage for improved security and privacy.
* ...
### Get in touch
* [Forum](https://forum.owncloud.org)
* [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
* [Twitter](https://twitter.com/ownClouders)
## Contribution Guidelines
### Important notice on translations
Please submit translations via Transifex:
https://www.transifex.com/projects/p/owncloud/
All contributions to this repository from June, 16 2016 on are considered to be
licensed under the AGPLv3 or any later version.
[![Transifex](https://www.transifex.com/projects/p/owncloud/resource/core/chart/image_png)](https://www.transifex.com/projects/p/owncloud/)
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 he
changed it substantially:
```
@copyright Copyright (c) <year>, <your name> (<your email address>)
```
More information how to contribute: https://nextcloud.com/contribute/
## Support
Learn about the different ways you can get support for Nextcloud: https://nextcloud.com/support/
## Get in touch
* :clipboard: [Forum](https://help.nextcloud.com)
* :hash: [IRC channel](https://webchat.freenode.net/?channels=nextcloud)
* :busts_in_silhouette: [Facebook] (https://facebook.com/nextclouders)
* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
For more detailed information about translations:
http://doc.owncloud.org/server/8.2/developer_manual/core/translation.html
-30
View File
@@ -1,30 +0,0 @@
<?php
/**
*
* @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();
$auditLogger = new \OCA\Admin_Audit\AuditLogger($logger, $userSession, $groupManager);
$auditLogger->registerHooks();
-18
View File
@@ -1,18 +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.0.0</version>
<dependencies>
<owncloud min-version="9.0" max-version="9.1" />
</dependencies>
<types>
<logging/>
</types>
<default_enable/>
</info>
-78
View File
@@ -1,78 +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
*/
public function log($text,
array $params,
array $elements) {
foreach($elements as $element) {
if(!isset($params[$element])) {
$this->logger->critical(
sprintf(
'$params["'.$element.'"] was missing. Transferred value: %s',
print_r($params, true)
)
);
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'
]
);
}
}
-58
View File
@@ -1,58 +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',
]
);
}
public function loginSuccessful(array $params) {
$this->log(
'Login successful: "%s"',
$params,
[
'uid',
]
);
}
public function logout(array $params) {
$this->log(
'Logout occurred',
[],
[]
);
}
}
-137
View File
@@ -1,137 +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) {
$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) {
$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',
]
);
}
}
@@ -1,76 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @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 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'
]
);
}
}
-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',
]
);
}
}
-45
View File
@@ -1,45 +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;
use OCP\ILogger;
use OCP\IUserSession;
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,81 +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',
]
);
}
/**
* 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']
);
}
}
-188
View File
@@ -1,188 +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;
use OC\Files\Filesystem;
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\IUserSession;
use OCP\Util;
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
*/
public function __construct(ILogger $logger,
IUserSession $userSession,
IGroupManager $groupManager) {
$this->logger = $logger;
$this->userSession = $userSession;
$this->groupManager = $groupManager;
}
/**
* 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');
$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']);
}
/**
* 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);
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');
}
}
-323
View File
@@ -1,323 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.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/>
*
*/
namespace OCA\Comments\Activity;
use OCP\Activity\IExtension;
use OCP\Activity\IManager;
use OCP\Comments\ICommentsManager;
use OCP\Comments\NotFoundException;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
/**
* Class Extension
*
* @package OCA\Comments\Activity
*/
class Extension implements IExtension {
const APP_NAME = 'comments';
const ADD_COMMENT_SUBJECT = 'add_comment_subject';
const ADD_COMMENT_MESSAGE = 'add_comment_message';
/** @var IFactory */
protected $languageFactory;
/** @var IManager */
protected $activityManager;
/** @var ICommentsManager */
protected $commentsManager;
/** @var IURLGenerator */
protected $URLGenerator;
/**
* @param IFactory $languageFactory
* @param IManager $activityManager
* @param ICommentsManager $commentsManager
* @param IURLGenerator $URLGenerator
*/
public function __construct(IFactory $languageFactory, IManager $activityManager, ICommentsManager $commentsManager, IURLGenerator $URLGenerator) {
$this->languageFactory = $languageFactory;
$this->activityManager = $activityManager;
$this->commentsManager = $commentsManager;
$this->URLGenerator = $URLGenerator;
}
protected function getL10N($languageCode = null) {
return $this->languageFactory->get(self::APP_NAME, $languageCode);
}
/**
* The extension can return an array of additional notification types.
* If no additional types are to be added false is to be returned
*
* @param string $languageCode
* @return array|false
*/
public function getNotificationTypes($languageCode) {
$l = $this->getL10N($languageCode);
return array(
self::APP_NAME => (string) $l->t('<strong>Comments</strong> for files'),
);
}
/**
* For a given method additional types to be displayed in the settings can be returned.
* In case no additional types are to be added false is to be returned.
*
* @param string $method
* @return array|false
*/
public function getDefaultTypes($method) {
return $method === self::METHOD_STREAM ? [self::APP_NAME] : false;
}
/**
* A string naming the css class for the icon to be used can be returned.
* If no icon is known for the given type false is to be returned.
*
* @param string $type
* @return string|false
*/
public function getTypeIcon($type) {
switch ($type) {
case self::APP_NAME:
return 'icon-comment';
}
return false;
}
/**
* The extension can translate a given message to the requested languages.
* If no translation is available false is to be returned.
*
* @param string $app
* @param string $text
* @param array $params
* @param boolean $stripPath
* @param boolean $highlightParams
* @param string $languageCode
* @return string|false
*/
public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
if ($app !== self::APP_NAME) {
return false;
}
$l = $this->getL10N($languageCode);
if ($this->activityManager->isFormattingFilteredObject()) {
$translation = $this->translateShort($text, $l, $params);
if ($translation !== false) {
return $translation;
}
}
return $this->translateLong($text, $l, $params);
}
/**
* @param string $text
* @param IL10N $l
* @param array $params
* @return bool|string
*/
protected function translateShort($text, IL10N $l, array $params) {
switch ($text) {
case self::ADD_COMMENT_SUBJECT:
if ($this->authorIsCurrentUser($params[0])) {
return (string) $l->t('You commented');
}
return (string) $l->t('%1$s commented', $params);
case self::ADD_COMMENT_MESSAGE:
return $this->convertParameterToComment($params[0], 120);
}
return false;
}
/**
* @param string $text
* @param IL10N $l
* @param array $params
* @return bool|string
*/
protected function translateLong($text, IL10N $l, array $params) {
switch ($text) {
case self::ADD_COMMENT_SUBJECT:
if ($this->authorIsCurrentUser($params[0])) {
return (string) $l->t('You commented on %2$s', $params);
}
return (string) $l->t('%1$s commented on %2$s', $params);
case self::ADD_COMMENT_MESSAGE:
return $this->convertParameterToComment($params[0]);
}
return false;
}
/**
* Check if the author is the current user
*
* @param string $user Parameter e.g. `<user display-name="admin">admin</user>`
* @return bool
*/
protected function authorIsCurrentUser($user) {
try {
return strip_tags($user) === $this->activityManager->getCurrentUserId();
} catch (\UnexpectedValueException $e) {
// FIXME this is awkward, but we have no access to the current user in emails
return false;
}
}
/**
* The extension can define the type of parameters for translation
*
* Currently known types are:
* * file => will strip away the path of the file and add a tooltip with it
* * username => will add the avatar of the user
*
* @param string $app
* @param string $text
* @return array|false
*/
public function getSpecialParameterList($app, $text) {
if ($app === self::APP_NAME) {
switch ($text) {
case self::ADD_COMMENT_SUBJECT:
return [
0 => 'username',
1 => 'file',
];
}
}
return false;
}
/**
* The extension can define the parameter grouping by returning the index as integer.
* In case no grouping is required false is to be returned.
*
* @param array $activity
* @return integer|false
*/
public function getGroupParameter($activity) {
return false;
}
/**
* The extension can define additional navigation entries. The array returned has to contain two keys 'top'
* and 'apps' which hold arrays with the relevant entries.
* If no further entries are to be added false is no be returned.
*
* @return array|false
*/
public function getNavigation() {
$l = $this->getL10N();
return [
'apps' => [],
'top' => [
self::APP_NAME => [
'id' => self::APP_NAME,
'name' => (string) $l->t('Comments'),
'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::APP_NAME]),
],
],
];
}
/**
* The extension can check if a custom filter (given by a query string like filter=abc) is valid or not.
*
* @param string $filterValue
* @return boolean
*/
public function isFilterValid($filterValue) {
return $filterValue === self::APP_NAME;
}
/**
* The extension can filter the types based on the filter if required.
* In case no filter is to be applied false is to be returned unchanged.
*
* @param array $types
* @param string $filter
* @return array|false
*/
public function filterNotificationTypes($types, $filter) {
if ($filter === self::APP_NAME) {
return array_intersect($types, [self::APP_NAME]);
}
return false;
}
/**
* For a given filter the extension can specify the sql query conditions including parameters for that query.
* In case the extension does not know the filter false is to be returned.
* The query condition and the parameters are to be returned as array with two elements.
* E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
*
* @param string $filter
* @return array|false
*/
public function getQueryForFilter($filter) {
return false;
}
/**
* @param string $parameter
* @return string
*/
protected function convertParameterToComment($parameter, $maxLength = 0) {
if (preg_match('/^\<parameter\>(\d*)\<\/parameter\>$/', $parameter, $matches)) {
try {
$comment = $this->commentsManager->get((int) $matches[1]);
$message = $comment->getMessage();
$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
if ($maxLength && isset($message[$maxLength + 20])) {
$findSpace = strpos($message, ' ', $maxLength);
if ($findSpace !== false && $findSpace < $maxLength + 20) {
return substr($message, 0, $findSpace) . '…';
}
return substr($message, 0, $maxLength + 20) . '…';
}
return $message;
} catch (NotFoundException $e) {
return '';
}
}
return '';
}
}
-129
View File
@@ -1,129 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.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/>
*
*/
namespace OCA\Comments\Activity;
use OCP\Activity\IManager;
use OCP\App\IAppManager;
use OCP\Comments\CommentsEvent;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Share;
class Listener {
/** @var IManager */
protected $activityManager;
/** @var IUserSession */
protected $session;
/** @var \OCP\App\IAppManager */
protected $appManager;
/** @var \OCP\Files\Config\IMountProviderCollection */
protected $mountCollection;
/** @var \OCP\Files\IRootFolder */
protected $rootFolder;
/**
* Listener constructor.
*
* @param IManager $activityManager
* @param IUserSession $session
* @param IAppManager $appManager
* @param IMountProviderCollection $mountCollection
* @param IRootFolder $rootFolder
*/
public function __construct(IManager $activityManager,
IUserSession $session,
IAppManager $appManager,
IMountProviderCollection $mountCollection,
IRootFolder $rootFolder) {
$this->activityManager = $activityManager;
$this->session = $session;
$this->appManager = $appManager;
$this->mountCollection = $mountCollection;
$this->rootFolder = $rootFolder;
}
/**
* @param CommentsEvent $event
*/
public function commentEvent(CommentsEvent $event) {
if ($event->getComment()->getObjectType() !== 'files'
|| !in_array($event->getEvent(), [CommentsEvent::EVENT_ADD])
|| !$this->appManager->isInstalled('activity')) {
// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
return;
}
// Get all mount point owners
$cache = $this->mountCollection->getMountCache();
$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId());
if (empty($mounts)) {
return;
}
$users = [];
foreach ($mounts as $mount) {
$owner = $mount->getUser()->getUID();
$ownerFolder = $this->rootFolder->getUserFolder($owner);
$nodes = $ownerFolder->getById($event->getComment()->getObjectId());
if (!empty($nodes)) {
/** @var Node $node */
$node = array_shift($nodes);
$path = $node->getPath();
if (strpos($path, '/' . $owner . '/files/') === 0) {
$path = substr($path, strlen('/' . $owner . '/files'));
}
// Get all users that have access to the mount point
$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
}
}
$actor = $this->session->getUser();
if ($actor instanceof IUser) {
$actor = $actor->getUID();
} else {
$actor = '';
}
$activity = $this->activityManager->generateEvent();
$activity->setApp(Extension::APP_NAME)
->setType(Extension::APP_NAME)
->setAuthor($actor)
->setObject($event->getComment()->getObjectType(), $event->getComment()->getObjectId())
->setMessage(Extension::ADD_COMMENT_MESSAGE, [
$event->getComment()->getId(),
]);
foreach ($users as $user => $path) {
$activity->setAffectedUser($user);
$activity->setSubject(Extension::ADD_COMMENT_SUBJECT, [
$actor,
$path,
]);
$this->activityManager->publish($activity);
}
}
}
-54
View File
@@ -1,54 +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', 'app');
\OCP\Util::addScript('comments', 'commentmodel');
\OCP\Util::addScript('comments', 'commentcollection');
\OCP\Util::addScript('comments', 'commentsummarymodel');
\OCP\Util::addScript('comments', 'commentstabview');
\OCP\Util::addScript('comments', 'filesplugin');
\OCP\Util::addStyle('comments', 'comments');
}
);
$activityManager = \OC::$server->getActivityManager();
$activityManager->registerExtension(function() {
$application = new \OCP\AppFramework\App('comments');
/** @var \OCA\Comments\Activity\Extension $extension */
$extension = $application->getContainer()->query('OCA\Comments\Activity\Extension');
return $extension;
});
$managerListener = function(\OCP\Comments\CommentsEvent $event) use ($activityManager) {
$application = new \OCP\AppFramework\App('comments');
/** @var \OCA\Comments\Activity\Listener $listener */
$listener = $application->getContainer()->query('OCA\Comments\Activity\Listener');
$listener->commentEvent($event);
};
$eventDispatcher->addListener(\OCP\Comments\CommentsEvent::EVENT_ADD, $managerListener);
-16
View File
@@ -1,16 +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 Shiwon, Vincent Petry</author>
<default_enable/>
<version>0.2</version>
<dependencies>
<owncloud min-version="9.0" max-version="9.0" />
</dependencies>
<types>
<logging/>
</types>
</info>
-133
View File
@@ -1,133 +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 .newCommentForm {
margin-bottom: 20px;
}
#commentsTabView .newCommentForm .message {
width: 90%;
resize: vertical;
}
#commentsTabView .newCommentForm .submitLoading {
background-position: left;
}
#commentsTabView .comment {
margin-bottom: 30px;
}
#commentsTabView .comment .avatar {
width: 28px;
height: 28px;
line-height: 28px;
}
#commentsTabView .comment {
position: relative;
z-index: 1;
}
#commentsTabView .comment.collapsed .message {
white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
white-space: -webkit-pre-wrap; /*Chrome & Safari */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
white-space: pre-wrap; /* css-3 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
word-break: break-all;
white-space: normal;
}
#commentsTabView .comment.collapsed .message {
max-height: 70px;
overflow: hidden;
}
#commentsTabView .comment .message-overlay {
display: none;
}
#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 .comment .authorRow {
margin-bottom: 5px;
position: relative;
}
#commentsTabView .comment .author {
font-weight: bold;
}
#commentsTabView .comment .date {
position: absolute;
right: 0;
}
#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;
}
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1">
<path fill="#fff" d="m16 3c-8.8366 0-16 4.9248-16 11s7.1634 11 16 11c0.49926 0 0.98116-0.03174 1.4688-0.0625l8.5312 7.062v-9.406c3.658-2.016 6-5.1198 6-8.594 0-6.0752-7.164-11-16-11z"/>
</svg>

Before

Width:  |  Height:  |  Size: 326 B

-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);
-58
View File
@@ -1,58 +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) {
var NS_OWNCLOUD = 'http://owncloud.org/ns';
/**
* @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': '{' + NS_OWNCLOUD + '}id',
'message': '{' + NS_OWNCLOUD + '}message',
'actorType': '{' + NS_OWNCLOUD + '}actorType',
'actorId': '{' + NS_OWNCLOUD + '}actorId',
'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
'objectType': '{' + NS_OWNCLOUD + '}objectType',
'objectId': '{' + NS_OWNCLOUD + '}objectId',
'isUnread': '{' + NS_OWNCLOUD + '}isUnread'
},
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')
};
}
});
OCA.Comments.CommentModel = CommentModel;
})(OC, OCA);
-435
View File
@@ -1,435 +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="empty hidden">{{emptyResultLabel}}</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">' +
' {{#if avatarEnabled}}' +
' <div class="avatar" data-username="{{actorId}}"></div>' +
' {{/if}}' +
' <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 class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
' <input class="submit" type="submit" value="{{submitText}}" />' +
'{{#if isEditMode}}' +
' <input class="cancel" 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">' +
' {{#if avatarEnabled}}' +
' <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
' {{/if}}' +
' <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" 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._avatarsEnabled = !!OC.config.enable_avatars;
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({
avatarEnabled: this._avatarsEnabled,
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({
avatarEnabled: this._avatarsEnabled,
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName,
newMessagePlaceholder: t('comments', 'Type in a 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({
avatarEnabled: this._avatarsEnabled,
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 other comments available'),
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');
if (this._avatarsEnabled) {
this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 28);
}
this.delegateEvents();
this.$el.find('textarea').on('keyup input change', this._onTypeComment);
},
_formatItem: function(commentModel) {
var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
var data = _.extend({
date: OC.Util.relativeModifiedDate(timestamp),
altDate: OC.Util.formatDate(timestamp),
formattedMessage: this._formatMessage(commentModel.get('message'))
}, 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('.empty').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();
if(this._avatarsEnabled) {
$el.find('.avatar').each(function() {
var $this = $(this);
$this.avatar($this.attr('data-username'), 28);
});
}
},
/**
* Convert a message to be displayed in HTML,
* converts newlines to <br> tags.
*/
_formatMessage: function(message) {
return escapeHTML(message).replace(/\n/g, '<br/>');
},
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('keyup input change', this._onTypeComment);
// copy avatar element from original to avoid flickering
$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
$formRow.find('.has-tooltip').tooltip();
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);
},
_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(msg) {
$loading.addClass('hidden');
$comment.removeClass('disabled');
OC.Notification.showTemporary(msg);
}
});
return false;
},
_onClickShowMore: function(ev) {
ev.preventDefault();
this.nextPage();
},
_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('textarea');
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) {
var $row = $form.closest('.comment');
$submit.removeClass('hidden');
$loading.addClass('hidden');
$row.data('commentEl')
.removeClass('hidden')
.find('.message')
.html(self._formatMessage(model.get('message')));
$row.remove();
},
error: function(msg) {
$submit.removeClass('hidden');
$loading.addClass('hidden');
$textArea.prop('disabled', false);
OC.Notification.showTemporary(msg);
}
});
} 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() {
$submit.removeClass('hidden');
$loading.addClass('hidden');
$textArea.val('').prop('disabled', false);
},
error: function(msg) {
$submit.removeClass('hidden');
$loading.addClass('hidden');
$textArea.prop('disabled', false);
OC.Notification.showTemporary(msg);
}
});
}
return false;
},
/**
* 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);
-65
View File
@@ -1,65 +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) {
var NS_OWNCLOUD = 'http://owncloud.org/ns';
/**
* @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': '{' + NS_OWNCLOUD + '}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);
-123
View File
@@ -1,123 +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() {
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: t('comments', '{count} unread comments', {count: 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 NS_OC = 'http://owncloud.org/ns';
var oldGetWebdavProperties = fileList._getWebdavProperties;
fileList._getWebdavProperties = function() {
var props = oldGetWebdavProperties.apply(this, arguments);
props.push('{' + NS_OC + '}comments-unread');
return props;
};
fileList.filesClient.addFileInfoParser(function(response) {
var data = {};
var props = response.propStat[0].properties;
var commentsUnread = props['{' + NS_OC + '}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);
View File
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "إلغاء",
"Save" : "حفظ",
"Comment" : "تعليق"
},
"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;");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "إلغاء",
"Save" : "حفظ",
"Comment" : "تعليق"
},"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;"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Encaboxar",
"Save" : "Guardar",
"Comment" : "Comentariu"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Encaboxar",
"Save" : "Guardar",
"Comment" : "Comentariu"
},"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);"
}
-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);"
}
-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);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancel·la",
"Save" : "Desa",
"Comment" : "Comentari"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Cancel·la",
"Save" : "Desa",
"Comment" : "Comentari"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"%1$s commented" : "%1$s okomentován",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"Comments" : "Komentáře",
"Type in a new comment..." : "Zadat nový komentář...",
"Delete comment" : "Smazat komentář",
"Post" : "Zveřejnit",
"Cancel" : "Zrušit",
"Edit comment" : "Upravit komentář",
"[Deleted user]" : "[Smazaný uživatel]",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"{count} unread comments" : "{count} nepřečtených komentářů",
"Comment" : "Komentář",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"%1$s commented" : "%1$s okomentován",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"Comments" : "Komentáře",
"Type in a new comment..." : "Zadat nový komentář...",
"Delete comment" : "Smazat komentář",
"Post" : "Zveřejnit",
"Cancel" : "Zrušit",
"Edit comment" : "Upravit komentář",
"[Deleted user]" : "[Smazaný uživatel]",
"No other comments available" : "Nejsou dostupné žádné další komentáře",
"More comments..." : "Více komentářů...",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"{count} unread comments" : "{count} nepřečtených komentářů",
"Comment" : "Komentář",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
},"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;"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Annullér",
"Save" : "Gem",
"Comment" : "Kommentér"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Annullér",
"Save" : "Gem",
"Comment" : "Kommentér"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"%1$s commented" : "%1$s kommentiert",
"%1$s commented on %2$s" : "%1$s kommentiert %2$s",
"Comments" : "Kommentare",
"Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
"No other comments available" : "Keine andere Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"{count} unread comments" : "{count} ungelesene Kommentare",
"Comment" : "Kommentar",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"%1$s commented" : "%1$s kommentiert",
"%1$s commented on %2$s" : "%1$s kommentiert %2$s",
"Comments" : "Kommentare",
"Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
"No other comments available" : "Keine andere Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"{count} unread comments" : "{count} ungelesene Kommentare",
"Comment" : "Kommentar",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
},"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);");
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"%1$s commented" : "%1$s kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"Comments" : "Kommentare",
"Type in a new comment..." : "Neuer Kommentar...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[gelöschter Benutzer]",
"No other comments available" : "Keine anderen Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"{count} unread comments" : "[count] ungelesene Kommentare",
"Comment" : "Kommentar",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"%1$s commented" : "%1$s kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"Comments" : "Kommentare",
"Type in a new comment..." : "Neuer Kommentar...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[gelöschter Benutzer]",
"No other comments available" : "Keine anderen Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"{count} unread comments" : "[count] ungelesene Kommentare",
"Comment" : "Kommentar",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-13
View File
@@ -1,13 +0,0 @@
OC.L10N.register(
"comments",
{
"Comments" : "Σχόλια",
"Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
"Delete comment" : "Διαγραφή σχολίου",
"Cancel" : "Άκυρο",
"Edit comment" : "Επεξεργασία σχολίου",
"More comments..." : "Περισσότερα σχόλια...",
"Save" : "Αποθήκευση",
"Comment" : "Σχόλιο"
},
"nplurals=2; plural=(n != 1);");
-11
View File
@@ -1,11 +0,0 @@
{ "translations": {
"Comments" : "Σχόλια",
"Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
"Delete comment" : "Διαγραφή σχολίου",
"Cancel" : "Άκυρο",
"Edit comment" : "Επεξεργασία σχολίου",
"More comments..." : "Περισσότερα σχόλια...",
"Save" : "Αποθήκευση",
"Comment" : "Σχόλιο"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"%1$s commented" : "%1$s commented",
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"Comments" : "Comments",
"Type in a new comment..." : "Type in a new comment...",
"Delete comment" : "Delete comment",
"Post" : "Post",
"Cancel" : "Cancel",
"Edit comment" : "Edit comment",
"[Deleted user]" : "[Deleted user]",
"No other comments available" : "No other comments available",
"More comments..." : "More comments...",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
"{count} unread comments" : "{count} unread comments",
"Comment" : "Comment",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"%1$s commented" : "%1$s commented",
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"Comments" : "Comments",
"Type in a new comment..." : "Type in a new comment...",
"Delete comment" : "Delete comment",
"Post" : "Post",
"Cancel" : "Cancel",
"Edit comment" : "Edit comment",
"[Deleted user]" : "[Deleted user]",
"No other comments available" : "No other comments available",
"More comments..." : "More comments...",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
"{count} unread comments" : "{count} unread comments",
"Comment" : "Comment",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
"%1$s commented" : "%1$s komentis",
"%1$s commented on %2$s" : "%1$s komentis %2$s",
"Comments" : "Komentoj",
"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]",
"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",
"<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
"%1$s commented" : "%1$s komentis",
"%1$s commented on %2$s" : "%1$s komentis %2$s",
"Comments" : "Komentoj",
"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]",
"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",
"<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"%1$s commented" : "%1$s comentados",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"Comments" : "Comentarios",
"Type in a new comment..." : "Ingrese un nuevo comentario...",
"Delete comment" : "Borrar comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"No other comments available" : "No hay otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"{count} unread comments" : "{count} comentarios no leídos",
"Comment" : "Comentario",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"%1$s commented" : "%1$s comentados",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"Comments" : "Comentarios",
"Type in a new comment..." : "Ingrese un nuevo comentario...",
"Delete comment" : "Borrar comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"No other comments available" : "No hay otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"{count} unread comments" : "{count} comentarios no leídos",
"Comment" : "Comentario",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancelar",
"Save" : "Guardar"
},
"nplurals=2; plural=(n != 1);");
-5
View File
@@ -1,5 +0,0 @@
{ "translations": {
"Cancel" : "Cancelar",
"Save" : "Guardar"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-6
View File
@@ -1,6 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancelar"
},
"nplurals=2; plural=(n != 1);");
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancelar",
"Save" : "Guardar",
"Comment" : "Comentario"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Cancelar",
"Save" : "Guardar",
"Comment" : "Comentario"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-19
View File
@@ -1,19 +0,0 @@
OC.L10N.register(
"comments",
{
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
"Comments" : "Kommentaarid",
"Type in a new comment..." : "Kirjuta uus komentaar...",
"Delete comment" : "Kustuta kommentaar",
"Post" : "Postita",
"Cancel" : "Loobu",
"Edit comment" : "Muuda kommentaari",
"[Deleted user]" : "[Kustutatud kasutaja]",
"No other comments available" : "Ühtegi teist kommentaari pole saadaval",
"More comments..." : "Veel kommentaare...",
"Save" : "Salvesta",
"Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
"{count} unread comments" : "{count} lugemata kommentaari",
"Comment" : "Kommentaar"
},
"nplurals=2; plural=(n != 1);");
-17
View File
@@ -1,17 +0,0 @@
{ "translations": {
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
"Comments" : "Kommentaarid",
"Type in a new comment..." : "Kirjuta uus komentaar...",
"Delete comment" : "Kustuta kommentaar",
"Post" : "Postita",
"Cancel" : "Loobu",
"Edit comment" : "Muuda kommentaari",
"[Deleted user]" : "[Kustutatud kasutaja]",
"No other comments available" : "Ühtegi teist kommentaari pole saadaval",
"More comments..." : "Veel kommentaare...",
"Save" : "Salvesta",
"Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
"{count} unread comments" : "{count} lugemata kommentaari",
"Comment" : "Kommentaar"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Ezeztatu",
"Save" : "Gorde",
"Comment" : "Iruzkina"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Ezeztatu",
"Save" : "Gorde",
"Comment" : "Iruzkina"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "منصرف شدن",
"Save" : "ذخیره",
"Comment" : "نظر"
},
"nplurals=1; plural=0;");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "منصرف شدن",
"Save" : "ذخیره",
"Comment" : "نظر"
},"pluralForm" :"nplurals=1; plural=0;"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
"%1$s commented" : "%1$s kommentoi",
"%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
"Comments" : "Kommentit",
"Type in a new comment..." : "Kirjoita uusi kommentti...",
"Delete comment" : "Poista kommentti",
"Post" : "Lähetä",
"Cancel" : "Peruuta",
"Edit comment" : "Muokkaa kommenttia",
"[Deleted user]" : "[Poistettu käyttäjä]",
"No other comments available" : "Ei muita kommentteja saatavilla",
"More comments..." : "Lisää kommentteja...",
"Save" : "Tallenna",
"Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
"{count} unread comments" : "{count} lukematonta kommenttia",
"Comment" : "Kommentti",
"<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
"%1$s commented" : "%1$s kommentoi",
"%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
"Comments" : "Kommentit",
"Type in a new comment..." : "Kirjoita uusi kommentti...",
"Delete comment" : "Poista kommentti",
"Post" : "Lähetä",
"Cancel" : "Peruuta",
"Edit comment" : "Muokkaa kommenttia",
"[Deleted user]" : "[Poistettu käyttäjä]",
"No other comments available" : "Ei muita kommentteja saatavilla",
"More comments..." : "Lisää kommentteja...",
"Save" : "Tallenna",
"Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
"{count} unread comments" : "{count} lukematonta kommenttia",
"Comment" : "Kommentti",
"<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
"%1$s commented" : "%1$s a commenté",
"%1$s commented on %2$s" : "%1$s a commenté %2$s",
"Comments" : "Commentaires",
"Type in a new comment..." : "Écrire un nouveau commentaire...",
"Delete comment" : "Supprimer le commentaire",
"Post" : "Poster",
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
"No other comments available" : "Aucun autre commentaire",
"More comments..." : "Plus de commentaires...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
"{count} unread comments" : "{count} commentaires non lus",
"Comment" : "Commenter",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
},
"nplurals=2; plural=(n > 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
"%1$s commented" : "%1$s a commenté",
"%1$s commented on %2$s" : "%1$s a commenté %2$s",
"Comments" : "Commentaires",
"Type in a new comment..." : "Écrire un nouveau commentaire...",
"Delete comment" : "Supprimer le commentaire",
"Post" : "Poster",
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
"No other comments available" : "Aucun autre commentaire",
"More comments..." : "Plus de commentaires...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
"{count} unread comments" : "{count} commentaires non lus",
"Comment" : "Commenter",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
}
-8
View File
@@ -1,8 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancelar",
"Save" : "Gardar",
"Comment" : "Comentario"
},
"nplurals=2; plural=(n != 1);");
-6
View File
@@ -1,6 +0,0 @@
{ "translations": {
"Cancel" : "Cancelar",
"Save" : "Gardar",
"Comment" : "Comentario"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-22
View File
@@ -1,22 +0,0 @@
OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
"%1$s commented" : "התקבלו תגובות %1$s",
"%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
"Comments" : "תגובות",
"Type in a new comment..." : "יש להכניס תגובה חדשה...",
"Delete comment" : "מחיקת תגובה",
"Post" : "פרסום",
"Cancel" : "ביטול",
"Edit comment" : "עריכת תגובה",
"[Deleted user]" : "[משתמשים מוסרים]",
"No other comments available" : "אין תגובות אחרות זמינות",
"More comments..." : "תגובות נוספות...",
"Save" : "שמירה",
"Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
"{count} unread comments" : "{count} תגובות שלא נקראו",
"Comment" : "תגובה",
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
},
"nplurals=2; plural=(n != 1);");
-20
View File
@@ -1,20 +0,0 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
"%1$s commented" : "התקבלו תגובות %1$s",
"%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
"Comments" : "תגובות",
"Type in a new comment..." : "יש להכניס תגובה חדשה...",
"Delete comment" : "מחיקת תגובה",
"Post" : "פרסום",
"Cancel" : "ביטול",
"Edit comment" : "עריכת תגובה",
"[Deleted user]" : "[משתמשים מוסרים]",
"No other comments available" : "אין תגובות אחרות זמינות",
"More comments..." : "תגובות נוספות...",
"Save" : "שמירה",
"Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
"{count} unread comments" : "{count} תגובות שלא נקראו",
"Comment" : "תגובה",
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
},"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);"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Odustanite",
"Save" : "Spremi"
},
"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
-5
View File
@@ -1,5 +0,0 @@
{ "translations": {
"Cancel" : "Odustanite",
"Save" : "Spremi"
},"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;"
}
-13
View File
@@ -1,13 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Mégsem",
"Save" : "Mentés",
"Comment" : "Komment",
"<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
"Delete comment" : "Hozzászólás törlése",
"Edit comment" : "Hozzászólás szerkesztése",
"No other comments available" : "Nincs több hozzászólás.",
"Post" : "Küldés"
},
"nplurals=2; plural=(n != 1);");
-11
View File
@@ -1,11 +0,0 @@
{ "translations": {
"Cancel" : "Mégsem",
"Save" : "Mentés",
"Comment" : "Komment",
"<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
"Delete comment" : "Hozzászólás törlése",
"Edit comment" : "Hozzászólás szerkesztése",
"No other comments available" : "Nincs több hozzászólás.",
"Post" : "Küldés"
},"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);"
}
-7
View File
@@ -1,7 +0,0 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancellar",
"Save" : "Salveguardar"
},
"nplurals=2; plural=(n != 1);");

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