wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22667 commits 157 branches 562 tags 714 MiB
Commit graph

8261 commits

Author SHA1 Message Date
Robin Appelman
70fd3a267f Cache app versions 2015-02-03 14:13:44 +01:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Thomas Müller
92bc1b44d5 Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag 
include core version into js/css version tag
 2015-02-02 15:02:11 +01:00
Thomas Müller
24daee836a include core version into js/css version tag - fixes #13702 2015-02-02 13:02:11 +01:00
Morris Jobke
1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies 
encryption requires openssl and user_ldap requires ldap 🙊
 2015-02-02 12:49:45 +01:00
Thomas Müller
82b271855c add libs which have no version number 2015-02-02 10:49:46 +01:00
Jenkins for ownCloud
800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Morris Jobke
e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache 
Dont remove a file from cache if the delete operation failed
 2015-01-30 14:08:44 +01:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Vincent Petry
790622e9fd Merge pull request #13772 from owncloud/closecursor-allconfig 
Close cursor after checking for existing config values
 2015-01-29 19:31:21 +01:00
Morris Jobke
b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares 
make sure that we always create a public share key for remote shares
 2015-01-29 17:54:04 +01:00
Robin Appelman
ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman
2124540d1d Dont remove a file from cache if the delete operation failed 2015-01-29 15:39:56 +01:00
Lukas Reschke
65ec950b27 Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces 
Scroll to file in folder, when using "search in other places" link
 2015-01-29 15:36:25 +01:00
Björn Schießle
2c1bacadca Merge pull request #13762 from owncloud/ignore_trailing_slash 
ignore trailing slash for remote URL
 2015-01-29 15:00:44 +01:00
Morris Jobke
acf0582029 Merge pull request #13752 from owncloud/closecursor1 
Close cursor early in calculateFolderSize
 2015-01-29 14:23:16 +01:00
Bjoern Schiessle
c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Bjoern Schiessle
82de50d5b9 remove trailing slash 2015-01-29 14:03:09 +01:00
Robin Appelman
05035ef4af Fix webdav put for single file webdav shares 2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00 Fix resolving paths for views rooted in a file 2015-01-29 12:47:11 +01:00
Joas Schilling
54303484eb Scroll to file in folder, when using "search in other places" link 2015-01-29 12:21:20 +01:00
Robin Appelman
41382ef7fc Merge pull request #13667 from owncloud/rename-always-update-cache 
Update the cache when renaming even if we dont emit hooks
 2015-01-28 17:15:11 +01:00
Robin Appelman
8c9f1a982c Update the cache when renaming even if we dont emit hooks 2015-01-28 13:44:39 +01:00
Lukas Reschke
20199dd168 Reference module with .c 
Fixes https://github.com/owncloud/core/issues/13657
 2015-01-28 13:15:32 +01:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Morris Jobke
1efb1fee11 Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection 
let init() take a ICollection or an INode - fixes PHP message
 2015-01-28 01:14:47 +01:00
Morris Jobke
752b94d363 Merge pull request #13717 from owncloud/storage-donotwrapnullstorage 
Prevent wrapping null storage
 2015-01-28 01:00:20 +01:00
Morris Jobke
87b39e8f03 Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage 
Catch storage exception in scanner for remote shares
 2015-01-28 00:31:37 +01:00
Vincent Petry
6d8985b671 Prevent wrapping null storage 
Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())
 2015-01-27 17:40:08 +01:00
Bernhard Posselt
3fa6e0f4dc Merge pull request #13718 from owncloud/use-proper-namespace 
Use proper namespace
 2015-01-27 17:39:35 +01:00
Lukas Reschke
bedf358b40 Use proper namespace 
IAppManager lives in OCP\App and not in OCP.

Fixes https://github.com/owncloud/core/issues/13710
 2015-01-27 17:34:25 +01:00
Vincent Petry
acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix 
Call final unlink in trash wrapper's storage
 2015-01-27 17:05:38 +01:00
Vincent Petry
12867b9c78 Fix return type of addStorageWrapper in PHPDoc 2015-01-27 16:41:43 +01:00
Morris Jobke
4d90fd933f Merge pull request #13699 from owncloud/check-if-file-exists 
Use `file_exists` to verify that config file exists
 2015-01-27 14:16:40 +01:00
Lukas Reschke
9771ead7dd Merge pull request #13701 from owncloud/disable-appcode-checker 
disable the app code checker - some previous shipped apps cannot be inst...
 2015-01-27 11:53:03 +01:00
Thomas Müller
b7cf4d551e let init() take an INode - fixes PHP message 2015-01-27 11:31:37 +01:00
Thomas Müller
956de27e94 Merge pull request #13676 from owncloud/fix-node-iface 
Fix node interface
 2015-01-27 09:34:59 +01:00
Thomas Müller
9a75304b02 disable the app code checker - some previous shipped apps cannot be installed from the appstore now 👊 2015-01-27 09:27:38 +01:00
Thomas Müller
f248ee013b Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error 
Make error more descriptive
 2015-01-27 09:15:57 +01:00
Jenkins for ownCloud
c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Lukas Reschke
17f2cfbb9c Use file_exists to verify that config file exists 
There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file.

This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems.

Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720
 2015-01-27 00:50:14 +01:00
Lukas Reschke
d8559dc78f Make error more descriptive 
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
 2015-01-26 23:00:15 +01:00
Bjoern Schiessle
5ba19ba7fc certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a certificate manager only needs the user-id, no need to pass on the complete user object 2015-01-26 16:58:52 +01:00
Bernhard Posselt
b8769802df fix node interface 2015-01-26 15:58:41 +01:00
Vincent Petry
87ce64c24e Replace OC_Log::ERROR with OCP\Util::ERROR 2015-01-26 15:51:31 +01:00
Vincent Petry
f6e644b43f Catch storage exception in scanner for remote shares 
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.

Also, getDirectoryContent() will now skip unavailable storages.
 2015-01-26 13:59:49 +01:00
Thomas Müller
5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset 
Add a method to set/unset multiple config values with one write
 2015-01-26 13:36:22 +01:00