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

2199 commits

Author SHA1 Message Date
Thomas Müller
6cdb1d89ae Merge pull request #10761 from canadaduane/fix_occ_upgrade 
Ensure db connection before changing cache state
 2014-09-03 11:27:16 +02:00
Thomas Müller
52dc31e13c Merge pull request #10725 from owncloud/sabredav-etag-master 
adding OC-ETag header
 2014-09-03 11:21:47 +02:00
Lukas Reschke
77c0adb520 Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils 2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c Add char consts, hash the specified password for the HMAC 2014-09-03 11:03:27 +02:00
Olivier Paroz
0c3c72aec0 Libreoffice config folder needs to be set 
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.

Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid
 2014-09-03 03:12:35 +02:00
Olivier Paroz
b559b21dc3 Converts TIFF files to PNG 2014-09-02 22:56:39 +02:00
Olivier Paroz
1e600a0d36 Adding support for tiff files 2014-09-02 22:53:41 +02:00
Vincent Petry
e05b95636b Fix upgrade process when apps enabled for specific groups 
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
 2014-09-02 17:16:14 +02:00
Robin Appelman
a9a37b5363 Don't automatically setup the filesystem the moment we load OC\Files\FileSystem 2014-09-02 16:15:42 +02:00
cbhp
969b41c1c9 added missing User-Agents 
header "User-Agent" was missed
 2014-08-31 19:44:06 +02:00
Morris Jobke
4024960a0e Merge pull request #10780 from owncloud/config-public 
Extend public config interface
 2014-08-31 15:54:35 +02:00
Lukas Reschke
8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed 
Make external shares work with imported self signed certificates
 2014-08-31 15:50:30 +02:00
Robin Appelman
0a1e5aebf1 Extend public config interface 2014-08-31 15:27:36 +02:00
Lukas Reschke
ae3425d2da Merge branch 'master' into securityutils 
Conflicts:
	lib/private/util.php
 2014-08-31 15:21:09 +02:00
Lukas Reschke
a197ef0f6c Merge pull request #10768 from owncloud/l10n-use-public 
Use public api for getting l10n
 2014-08-31 11:58:59 +02:00
Robin Appelman
bfa0c4b78a Explicitly set the timezones 2014-08-31 11:06:18 +02:00
Lukas Reschke
4efe6f6240 Add unit tests and fix rootcerts creation bug 2014-08-31 10:47:50 +02:00
Robin Appelman
e64aa330fd check for blacklisted file certificate filenames 2014-08-31 10:47:50 +02:00
Robin Appelman
79d896e830 Rename namespace 2014-08-31 10:47:50 +02:00
Robin Appelman
6044ad0e17 Cleanup certificate code 2014-08-31 10:47:50 +02:00
Robin Appelman
ba8416a04f move certificate classes to their own namespace 2014-08-31 10:47:50 +02:00
Robin Appelman
c158db7200 Add certificate class 2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman
4efdbff6df No need for this folder to be world accessible 2014-08-31 10:45:11 +02:00
Robin Appelman
dcc4f96d3e Verify names of certificates 2014-08-31 10:45:11 +02:00
Robin Appelman
ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Morris Jobke
06e6f10ce4 Add optional user ID parameter for getUseFolder 2014-08-31 09:49:19 +02:00
Duane Johnson
ccf440495e Ensure db connection before changing cache state 
When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path
(e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the
following fatal error:

```
/var/www/owncloud# php occ upgrade
PHP Fatal error:  Call to a member function
  disableQueryStatementCaching() on a non-object in
  /var/www/owncloud/lib/private/db.php on line 423
```

This is caused by the self::$connection static variable having not
been initialized at the point of call. Adding a self::connect() fixes
the issue.

See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556
 2014-08-30 15:46:56 -06:00
cetra3
6b24aa5224 Refactor internal session to write directly to $_SESSION 2014-08-30 08:48:13 +00:00
Robin Appelman
0b88355368 Merge pull request #10721 from owncloud/kill-rand 
Kill insecure random number generation
 2014-08-29 19:48:00 +02:00
Morris Jobke
3a4b71ffb4 Merge pull request #10734 from owncloud/fix-10268 
retrieve local users, groups and group members in a sorted way
 2014-08-29 19:35:32 +02:00
Lukas Reschke
35276def1c Merge pull request #10614 from owncloud/remove-ee-hack 
Remove different URL for EE
 2014-08-29 18:23:15 +02:00
Jörn Friedrich Dreyer
10382ef2f0 allow empty hostname and dots in service name for oracle autosetup 2014-08-29 17:09:17 +02:00
Robin Appelman
3de69ff81b Don't register the call when rendering error pages 2014-08-29 15:44:39 +02:00
Robin Appelman
dd7b8e4555 Remove insecure fallback random number generation 2014-08-29 15:44:09 +02:00
Arthur Schiwon
0bb460c9b5 retrieve local users, groups and group members in a sorted way 2014-08-29 15:17:37 +02:00
Thomas Müller
96a931929e adding OC-ETag header 2014-08-29 12:09:33 +02:00
Thomas Müller
647120fb36 adding new webdav property containing the folder size 2014-08-29 11:39:02 +02:00
Jörn Friedrich Dreyer
f551917a3c kill OC::$session 
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
 2014-08-29 10:22:21 +02:00
voxsim
a49610e18a change logic in displayNamesInGroup and add some unit tests 2014-08-28 13:51:48 +02:00
Arthur Schiwon
aeb9cfc6c9 make sure class file is loaded once 2014-08-28 12:34:29 +02:00
Lukas Reschke
9ab62ad5b7 Escape error messages 2014-08-27 17:01:51 +02:00
Clark Tomlinson
cb0da1178b Merge pull request #10653 from owncloud/x-forwarded-for 
Add support for getting the real client IP behind proxies
 2014-08-27 10:32:34 -04:00
Pascal de Bruijn
49da0a7943 defaults: add customizable defaultiTunesAppId 2014-08-27 14:07:39 +02:00
Björn Schießle
c35d60f6d8 Merge pull request #9915 from suraia/unsharefromself-source 
Allow specifying the item source in unshareFromSelf().
 2014-08-27 10:31:35 +02:00
Lukas Reschke
3329e0f2b2 Use DI 2014-08-27 00:49:53 +02:00
Lukas Reschke
d26a9c3c58 Add some security utilities 
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions

Remove .htaccess

Remove .htaccess

Fix typo

Add public API

Use timing constant comparision

Remove CBC constant

Adjust code

Remove confusing $this
 2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1 Add support for getting the real client IP behind proxies 
Fixes https://github.com/owncloud/core/issues/10624

Fix copy paste fail

Add unittest for comma separated headers

Revert 3rdparty
 2014-08-27 00:05:04 +02:00
Thomas Müller
2e8026a7b5 Merge pull request #10619 from owncloud/issue/6722 
Add a test to break the slugifyPath() with folder and file afterwards
 2014-08-26 10:33:18 +02:00
Lukas Reschke
ca7e4c8c67 Add isAppstoreEnabled instead of hijacking the URL 2014-08-26 10:20:51 +02:00
Clark Tomlinson
6523c575f3 Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries 
Do not try to close the same resource multiple times
 2014-08-25 12:52:06 -04:00
Vincent Petry
c86824fa09 Merge pull request #10023 from owncloud/tmp-file-created-status 
Log unsuccessful temp file creation and return false
 2014-08-25 17:24:46 +02:00
Joas Schilling
989da69cff Do not try to close the same resource multiple times 2014-08-25 15:31:43 +02:00
Joas Schilling
1846aebfff Use md5() of the original name instead of uniqid() for slugifying 
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.

If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.

Fix #6722
 2014-08-25 15:06:12 +02:00
Joas Schilling
b861e1d696 Fix code layout before fixing the function 2014-08-25 15:06:10 +02:00
Jörn Friedrich Dreyer
ebf7758d10 Merge pull request #10595 from owncloud/swift-stream 
Stream downloads from Swift object stores without downloading it first
 2014-08-25 11:26:39 +02:00
Lukas Reschke
4bc72cc4e0 Remove different URL for EE 
This can now be achieved by setting `appstoreenabled` to `false` in config.php
 2014-08-24 20:22:15 +02:00
Clark Tomlinson
2ad0d3f1be Throw exception if file cannot be accessed via http 
Format file

Removing calls to deprecated classes and using internal method to get via http

Missed a character

Fix inverted logic
 2014-08-22 19:41:30 -04:00
Thomas Müller
a77d468d35 Merge pull request #10584 from owncloud/simple-wizard-trusted-domains 
Add a trusted domain wizard
 2014-08-22 17:12:17 +02:00
Lukas Reschke
88c3a4a31a Expose setSystemValue 2014-08-22 15:53:23 +02:00
Thomas Müller
0e8916b147 Merge pull request #7539 from owncloud/repair-legacystorageid 
Added repair script to upgrade the legacy home storage ids
 2014-08-22 14:22:39 +02:00
Robin Appelman
191a82e768 Stream downloads from Swift object stores without downloading it first 2014-08-22 14:11:36 +02:00
Thomas Müller
b8b2ef8748 no statement caching for Oracle 2014-08-22 12:06:36 +02:00
Robin Appelman
63570df75f Add files as string to tar archives 2014-08-21 08:49:57 +02:00
Robin Appelman
88c32861bc reformat 2014-08-21 08:49:57 +02:00
Vincent Petry
8f201c7383 Explicily close the statement cursors 
Fixes the issue that makes SQLite freeze on later tests.
 2014-08-20 23:49:15 +02:00
Lukas Reschke
92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload 
Fix storage const autoload
 2014-08-20 23:23:42 +02:00
Vincent Petry
068f9d10f1 Added repair step for legacy storages 2014-08-20 23:14:05 +02:00
Vincent Petry
36c88e2830 Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported 
Return whole file if range request cannot be granted due to encryption
 2014-08-20 18:14:09 +02:00
Morris Jobke
9a5e745a64 fix typo 2014-08-19 16:45:22 +02:00
Morris Jobke
b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik
5d7deefd95 Use tabs for indentation. 
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-08-19 13:55:43 +02:00
Stephan Peijnik
2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. 
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-08-19 13:55:35 +02:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Thomas Müller
1c23f54d42 Merge pull request #10341 from owncloud/issue/9928 
[Issue/9928] Problems with filemtime in MappedLocal Storage
 2014-08-19 10:10:09 +02:00
Vincent Petry
ec274ad40b Use afterBind to send fileId header for files and directories 
afterBind is called for both files and directories and is now used to
send the OC-FileId headers.
 2014-08-18 18:40:58 +02:00
helix84
722a119e46 fix typo in util.php 2014-08-18 15:59:36 +02:00
Robin Appelman
ab590ce9a0 fix undefined variable 2014-08-18 15:30:46 +02:00
Thomas Müller
62e06cb0ba Merge pull request #10472 from owncloud/fix_undefined_index_ocsid 
check if array index ocsid is set before accessing it
 2014-08-18 10:43:21 +02:00
Thomas Müller
c933848c55 Merge pull request #10156 from owncloud/issue/9968 
Check return of fopen() before using it
 2014-08-18 10:35:04 +02:00
Frank Karlitschek
ddeb301ad6 Merge pull request #10456 from kroimon/skeleton_dir_config 
Make skeleton directory configurable.
 2014-08-17 20:01:02 -04:00
Georg Ehrke
7347174636 check if array index ocsid is set before accessing it 2014-08-17 22:26:14 +02:00
Lukas Reschke
a2677c14c8 Remove X-Mailer header from mails 2014-08-17 18:55:13 +02:00
Stefan Rado
ccc46be740 Make skeleton directory configurable. 2014-08-16 01:07:42 +02:00
Lukas Reschke
a822a31ce3 Merge pull request #10442 from owncloud/move-failed-logins 
Move authentication failed logging to checkPassword
 2014-08-15 16:50:28 +02:00
Lukas Reschke
98fc56831d Merge pull request #9275 from NormalRa/master 
Add .apk mimetype.
 2014-08-15 14:41:53 +02:00
Lukas Reschke
a82cd1ff67 Fix unit test 2014-08-15 14:15:27 +02:00
Lukas Reschke
5bb4772858 Move authentication failed logging to checkPassword 
Fixes https://github.com/owncloud/core/issues/10366
 2014-08-15 12:13:00 +02:00
Jörn Friedrich Dreyer
799fb46927 add missing @deprecated annotation to legacy classes 2014-08-14 22:18:12 +02:00
Thomas Müller
c1102b1671 Merge pull request #10417 from owncloud/update_deprecation_doc 
update deprecation docs
 2014-08-14 17:54:23 +02:00
Björn Schießle
64c3fe670c Merge pull request #10399 from owncloud/fix_setSendMailStatus 
[sharing] fix mail notification
 2014-08-14 17:45:39 +02:00
Joas Schilling
4d32e3548b Ensure that filename is prefixed with a slash 2014-08-14 16:48:30 +02:00
Clark Tomlinson
4502eaf9f8 Merge pull request #10414 from owncloud/relax-code-checker 
in order to prevent false-positives on the code checker - exec and eval ...
 2014-08-14 09:35:20 -04:00
Vincent Petry
cc8c1d8e07 Return whole file if range request cannot be granted due to encryption 
Whenenver range headers are set and encryption is enabled, it is not
possible to automatically fseek() to the proper position.

To avoid returning corrupt/invalid data or causing a decryption error,
the range headers are stripped so that the SabreDAV code in httpGet()
returns the whole file.
 2014-08-14 15:18:49 +02:00
Jörn Friedrich Dreyer
fd798fd982 update deprecation docs 2014-08-14 12:22:34 +02:00
Morris Jobke
987a0565fb Merge pull request #10395 from owncloud/close-filehandle-lib-files 
Close open file handles in files library
 2014-08-14 10:57:54 +02:00
Thomas Müller
a4932dc5e2 in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for 2014-08-14 10:48:42 +02:00
Thomas Müller
6d94fc846d Merge pull request #10394 from owncloud/close-filehandle-lib-image 
Close file handle if exception occurs in image class
 2014-08-13 22:41:33 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Bjoern Schiessle
d9f35d8c15 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-13 17:02:51 +02:00
Morris Jobke
c6bf51c457 Close open file handles in files library 
ref #10392
 2014-08-13 15:48:32 +02:00
Morris Jobke
f61658945f Close file handle if exception occurs in image class 
ref #10392
 2014-08-13 15:19:58 +02:00
Robin Appelman
174805f5e3 Merge pull request #9762 from owncloud/owner-public 
Return the proper owner for home storages
 2014-08-12 14:29:17 +02:00
Normal Ra
1633ec5c87 APK mimetype icon to be a generic package icon. 2014-08-12 14:10:49 +02:00
Clark Tomlinson
e63853a353 Merge pull request #10335 from owncloud/fix-emptyapplist 
Fix issue when no apps are enabled
 2014-08-11 16:16:18 -04:00
Thomas Müller
3e493501da Merge pull request #9890 from owncloud/check-php-charset-master 
setting and checking default_charset in php.ini to be UTF-8
 2014-08-11 22:11:11 +02:00
Vincent Petry
a32eac1477 Fix issue when no apps are enabled 
Properly initialize $apps array
 2014-08-11 20:36:51 +02:00
Joas Schilling
564bf23c1b Do not filemtime() on "." directory. Use empty string instead 
Fix #9928
 2014-08-11 17:39:37 +02:00
Joas Schilling
d7666d9d3d Remove doubled slash between folder and path 2014-08-11 16:50:52 +02:00
Thomas Müller
13d44f8f7f Merge pull request #10251 from owncloud/fix-dav-attributes-master 
shared files/folders are not mounted
 2014-08-11 14:40:47 +02:00
Vincent Petry
79fa2bc391 Merge pull request #10301 from owncloud/fix-internal-mail-share-links 
Don't use /Shared as a base for links in share email
 2014-08-11 13:33:39 +02:00
Vincent Petry
f2001a48a4 Fixed sort algo for additional cases 2014-08-11 13:28:53 +02:00
Vincent Petry
173059f6d0 Fixed file list sorting 
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
 2014-08-11 13:28:53 +02:00
Thomas Müller
b83d00f847 Merge pull request #10249 from mroi/patch-1 
file size on non-(Linux/BSD/Windows)-installations
 2014-08-11 13:02:01 +02:00
Tom Needham
aeef10eb47 Add scrollto to the url if sharing a file for long file lists 2014-08-09 00:21:29 +01:00
Tom Needham
16dafa9cac Fix link to files and folders in internal share emails 2014-08-09 00:08:45 +01:00
Bjoern Schiessle
6dda30b5a2 remove share permissions if user is excluded from sharing 2014-08-08 12:16:54 +02:00
Morris Jobke
b6a2a85bb8 Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf 
implement a txt preview fallback for the case that ttf is not support
 2014-08-07 22:55:06 +02:00
Thomas Müller
520f6422ac Merge pull request #10079 from owncloud/Improve_scanner_message 
Improved scanner error message
 2014-08-07 16:09:52 +02:00
Thomas Müller
9d2cff50ed shared files/folders are not mounted 2014-08-07 16:01:13 +02:00
Michael Roitzsch
cde1a9241d file size on non-(Linux/BSD/Windows)-installations 
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
 2014-08-07 15:41:58 +02:00
Thomas Müller
e33fc2807c Merge pull request #10142 from owncloud/fix-#9283-gzip_support 
Removed broken tar cutter, added tar and fixed extension switch.
 2014-08-07 14:53:31 +02:00
Robin Appelman
f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Thomas Müller
d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis 
Travis support for PRs and master, stable5 and stable6
 2014-08-07 11:33:13 +02:00
Volkan Gezer
173538befb typo fix from transifex suggestion 2014-08-06 20:48:26 +02:00
Robin Appelman
12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Robin Appelman
1deb6aadd3 return null instead of throwing an exception 2014-08-06 12:06:41 +02:00
Thomas Müller
a72dae6842 Merge pull request #10144 from owncloud/issue/9972 
Issue/9972 Fix issues with group and username `0`
 2014-08-06 09:53:13 +02:00
Morris Jobke
9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash 
[sharing] remove trailing slash
 2014-08-05 23:13:35 +02:00
Bjoern Schiessle
48c57b80e3 remove trailing slash from path 2014-08-05 20:34:32 +02:00
Björn Schießle
d35bfc9a4c Merge pull request #9520 from owncloud/theme_urls 
Add ability to theme iOS and Android client URLs just like desktop URLs.
 2014-08-05 17:53:18 +02:00
Robin Appelman
bf8f910a32 Fix Folder::getById 2014-08-05 16:58:10 +02:00
Morris Jobke
676fa459d7 Minor fixes 
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
 2014-08-05 16:53:28 +02:00
Robin Appelman
244d4e1399 Make View->shouldEmitHooks more robust 2014-08-05 16:53:28 +02:00
Morris Jobke
8561d0dfca remove escaping because it's unneeded 2014-08-05 13:18:38 +02:00
Morris Jobke
7b222c4ab5 fix uppercase issue 2014-08-05 13:16:51 +02:00
scolebrook
2e127d2c5e Add ability to theme iOS and Android client URLs just like desktop URLs. 2014-08-05 13:16:51 +02:00
Bjoern Schiessle
41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Morris Jobke
c0e78d9841 Merge pull request #10151 from owncloud/issue/9912 
Increase word wrap limit for emails to 78 characters
 2014-08-05 08:20:57 +02:00
Joas Schilling
303f6da76f Check return of fopen() before using it 
Fix #9968
 2014-08-04 17:53:06 +02:00
Joas Schilling
f4c7e3c1e9 Merge pull request #10083 from th3fallen/fix-9969-take-two 
Fix 9969
 2014-08-04 17:41:03 +02:00
Joas Schilling
c1b8d93cb0 Increase word wrap limit for emails to 78 characters 2014-08-04 16:05:09 +02:00
Joas Schilling
4865c52aa6 Fix isLoggedIn() check for user '0' 
Fix #9972
 2014-08-04 15:53:55 +02:00
Joas Schilling
f80baf03d4 Fix getting group '0' from database backend 
Fix #9972
 2014-08-04 15:53:55 +02:00
Remco Brenninkmeijer
cb842ba793 Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch. 2014-08-04 14:10:09 +02:00
Robin Appelman
8b4d3c065c only set core version at the end 2014-08-04 13:42:16 +02:00
Robin Appelman
ae263da69a Also set the app version when updating from app store 2014-08-04 13:41:05 +02:00
Robin Appelman
776cc45a5a Allow loading app without checking the upgrade 2014-08-04 13:41:05 +02:00
Robin Appelman
4602d1f2a6 extract upgrade parts to their own methods 2014-08-04 13:41:05 +02:00
Robin Appelman
4608f8a3b5 Throw an exception when we try to load an app that needs to be upgraded 2014-08-04 13:41:04 +02:00
Robin Appelman
43d790239d Extend OC_Util::needUpgrade to also catch app upgrades 2014-08-04 13:41:04 +02:00
Thomas Müller
65903a012a Merge pull request #10025 from owncloud/l10n-typo 
typo fix from transifex suggestion
 2014-08-04 11:03:50 +02:00
Volkan Gezer
7a07690b25 expire -> expiration 2014-08-02 04:02:39 +02:00
Jörn Friedrich Dreyer
a0ab4c2434 fix return documentation 2014-08-01 13:42:35 +02:00
Thomas Müller
378f35f0ec prevent PHP errors and enhance logging 2014-08-01 09:54:32 +02:00
Volkan Gezer
5f015067f4 suggestions by deepdiver 2014-08-01 01:39:52 +02:00
Clark Tomlinson
26af116fcd Removing unnecessary switch statements in fopen methods. 2014-07-31 09:34:27 -04:00
Martin
d975012ae6 Improved scanner error message 2014-07-31 13:12:35 +02:00
Thomas Müller
4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text 
Use svg mimeicons for empty text files
 2014-07-31 11:38:29 +02:00
Jan-Christoph Borchardt
5b11a18dea Merge pull request #10044 from owncloud/transparency_fix 
extract transparency fix from #8050
 2014-07-30 18:36:51 +02:00
Morris Jobke
62b37fbb99 Merge pull request #10024 from owncloud/preview-restrict-height 
Also keep maxY into account when scaling a preview while preserving aspect ratio
 2014-07-30 17:22:20 +02:00
Jörn Friedrich Dreyer
dd9347fdd2 Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload 
Cache factory needs to use globalPrefix in createLowLatency()
 2014-07-30 16:56:45 +02:00
Robin Appelman
4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Georg Ehrke
fa461befbc extract transparency fix from #8050 2014-07-30 16:13:33 +02:00
Morris Jobke
38e309b0fe Merge pull request #9970 from owncloud/sharing_set_expire_date 
Sharing set expire date
 2014-07-30 14:37:16 +02:00
Volkan Gezer
90d8f42d7c typo fix from transifex suggestion 2014-07-30 14:07:32 +02:00
Robin Appelman
c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Victor Dubiniuk
0113ad0b33 Log unsuccessful temp file creation and return false 2014-07-30 13:50:41 +02:00
Thomas Müller
54d5d03271 Merge pull request #9888 from owncloud/mysql-tinyint-master 
migration test for sqlite - adding type mapping for 'tinyint unsigned'
 2014-07-30 11:48:10 +02:00
Andreas Fischer
9be8ac5867 Memcache\Factory: Remove static, use globalPrefix. 2014-07-29 11:14:36 +02:00
Bjoern Schiessle
67e302885c remove share permission if user is excluded from sharing 2014-07-29 10:08:08 +02:00
Thomas Müller
58472a2660 migration test for sqlite - adding type mapping for 'tinyint unsigned' 2014-07-29 09:18:37 +02:00
Bjoern Schiessle
4e87ac2bb9 make sure that we set the expire date if a date is adefault date is set 2014-07-28 22:45:03 +02:00
Björn Schießle
c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Morris Jobke
1fbbaed261 Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster 
generate copy of sqlite database file in data directory
 2014-07-28 16:54:52 +02:00
Robin Appelman
cb0ff19dc4 Merge pull request #9924 from owncloud/eventsource-nginx-buffering 
Prevent nginx from buffering event source events
 2014-07-28 16:17:35 +02:00
Georg Ehrke
4e8e69dc81 implement a txt preview fallback for the case that ttf is not support 2014-07-28 13:05:08 +02:00
Thomas Müller
539d2b7ec3 Merge pull request #9784 from josh4trunks/libreoffice_match_cl 
Cleanup Document Preview
 2014-07-28 13:03:33 +02:00
Thomas Müller
a3411e3719 Merge pull request #9641 from owncloud/localuser-addressbook 
ownCloud users are exported as address book
 2014-07-28 12:18:56 +02:00
Thomas Müller
534fb9ebf9 Merge pull request #9631 from owncloud/update-getid3 
update getID3 library
 2014-07-28 11:51:36 +02:00
Thomas Müller
11214219f3 Merge pull request #9819 from owncloud/updater-setversionafterupdate 
Set version AFTER a successful update
 2014-07-28 11:19:57 +02:00
Thomas Müller
0aa652ecfd Merge pull request #9859 from tiezdne/master 
Update mimetypes.list.php
 2014-07-28 11:16:43 +02:00
Thomas Müller
cfaa05cc0e Merge pull request #9905 from owncloud/joblist-non-existing-class 
Dont try to execute jobs that no longer exist
 2014-07-28 11:09:27 +02:00
Thomas Müller
ab8efe3aa2 Merge pull request #9935 from owncloud/harden-get-urlco 
Verify whether the URL is valid
 2014-07-28 11:07:41 +02:00
Thomas Müller
c87f425fe7 generate copy of sqlite database file in data directory 2014-07-28 10:29:39 +02:00
Thomas Müller
f2982b7a08 Merge pull request #9904 from owncloud/loggedout-getuserfolder 
Dont throw an error when calling $server->getUserFolder when logged out
 2014-07-28 10:04:01 +02:00
Lukas Reschke
260729fd7d Verify whether the URL is valid 
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017

@karlitschek Backport for stable6 and stable7 requested.
 2014-07-27 16:46:32 +02:00
Robin Appelman
2c4e06d325 Prevent nginx from buffering event source events 2014-07-26 16:07:11 +02:00
Michael Kuhn
ecdd04374a Allow specifying the item source in unshareFromSelf(). 2014-07-26 02:00:49 +02:00
Robin Appelman
43978befda Dont try to execute jobs that no longer exist 2014-07-25 18:02:02 +02:00
Robin Appelman
acafb4a426 Merge pull request #9669 from owncloud/group-public 
Add group management to the public api
 2014-07-25 17:55:12 +02:00
Robin Appelman
bf12bba079 Dont throw an error when calling $server->getUserFolder when logged out 2014-07-25 17:52:50 +02:00
Morris Jobke
ae3761f15d add autoload 2014-07-25 17:37:33 +02:00
Morris Jobke
a9666c4f5b update getID3 library 2014-07-25 15:25:45 +02:00
Bjoern Schiessle
ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Thomas Müller
07dc0b2fdf setting and checking default_charset in php.ini to be UTF-8 2014-07-25 09:53:25 +02:00
Thomas Müller
176ecbd311 ownCloud users are exported as address book 2014-07-24 17:35:02 +02:00
Thomas Müller
788a2eca2f Merge pull request #9841 from owncloud/fix-password-reset-master 
Fix password reset in console command and lost password controller
 2014-07-24 15:58:02 +02:00
tiezdne
6a2f3921f6 Update mimetypes.list.php 2014-07-24 15:43:55 +02:00
Thomas Müller
a8b6cc6a07 - adding default value for $recoveryPassword 
- set password correctly in lost password
 2014-07-24 12:50:39 +02:00
Thomas Müller
7d60f7a222 register type mappings for unknown/unsupported mysql types 2014-07-24 12:17:26 +02:00
Vincent Petry
6f329dcb6c Set version AFTER a successful update 
If an app upgrade failed, the core version will not be increased either
in the database. This will re-display the update page and make it
possible to redo the apps upgrade.

Note that any core repair routine must take into account that an update
might need to be redone again even though the core's DB state is already
the one of the new version.
 2014-07-23 23:38:17 +02:00
Thomas Müller
363ba04f5e only commit in case a transaction is active 2014-07-23 20:13:19 +02:00
josh4trunks
acd5660492 Cleanup Document Preview 
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php.
This will stop the creating of multiple directories for document conversion in tmpDir.
 2014-07-22 22:46:38 -07:00
Sander
4e2954673a Revert change 2014-07-22 19:45:01 +02:00
Sander
eacdf26cde Allow getAppFolder to get another apps path 
cc @Raydiation
 2014-07-22 16:07:43 +02:00
Thomas Müller
31149fb1c3 adding special handling of checkPrecondition() for chunked upload 2014-07-22 13:06:20 +02:00
Robin Appelman
e9de20952a Return the proper owner for home storages 2014-07-21 16:59:59 +02:00
Thomas Müller
0a9e0d1051 perm -> permissions 2014-07-21 13:49:22 +02:00
Vincent Petry
3df7a83c72 Merge pull request #9406 from philfry/master 
silently discard the response body, needed for apache/mod_dav and maybe ...
 2014-07-21 12:22:06 +02:00
Andreas Fischer
8cd1f7464e Merge pull request #9672 from owncloud/mysql-affectedrows 
Make MySQL affected row count consistent with other DBMSes

* owncloud/mysql-affectedrows:
  Added test of OCS privatedata to trigger key duplication
  Document why we have to check with defined() first.
  Make MySQL return "number of found rows" instead of number of "affected rows".
 2014-07-20 21:29:16 +02:00
Frank Karlitschek
f92b5a2507 update appstore api url 2014-07-17 21:54:46 -04:00
Robin Appelman
5a0397eb5e Fix renaming files in the root folder of a MappedLocal storage 2014-07-16 21:24:18 +02:00
icewind1991
d58c8d72cf Merge pull request #9550 from kofemann/dcache-fixes-for-upstream 
storage: do not check file mode on rename
 2014-07-16 16:06:14 +02:00
Andreas Fischer
d8bd8c4b66 Document why we have to check with defined() first. 2014-07-16 15:13:35 +02:00
Andreas Fischer
e26612244a Make MySQL return "number of found rows" instead of number of "affected rows". 2014-07-16 14:35:47 +02:00
Robin Appelman
94fa21d146 Add group management to the public api 2014-07-16 14:25:31 +02:00
Stephan Peijnik
4d74aa09bf Port of #9584 
Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-07-16 12:23:26 +02:00
Björn Schießle
7d8a8e78fa Merge pull request #9640 from owncloud/fix_9627 
make sure that 'OC_Theme' exists before checking if the method exists
 2014-07-16 10:12:52 +02:00
Thomas Müller
0f9b22107b Merge pull request #9644 from owncloud/fix_user_api 
Fix user api
 2014-07-15 23:57:02 +02:00
blizzz
10b59f101f Merge pull request #9540 from owncloud/use_fileinfo_in_search_results 
use fileinfo object in search results
 2014-07-15 19:49:36 +02:00
Bjoern Schiessle
6967d328e2 make sure that 'OC_Theme' exists before checking if the method exists 2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer
818929274d use UserSession service to resolve user id 2014-07-15 17:42:17 +02:00
Vincent Petry
a8d95356ca Merge pull request #8987 from owncloud/lastindexid-debug 
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
 2014-07-15 17:01:57 +02:00
icewind1991
61b5a770e4 Merge pull request #9561 from libasys/patch-3 
Fix Error undefined index: file_target
 2014-07-15 16:54:57 +02:00
Thomas Müller
6c93bcc814 Merge pull request #9621 from owncloud/fix_logger_implementation 
fix logger implementation
 2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer
4a855be814 fix logger implementation and test 2014-07-15 10:10:16 +02:00
Thomas Müller
e8f02b9410 Merge pull request #9562 from owncloud/users-groupfilter 
Do not filter groups, but therefore update the user counts according to  the filter
 2014-07-15 07:40:55 +02:00
Thomas Müller
73e2bf7bf4 fixing PHPDoc 2014-07-14 21:26:47 +02:00
Arthur Schiwon
ab2c7e06a4 remove dead code 
do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests
 2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer
8f11019f45 mkae getRelativePath of file search results overwriteable in subclasses 2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer
eea5c2ee0a return relative path 2014-07-14 19:12:06 +02:00
Robin Appelman
c3991ae13e Use the correct path when building the FileInfo for the search result 2014-07-14 18:32:45 +02:00
Morris Jobke
9ee1c7ff71 Merge pull request #9228 from owncloud/remove-routing-singular-issues 
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
 2014-07-14 17:10:07 +02:00
Thomas Müller
4b91741875 Merge pull request #9598 from owncloud/fix-app-installation-master 
append file extension to the temporary file which contains the downloade...
 2014-07-14 17:05:36 +02:00
Vincent Petry
10a29556b0 - Added test to trigger index id error 
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
 2014-07-14 16:20:09 +02:00
Robin Appelman
20c1ce7f47 Add public interfaces for User, UserManager and UserSession 2014-07-14 15:10:51 +02:00
Björn Schießle
05ba9b3c64 Merge pull request #9539 from enoch85/patch-1 
Fix for #9422
 2014-07-14 12:58:23 +02:00
Vincent Petry
e58dce2ee0 Merge pull request #9571 from owncloud/fix_appstore_update_issue 
Fix update to button issue
 2014-07-14 10:00:39 +02:00
Thomas Müller
e47cd5ebf1 append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable 2014-07-11 16:51:59 +02:00
Georg Ehrke
fb685b0856 improve check for duplicate apps 2014-07-10 17:18:10 +02:00
Georg Ehrke
305db9c2d7 add proper version comparision in OC_Installer::isUpdateAvailable 2014-07-10 17:17:55 +02:00
Morris Jobke
e33ef0d449 Merge pull request #9536 from owncloud/default-app-groups-master 
Default app groups master
 2014-07-10 15:45:44 +02:00
Tigran Mkrtchyan
03f422153d files: storage: rename should check parent directories of old and new files 
as described by POSIX.1-2008
(see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html)

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-07-10 14:58:59 +02:00
libasys
cd88c2fd7b Update share.php 
change isset with empty on line 1911
 2014-07-10 13:19:35 +02:00
libasys
b395ff549b Update share.php 
Added isset for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```
 2014-07-10 13:02:04 +02:00
Georg Ehrke
380aacdf93 fix orientation in image-backend, not in preview system itself 2014-07-09 23:07:58 +02:00
Jörn Friedrich Dreyer
3f093974f9 use fileinfo object in search results 2014-07-09 14:47:43 +02:00
Daniel Hansson
851c1f87d6 Fix for #9422 2014-07-09 14:40:05 +02:00
Thomas Müller
5d2a3c83ac adding 'groups' entry to remote apps 2014-07-09 11:23:17 +02:00
Thomas Müller
1ae6e1bcf8 fixing typos 2014-07-09 10:20:17 +02:00
Thomas Müller
63fdaacbfc Merge pull request #9510 from libasys/patch-1 
BugFix missing $item on 'file_target' Line 1911
 2014-07-09 07:58:37 +02:00
Thomas Müller
10978a80c2 Merge pull request #9507 from owncloud/fix-9302-master 
Upload abortion is now detected within the  OC_Connector_Sabre_File::put...
 2014-07-08 17:39:34 +02:00
Thomas Müller
65d9d6ad01 Merge pull request #9412 from owncloud/public-api-activity 
Public api activity
 2014-07-08 16:37:18 +02:00
Arthur Schiwon
3338a0f236 port of #9500 
don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged
 2014-07-08 16:32:01 +02:00
Robin Appelman
3e3d460729 use case insensitive LIKE when searching for files in mysql 2014-07-08 15:49:27 +02:00
Robin Appelman
76c709d7de Add repair step to set MySQL collation to utf8_bin 
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
 2014-07-08 15:12:07 +02:00
Thomas Müller
ea269f0067 Upload abortion is now detected within the OC_Connector_Sabre_File::put() 
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
 2014-07-08 11:09:59 +02:00
libasys
e70a7af6da BugFix missing $item on 'file_target' Line 1911 
I think this should be right!
 2014-07-08 10:51:05 +02:00
Thomas Müller
8363f3c635 Adding new interface \OCP\Activity\IExtentsion 
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
 2014-07-08 09:04:37 +02:00
Morris Jobke
29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids 
Add ocsids for shipped apps in core repo
 2014-07-07 19:58:41 +02:00
Morris Jobke
b2377129b6 Merge pull request #9494 from owncloud/issue/9490 
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
 2014-07-07 19:36:41 +02:00
Georg Ehrke
e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Joas Schilling
e8537afd60 Only overwrite serverHost when in unit tests 
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
 2014-07-07 15:08:45 +02:00
Thomas Müller
b091b15f0b MySQL: adding repair step to convert MyIsam tables to InnoDB 2014-07-07 12:32:24 +02:00
Vincent Petry
5c444c2da8 Merge pull request #9468 from owncloud/fix_logout_error_messages 
better validation: cadd extra check if appinfo/info.xml exists
 2014-07-07 10:58:23 +02:00
Georg Ehrke
1565089c02 fix phpDocBlock for OC_App::getAppInfo 2014-07-05 13:32:21 +02:00
Georg Ehrke
042ec984bd better validation: cadd extra check if appinfo/info.xml exists 2014-07-05 13:28:47 +02:00
Jörn Friedrich Dreyer
8fbcca1291 Merge pull request #9419 from owncloud/fix_search_results_in_root_dir 
Fix search results in root dir & deprecate OC_Search_Provider
 2014-07-04 18:28:54 +02:00
Björn Schießle
a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete 
[sharing] unshare childrens on delete
 2014-07-04 17:42:52 +02:00
icewind1991
d3fab824f7 Merge pull request #9445 from owncloud/filelist-auth-error 
Reload the page when the files app encounters an authentication error
 2014-07-04 16:39:00 +02:00
Robin Appelman
4fe1cdd2a7 Add machine readable error messages to OC\JSON 
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
 2014-07-04 16:20:27 +02:00
Jörn Friedrich Dreyer
aeeae5f1b2 Merge pull request #8308 from owncloud/case_insensitive_search_oracle 
use case insensitive linguistic sort and compare when connecting to oracle
 2014-07-04 15:51:57 +02:00
Thomas Müller
2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview 
change order of registering api and capabilities to fix file version previews
 2014-07-04 15:25:24 +02:00
Bjoern Schiessle
e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Jörn Friedrich Dreyer
b5545b81c6 make search case insensitive on postgres and oracle 2014-07-03 19:01:00 +02:00
Jörn Friedrich Dreyer
b56f5f2773 deprecate OC_Search_Provider in favor of \OCP\Search\Provider 2014-07-03 16:03:09 +02:00
Vincent Petry
2fec6cbd5b Remove forgotten debug log 2014-07-03 12:26:17 +02:00
Philippe Kueck
ef114b6594 silently discard the response body, needed for apache/mod_dav and maybe other dav servers which return an html body 2014-07-03 12:04:38 +02:00
Vincent Petry
ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target 
don't move a share mount point into a different mount point
 2014-07-02 21:01:03 +02:00
Vincent Petry
f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available 
Handle storages not being available in webui and webdav
 2014-07-02 18:15:58 +02:00
Morris Jobke
904e3102d3 Merge pull request #9288 from owncloud/fix_dispatcher_null_values 
don't typecast null values inside dispatcher.php
 2014-07-02 15:29:33 +02:00
Robin Appelman
c4fa07d7cf Also update sqliteadapter 2014-07-02 15:27:27 +02:00
Robin Appelman
edb67f9f4d Remove invalid mounts from the active fs 2014-07-02 15:00:12 +02:00
Volkan Gezer
805a7cf485 Merge pull request #9338 from owncloud/fix-redirect-for-appframework 
Redirect after session expiry to the previous loaded page
 2014-07-02 11:39:41 +02:00
Vincent Petry
94c3bac9ed Merge pull request #9327 from owncloud/migrator-postgreskeywordtest 
Added migrator test for reserved keyword
 2014-07-01 20:40:18 +02:00
Vincent Petry
3d921ed3c3 Merge pull request #9334 from owncloud/defaultappfix 
Default app fix
 2014-07-01 20:39:13 +02:00
Bjoern Schiessle
bb935978fa don't move a share mount point into a different mount point 2014-07-01 19:38:55 +02:00
Jonny007-MKD
4161fd2408 Update adapter.php 
Modified insertIfNotExist() to support NULL values
 2014-07-01 17:47:27 +02:00
Bjoern Schiessle
735eac6c9d add a explicit interface for the home storage 2014-07-01 17:31:33 +02:00
Vincent Petry
7c17452028 Added unit test for default app URL 2014-07-01 16:55:29 +02:00
Morris Jobke
b6a4cc20f7 Redirect after session expiry to the previous loaded page 
* fixes #6945
 2014-07-01 16:54:52 +02:00
Jörn Friedrich Dreyer
5a588333b2 introduce and use getCurrentConnection() 2014-07-01 16:45:00 +02:00
Vincent Petry
3e78f41d00 Use getAbsoluteUrl for redirection URL 
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
 2014-07-01 16:02:38 +02:00
Vincent Petry
c005515ebd Support for multiple default apps 
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
 2014-07-01 15:42:26 +02:00
Robin Appelman
8161104420 Catch StorageInvalidException in webdav 2014-07-01 15:03:29 +02:00
blizzz
616f9b1e03 Merge pull request #9156 from owncloud/solve-8959 
search term for users and groups may occur anywhere in the name or displ...
 2014-07-01 14:37:09 +02:00
Vincent Petry
894d69184a Add bak defaultapp setting 2014-07-01 14:28:45 +02:00
Jörn Friedrich Dreyer
dd20b9f672 reset collection to 'root' after adding a route to the api 2014-07-01 14:21:20 +02:00
Vincent Petry
b752aff51d Fix migrator tests to use the correct migrator instances 2014-07-01 12:54:35 +02:00
Jan-Christoph Borchardt
75a5746b70 Merge pull request #9306 from owncloud/publicneedsupgrade 
Return 503 in  public.php and OCS API when upgrade is due
 2014-07-01 11:52:39 +02:00
Arthur Schiwon
16275eca84 loop over usernames, not passwords 2014-06-30 20:43:50 +02:00
Robin Appelman
99960d7747 Handle StorageNotAvailableException in webdav 2014-06-30 16:36:11 +02:00
Robin Appelman
d78a2a9f78 Add StorageNotAvailableException 2014-06-30 15:46:37 +02:00
Vincent Petry
972fffbe02 Return 503 OCS response with requested format 2014-06-30 15:37:38 +02:00
Joas Schilling
0c711e1cfa Use get random bytes as uniqeid() is not unique in some cases 
Fix #9161
 2014-06-30 11:10:10 +02:00
Georg Ehrke
c30bea45e9 don't typecast null values inside dispatcher.php 2014-06-29 22:40:50 +02:00
Thomas Müller
9032ce4535 Merge pull request #9266 from owncloud/fix_objectstore_etag_update 
always regenerate etag when writing back file to objectstore
 2014-06-29 20:59:20 +02:00
Volkan Gezer
ae68a773c0 more strings to translate in utils also some fixes in defaults 2014-06-28 13:29:24 +02:00
Normal Ra
42edd5b788 Add .apk mimetype. 2014-06-28 00:13:15 +02:00
icewind1991
1a3e698294 Merge pull request #9263 from owncloud/remote-share-update 
Better detecting of remote changes for external shares
 2014-06-27 19:31:18 +02:00
Jörn Friedrich Dreyer
23fa75f5ac always regenerate etag when writing back file to objectstore 2014-06-27 18:49:06 +02:00
Robin Appelman
db3f0cee4a Fix parsing of webdav permissions 2014-06-27 17:28:56 +02:00
Robin Appelman
6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Robin Appelman
5b8c2ac750 Use the etag to check for updates in webdav storages where available 2014-06-27 17:10:46 +02:00
Vincent Petry
fd8b5680dd Merge pull request #8383 from owncloud/object_storage 
Object storage
 2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer
25dbbbadd3 use normalize path to convert '.' to '' in objectstorestorage 2014-06-27 15:00:29 +02:00
Thomas Müller
4d6019b73f Merge pull request #9247 from owncloud/move-webdav-class-to-core-master 
Move webdav class to core master
 2014-06-27 12:59:59 +02:00
Jörn Friedrich Dreyer
ab93f1949d update hasUpdated description, overwrtie testStat for objectstore test 2014-06-27 12:14:31 +02:00
Vincent Petry
4b5bf606cb Merge pull request #9215 from owncloud/officemimetypesupdatefix 
Office mime types update fix
 2014-06-27 11:23:19 +02:00
Thomas Müller
171475b95a fix autoloader 2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Robin Appelman
f93457c41d Fix check if class exists 2014-06-27 00:52:37 +02:00
Robin Appelman
437094bbfc Check if classes/method exists before trying to call them in background jobs 2014-06-26 22:40:12 +02:00
Thomas Müller
7804bd010c Merge pull request #9230 from owncloud/fix-repair-step-php-53 
Redeclared as public to allow invocation from within the closure in php ...
 2014-06-26 17:20:09 +02:00
Vincent Petry
8526556110 Merge pull request #9206 from owncloud/occ-scan-user 
Prevent running the files:scan command as the wrong user
 2014-06-26 17:03:23 +02:00
Vincent Petry
b7d79a90b0 Merge pull request #9210 from owncloud/better_validation_in_getAppPath 
better validation for OC_App::getAppPath()
 2014-06-26 15:52:12 +02:00
Thomas Müller
4c80c9595f Redeclared as public to allow invocation from within the closure in php 5.3 2014-06-26 14:27:41 +02:00
Bernhard Posselt
2662c4c61b use id instead of resourceId 2014-06-26 14:20:35 +02:00
Bernhard Posselt
5496ca234b dont strip the s from the resource 2014-06-26 14:02:20 +02:00
voxsim
5d30ed9ad1 fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users 2014-06-26 12:38:33 +02:00
Jörn Friedrich Dreyer
f96a535f80 fix objectstore test execution 2014-06-26 11:30:00 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation 
make sure that the etags get propagated correctly
 2014-06-26 10:26:24 +02:00
Vincent Petry
b1e778d5fd Moved office mimetype update to a repair step 2014-06-25 19:49:18 +02:00
Georg Ehrke
09356bc5b3 better validation for OC_App::getAppPath() 2014-06-25 16:24:55 +02:00
Robin Appelman
9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
icewind1991
16396e2e33 Merge pull request #9123 from owncloud/webdav-move-permissions 
Fix permissions check when moving a file to a different directory over webdav
 2014-06-25 15:09:58 +02:00
Jörn Friedrich Dreyer
8e6cb6dc54 delete object without downloading it first 2014-06-25 14:53:38 +02:00
Arthur Schiwon
f3ecf819ec extend Dummy user and group implementation to pass tests 2014-06-25 13:13:53 +02:00
Robin Appelman
113749bd96 really always take root of the substorage 2014-06-25 13:00:11 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Arthur Schiwon
121d52860e return int, not string 2014-06-24 21:54:57 +02:00
Bjoern Schiessle
92a82f02b3 always take root of the substorage 2014-06-24 18:53:51 +02:00
Robin Appelman
92f2a430a8 Don't bother checking for external updates for objectstore storages 2014-06-24 14:48:59 +02:00
Robin Appelman
eb97eee964 Only initialize the swift container when manipulating an object 2014-06-24 14:42:52 +02:00
Robin Appelman
159b603d13 Add support for rackspace swift backends 2014-06-24 14:36:29 +02:00
Bjoern Schiessle
70ca292fd9 only the mount point has delete and update permissions to enable rename operation 2014-06-24 13:55:04 +02:00
Bjoern Schiessle
84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Thomas Müller
f913b1629b Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master 
fix recursion on rmdirr
 2014-06-23 23:18:10 +02:00