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

7545 commits

Author SHA1 Message Date
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
Clark Tomlinson
691306cf4e Removing ini charset override due to shared hosting issues 2014-08-11 12:15:36 -04: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
Clark Tomlinson
7bc313a0cd Merge pull request #10066 from marc0s/issues/10065-fix-null-check 
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
 2014-08-11 10:44:47 -04: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
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
gekmihesg
578a57f0fb Load authentication backends before tryBasicAuth 2014-08-10 13:29:32 +02:00
Jenkins for ownCloud
c920ca32e8 [tx-robot] updated from transifex 2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
f12f835485 [tx-robot] updated from transifex 2014-08-09 01:55:08 -04: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
Jenkins for ownCloud
d63b9e68c4 [tx-robot] updated from transifex 2014-08-08 01:55:11 -04: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
Jenkins for ownCloud
2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04: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
Jenkins for ownCloud
e902e3f659 [tx-robot] updated from transifex 2014-08-06 01:54:43 -04: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
Jenkins for ownCloud
5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04: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
Thomas Müller
66a3a641b9 Merge pull request #10138 from owncloud/innodb-repair-non-oc 
Dont touch non-oc tables when doing the InnoDB repair step
 2014-08-04 16:23:46 +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
Robin Appelman
ca463f9c10 Dont touch non-oc tables when doing the InnoDB repair step 2014-08-04 13:14:12 +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
Jenkins for ownCloud
d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04: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
Jenkins for ownCloud
86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04: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
Jenkins for ownCloud
c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
marc0s
f2e20757f6 Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT 
Fixes #10065
 2014-07-30 23:24:55 +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
521934ee0d Merge pull request #10029 from owncloud/fix-thirdparty 
Fix silent crash if 3rdparty dir is not available
 2014-07-30 18:34:55 +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
Victor Dubiniuk
eb9bd200fa Replace exit with return 2014-07-30 14:03:31 +02:00
Victor Dubiniuk
31e7fdb9bf Fix silent crash if 3rdparty dir is not available 2014-07-30 14:03:31 +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
Thomas Müller
7d6221d25d Merge pull request #9914 from owncloud/fix-appframework-blank-template 
Fix template rendering for 'blank' templates
 2014-07-30 10:31:15 +02:00
Jenkins for ownCloud
47e72917e5 [tx-robot] updated from transifex 2014-07-30 01:55:32 -04:00
Morris Jobke
889088f72d Fix template rendering for 'blank' templates 2014-07-29 16:49:50 +02:00
Björn Schießle
a36c4402f5 Merge pull request #9988 from owncloud/sharing_remove_share_permission 
remove share permission if user is excluded from sharing
 2014-07-29 14:05:13 +02:00
Andreas Fischer
a8fbc709ce Add registerAutoloaderCache(). 2014-07-29 11:18:40 +02:00
Andreas Fischer
9be8ac5867 Memcache\Factory: Remove static, use globalPrefix. 2014-07-29 11:14:36 +02:00
Andreas Fischer
da391b8932 InstanceId is properly injected into factory. Remove comment. 2014-07-29 11:03:10 +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
Jenkins for ownCloud
29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +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
Thomas Müller
37f673c8b5 Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master 
don't silently exit in cli-mode in case ownCloud in not yet installed
 2014-07-28 09:40:40 +02:00
Jenkins for ownCloud
a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04: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
Jenkins for ownCloud
9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Robin Appelman
2c4e06d325 Prevent nginx from buffering event source events 2014-07-26 16:07:11 +02:00
Jenkins for ownCloud
010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Michael Kuhn
ecdd04374a Allow specifying the item source in unshareFromSelf(). 2014-07-26 02:00:49 +02:00
Jörn Friedrich Dreyer
ec7a10f882 reorder if statements to remove negation, indentation correction 2014-07-25 19:39:29 +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
Jenkins for ownCloud
3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04: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
2594fb80aa don't silently exit in cli-mode in case ownCloud in not yet installed 2014-07-24 13:45:06 +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
0567fd031f Merge pull request #9772 from owncloud/fix-chunked-upload-master-2 
adding special handling of checkPrecondition() for chunked upload
 2014-07-22 15:47:55 +02:00
Thomas Müller
8ed6adaf85 Merge pull request #9738 from owncloud/remove-uneeded-strip 
Remove uneeded strip_tags
 2014-07-22 15:06:23 +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
Joas Schilling
677c0288fb Merge pull request #9757 from owncloud/issue/9756 
Add language parameter to public API for getL10N()
 2014-07-21 16:50:48 +02:00
Joas Schilling
01878153e0 Add language parameter to public API for getL10N() 
Fix #9756
 2014-07-21 14:50:34 +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
Morris Jobke
76a5fa11f5 Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master 
check if $tables is an array
 2014-07-20 21:40:53 +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
Thomas Müller
f0c0bd5251 check if $tables is an array 2014-07-19 20:23:38 +02:00
Lukas Reschke
1c16d012ab Remove uneeded strip_tags 
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)

Needs https://github.com/owncloud/core/pull/9735 to be merged first.
 2014-07-19 10:17:24 +02:00
Jenkins for ownCloud
d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Andreas Fischer
bfd59bddf4 Extract Auth Header logic into new function handleAuthHeaders(). 2014-07-19 02:21:18 +02:00
Andreas Fischer
fafed17c60 Deduplicate user/password extraction from alternative HTTP headers. 2014-07-19 02:06:37 +02:00
Jenkins for ownCloud
80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
Frank Karlitschek
f92b5a2507 update appstore api url 2014-07-17 21:54:46 -04:00
Vincent Petry
77d6d11b91 Merge pull request #9682 from owncloud/mappedlocal-rename 
Fix renaming files in the root folder of a MappedLocal storage
 2014-07-17 09:19:17 +02:00
Jenkins for ownCloud
b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -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
Jenkins for ownCloud
0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04: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
Jörn Friedrich Dreyer
b3106c321c use correct IUser in interface 2014-07-15 17:41:44 +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
Jenkins for ownCloud
ff11ef3c5b [tx-robot] updated from transifex 2014-07-15 01:55:20 -04: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
51d0bdc90c Expose the user manager in the public server container 2014-07-14 15:10:56 +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
Jenkins for ownCloud
d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04: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
Jenkins for ownCloud
6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04: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
Jenkins for ownCloud
20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04: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
5d3e1bc023 Only calculate the WEBROOT from scriptName if it contains $SUBURI 
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.

Fix #9490
 2014-07-07 15:08:46 +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
Jenkins for ownCloud
6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Jenkins for ownCloud
33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04: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
Jenkins for ownCloud
23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04: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
Jenkins for ownCloud
e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Vincent Petry
dd4273e2e3 Merge pull request #9413 from owncloud/fix_hook_names 
fix hook names
 2014-07-03 22:01:24 +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
Bjoern Schiessle
3c45925e74 fix hook names 2014-07-03 13:52:58 +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
Jenkins for ownCloud
1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04: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
Jenkins for ownCloud
9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04: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
Robin Appelman
1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +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
Morris Jobke
88e6f5c318 Merge pull request #9292 from owncloud/issue/9161 
Use get random bytes as uniqeid() is not unique in some cases
 2014-07-01 09:51:45 +02:00
Jenkins for ownCloud
a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04: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
Jenkins for ownCloud
589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04: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
Jenkins for ownCloud
ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04: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
Jenkins for ownCloud
36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04: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
67d0a3c15e Fixed mime type repair step 2014-06-26 16:40:12 +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
VicDeo
7c362ab55e Merge pull request #9194 from owncloud/revertloadapps 
Bring back loadApps() in base.php
 2014-06-25 18:52:56 +03: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
Vincent Petry
a120d6e9a3 Bring back loadApps() in base.php 
loadApps() had been deleted by mistake in
799205488c
 2014-06-24 17:37:58 +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
Jenkins for ownCloud
6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04: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
Thomas Müller
fba694edae update PHPDoc $fileInfo is a SplFileInfo 2014-06-23 23:15:30 +02:00
Joas Schilling
167ba14af7 Merge pull request #9159 from owncloud/enabledapp-cache-loggedin 
Only cache enabled apps when logged in
 2014-06-23 18:02:57 +02:00
Jörn Friedrich Dreyer
28c1a95575 use common storage test 2014-06-23 16:29:01 +02:00
macjohnny
11ccb57fc7 modified caching mechanism in getUserGroupIds 
removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
 2014-06-23 15:59:27 +02:00
Vincent Petry
8c82098281 Merge pull request #8974 from owncloud/router-preventloadappsonupgrade 
Prevent loadApps on upgrade
 2014-06-23 15:15:50 +02:00
Robin Appelman
2547945779 Add comment 2014-06-23 15:14:35 +02:00
macjohnny
24e397afd2 clean up function getUserGroupIds 
clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
 2014-06-23 14:47:19 +02:00
Thomas Müller
ed31f30afd dir itself has to be removed as well 2014-06-23 14:40:55 +02:00
Robin Appelman
8b41689fe6 Only cache enabled apps when logged in 2014-06-23 13:55:21 +02:00
Thomas Müller
f83821c388 fix recursion on rmdirr 2014-06-23 13:54:27 +02:00
Arthur Schiwon
01a012980a search term for users and groups may occur anywhere in the name or displayname, not just in the beginning 2014-06-23 12:03:09 +02:00
Jörn Friedrich Dreyer
7ec53571c4 use 'object' as the fakedir stream name 2014-06-23 11:07:01 +02:00
Arthur Schiwon
81ecbbb061 trusted domains shall not be ignored on autosetup 2014-06-23 10:33:15 +02:00
Vincent Petry
53ad15e0e3 Merge pull request #9138 from owncloud/fix-documentation 
Add explanation about the current implementation of updateApp
 2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea Add explanation about the current implementation of updateApp 2014-06-22 12:45:59 +02:00
macjohnny
405e89f45a Update manager.php 2014-06-21 16:06:11 +02:00
Jenkins for ownCloud
da0e4b0af0 [tx-robot] updated from transifex 2014-06-21 01:54:37 -04:00
Robin Appelman
80e6d357a2 Fix permissions check when moving a file to a different directory over webdav 2014-06-20 14:29:13 +02:00
Jörn Friedrich Dreyer
c112a1d323 move to stream based IObjectStore interface, rearrange & reformat code 2014-06-20 12:27:47 +02:00
Jenkins for ownCloud
ca96b9d3d5 [tx-robot] updated from transifex 2014-06-20 01:54:32 -04:00
macjohnny
6a3d6d3e4b Update manager.php 2014-06-19 20:32:37 +02:00
macjohnny
14fcd68172 Update manager.php 2014-06-19 19:35:10 +02:00
macjohnny
c954168973 Update manager.php 
defined $uid in getUserGroupIds
 2014-06-19 13:28:37 +02:00
macjohnny
18c7c94b7a Update manager.php 
added description and blank lines in getUserGroupIds
 2014-06-19 11:41:29 +02:00
macjohnny
356e4b6665 Update manager.php 
add caching to getUserGroupIds
 2014-06-19 11:37:46 +02:00
Jenkins for ownCloud
e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Jörn Friedrich Dreyer
f2fe00e972 fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject() 2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408 change architecture from inheritance to composition 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
9335a5f07f remove duplicate method 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
5722e31d1a add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
4e65889f54 only use one config option 'objectstore' for root and home storage configuration 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
7493ff0624 fix unit test by always initializing the root of the storage in the constructor 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
10de4a7b90 move creation of / and users 'files' from storage constructor to setupFS / mount initialization 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
87aaf39259 fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
eca536d8b4 minor code cleanup 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
c020e8e658 use exceptions to notify abstract parent class of problems 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
60a8419a1f when root storage cannot be mounted throw an exception visible to the end user 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
1374ba9adf fix fallback config for default home storage 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
ccb698a6a8 move swift and abstract code to core 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
85ccfad37c change 'object_storage' config param to 'root_storage' 
copy skeleton only for local filesystems
 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
2bf7e5c02f make objectstore setup more robust, don't pass user to object store mounted as root 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
3c66a8c8ed allow configuring objectstore as home and root storage 2014-06-18 12:53:19 +02:00
Vincent Petry
799205488c Prevent loadApps on upgrade 
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
 2014-06-18 11:10:07 +02:00
Jenkins for ownCloud
baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Lukas Reschke
d4bdcb7a9b Merge pull request #9047 from owncloud/fix_preload_fundamental_apps 
Load fundamental apps, before any possible customizing app may follow
 2014-06-18 07:29:04 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing 
Add server<->server sharing
 2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad Merge pull request #9065 from owncloud/migrator-keepprimaryindexname 
Do not rename primary key index when renaming table
 2014-06-17 16:43:33 +02:00
Vincent Petry
7aa11b4361 Do not rename primary key index when renaming table 
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
 2014-06-17 15:23:18 +02:00
Andreas Fischer
9db0a82a26 We obviously have to pass the hostname as is when there is no ':' in the hostname. 
This reverts commit 73062040e6.
 2014-06-17 14:48:32 +02:00
Robin Appelman
07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Lukas Reschke
f2fc214ce0 Add deprecation notice to load* functions 
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Port of https://github.com/owncloud/core/pull/9033
 2014-06-16 20:33:04 +02:00
Jörn Friedrich Dreyer
cd77f92f4c add new keynote mimetype 2014-06-16 16:25:12 +02:00
Robin Appelman
b188550c22 Also support removeable mounts with rmdir 2014-06-16 16:24:42 +02:00
Robin Appelman
0532f5c39a Fix permission for movable storage root 2014-06-16 16:20:40 +02:00
Georg Ehrke
15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore 
Make shipped apps updatable via appstore
 2014-06-16 15:54:50 +02:00
Georg Ehrke
86f546ff64 disable code check for shipped apps 2014-06-16 13:49:02 +02:00
Arthur Schiwon
7b704eeb5e Load fundamental apps, before any possible customizing app may follow 2014-06-16 13:12:21 +02:00
Vincent Petry
a48bcceb23 Merge pull request #8917 from owncloud/repair-routine-base 
Add support for repair step classes
 2014-06-16 11:13:10 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
macjohnny
e5224782fa Merge pull request #9022 from owncloud/speedup-nested-ldap-groups 
drastic speedup for nested ldap groups
 2014-06-16 07:50:53 +02:00
Jenkins for ownCloud
4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Robin Appelman
87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b Fix check for shared files inside shares 2014-06-14 10:14:08 +02:00
Robin Appelman
c6a83b2f17 Fix exposing single files over webdav 2014-06-14 10:13:24 +02:00
Robin Appelman
65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Morris Jobke
35f7565e9b Merge pull request #8978 from owncloud/movie_preview_improvements 
movie previews: use file directly when it's stored locally and encryption is not enabled
 2014-06-14 01:01:59 +02:00
Georg Ehrke
65028c459b don't skip code check for skipped apps 
those apps will have to use the public api
 2014-06-13 21:51:16 +02:00
Georg Ehrke
c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Frank Karlitschek
87101e6638 Merge pull request #9018 from owncloud/dbms-socket-support 
Refactor OC_DB::connect() to properly support sockets.
 2014-06-13 18:09:51 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
macjohnny
767aa4e35f drastic speedup for nested ldap groups 
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.

Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
 2014-06-13 00:04:06 +02:00
Andreas Fischer
73062040e6 Don't specify host when using a socket. 2014-06-12 20:22:45 +02:00
Andreas Fischer
0932760304 Rename variable to indicate that it can be port and socket. 2014-06-12 20:18:38 +02:00
Andreas Fischer
3d8eabedbd No need to check the port number as this will fail anyway. 2014-06-12 20:17:30 +02:00
Andreas Fischer
4ca1e3cc02 Move getValue() to where required. This actually is not required "global data". 2014-06-12 19:59:40 +02:00
Andreas Fischer
17c2e63449 Move check for : to where it belongs, getting rid of $socket = false; 2014-06-12 19:56:51 +02:00
Andreas Fischer
4b87586487 Extract common variables of $connectionParams. 2014-06-12 19:53:33 +02:00
Andreas Fischer
6da2beeaff Inline $port expression, getting rid of $port variable. 2014-06-12 19:48:37 +02:00
Vincent Petry
b595c982d0 Merge pull request #8968 from owncloud/scanner-parent-repair 
Repair broken parent link in the scanner
 2014-06-12 17:40:44 +02:00
Vincent Petry
05e351416e Fixed instanceof to use interface instead of class 2014-06-12 17:38:26 +02:00
Vincent Petry
ca690c4d02 Added RepairStep interface and default repair step lists 
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.

Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.

Added unit test to test messaging, error and exception cases.
 2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db Add support for repair step classes 
This also makes it possible to unit test each repair step class
individually
 2014-06-12 17:38:26 +02:00
Morris Jobke
ab7cff6dfd Revert "Merge pull request #8998 from macjohnny/master" 
This reverts commit 482eded8b3, reversing
changes made to 354cace14a.
 2014-06-12 14:56:46 +02:00
macjohnny
482eded8b3 Merge pull request #8998 from macjohnny/master 
drastic speedup for nested ldap groups
 2014-06-12 14:49:15 +02:00
Vincent Petry
3e1576011f Merge pull request #8980 from owncloud/better-accept-header 
handle http accept headers more gracefully
 2014-06-12 13:28:03 +02:00
macjohnny
e8e2e47e68 Update manager.php 2014-06-12 11:29:20 +02:00
macjohnny
b1094cfe82 Update group.php 2014-06-12 11:28:57 +02:00
macjohnny
0af8aa689f drastic speedup for nested ldap groups 
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
 2014-06-12 09:51:23 +02:00
macjohnny
ede2aa236e Update manager.php 
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
 2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd Merge pull request #8991 from owncloud/fix-php53-arraycombine 
Fixed array_combine for PHP 5.3
 2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
josh4trunks
1b02991a1d Fixes based on suggestions 
I use the term socket for any extension, either unix socket, or internet socket (port).

I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.

By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.

I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
 2014-06-11 21:47:45 -07:00
Vincent Petry
4e4c2b04c8 Fixed array_combine for PHP 5.3 2014-06-11 19:13:49 +02:00
Vincent Petry
75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache 
Save the permissions in the filecache if it's not saved yet
 2014-06-11 18:28:55 +02:00
Vincent Petry
65b3d293ce Added ORDER BY to enforce share entry order 
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.

This fix adds an ORDER BY clause to force the order by id.
 2014-06-11 14:28:30 +02:00
Vincent Petry
491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master 
Fix failing tests on master
 2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Bernhard Posselt
93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Bernhard Posselt
0252d39bb6 fix indention 2014-06-11 00:57:00 +02:00
Bernhard Posselt
1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
Georg Ehrke
7396e5f455 movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756 2014-06-10 22:08:27 +02:00
Georg Ehrke
5e9fa64819 don't show update button when appstore is disabled or no writable dir exists 2014-06-10 18:39:34 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Robin Appelman
6b1d8a56bb remove unused argument 2014-06-10 15:42:37 +02:00
Robin Appelman
054083b9cd add some comments 2014-06-10 15:37:43 +02:00
Robin Appelman
21cfd1014a Repair broken parent link in the scanner 2014-06-10 15:26:18 +02:00
Bjoern Schiessle
9dc0befcca call self::getNumericStorageId() to get the numeric ID 2014-06-10 14:48:19 +02:00
Georg Ehrke
602404c631 fix php doc block 2014-06-10 13:58:41 +02:00
Georg Ehrke
6bf06890e7 always return a bool in OC_App::updateApp 2014-06-10 13:56:05 +02:00
Georg Ehrke
5d4f3baf56 fix php doc block 2014-06-10 13:51:20 +02:00
Georg Ehrke
1ab9bdcaa0 remove unnecessary @return 2014-06-10 13:01:10 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Robin Appelman
41d2354191 Save the permissions in the filecache if it's not saved yet 2014-06-09 12:34:35 +02:00
Morris Jobke
63c5c7bd21 set logger before registrate to an error handler 2014-06-09 10:02:23 +02:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke
e769ef9bbb Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix 
Added hacky fix for long path cleanup routine
 2014-06-08 20:46:00 +02:00
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Björn Schießle
3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares 
only expire link shares
 2014-06-06 19:24:15 +02:00
Thomas Müller
647dcce514 Merge pull request #8253 from owncloud/pk-on-all-tables-master 
Primary keys on all tables master
 2014-06-06 16:40:11 +02:00
Thomas Müller
c053f27381 Merge pull request #8921 from owncloud/fix-remove-storage-master 
No need to create a storage within remove
 2014-06-06 16:16:44 +02:00
Bjoern Schiessle
f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Thomas Müller
fe8bae31dc adding PK to table encryption 
adding auto increment/PK to table files_trash

adding PK to table ldap_user_mapping and ldap_group_members

adding PK to table ldap_group_mapping

truncate permissions table to allow smooth creation of primary key

adding unit test for creating an auto increment column on a table which already contains data

remove unneeded table files_trashsizes

fix unit test

no need to truncate *PREFIX*permissions

On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
 2014-06-06 13:33:56 +02:00
Vincent Petry
5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes 
Update search classes
 2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
a59b5249d3 add more and fix office mimetypes, migrate wrong mimetypes 2014-06-06 12:00:25 +02:00
icewind1991
c47d4ebbac Merge pull request #8666 from owncloud/mount-remove 
Support for (re)moving mountpoints
 2014-06-06 11:57:43 +02:00
Vincent Petry
0661d737e6 Merge pull request #8900 from guruz/webdav_permission_moveable_renameable 
WebDAV Permissions: Distinguish between renameing and moving
 2014-06-06 11:51:39 +02:00
Vincent Petry
ff12969276 Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate 
Added CLI arguments for upgrade simulation steps
 2014-06-06 11:42:14 +02:00
Thomas Müller
26993f2167 No need to create a storage within remove 2014-06-06 11:39:35 +02:00
Thomas Müller
289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe 
Mobile sidebar swipe
 2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer
56470fa9b3 fix namespace for legacy search classes 2014-06-06 11:01:35 +02:00
Vincent Petry
6e2358c3a6 Added hacky fix for long path cleanup routine 2014-06-06 10:41:49 +02:00
Thomas Müller
3a7b30795c Merge pull request #8783 from owncloud/remove-serializers 
Remove controller serializers
 2014-06-06 10:33:16 +02:00
Vincent Petry
5e27ac3e0d Added CLI arguments for upgrade simulation steps 
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
 2014-06-06 10:11:14 +02:00
Thomas Müller
ff651a3e0d Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master 
use system function to recursive remove the directory used by temporary ...
 2014-06-06 10:02:23 +02:00
Robin Appelman
46f70aabfd Dont connect hooks twice 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
3459f99dd6 make sure that we only delete shares for the current user 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
eec1c4398a only unshare user share if it was shared with the current user 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
5bbfdc35d7 make sure that we remove all shares refering to the same parent 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c fix unshareFromSelf() 2014-06-06 09:56:02 +02:00
Robin Appelman
e362373a30 Movable storage root can always be moved and deleted 2014-06-06 09:56:01 +02:00
Robin Appelman
a432459685 use triple equals 2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249 Fix phpdoc and comments 2014-06-06 09:56:01 +02:00
Bjoern Schiessle
b0a74edbb2 allow moving files to the root 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
329bfd81c3 remove encryption keys if user unshares a file 2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244 Fix folder name for storage root 2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Robin Appelman
4fbc991ea2 Add the removing logic for mounts 2014-06-06 09:55:59 +02:00
Robin Appelman
8abe1c3f1a Don't do rename hooks for cache when moving the mountpoint 2014-06-06 09:55:58 +02:00
Robin Appelman
60a659c87e Add a system for (re)movable mount points 2014-06-06 09:55:58 +02:00
Thomas Müller
79b65269c9 Merge pull request #8877 from owncloud/getpath-storage-check 
Verify that we have a valid storage in View->getPath
 2014-06-06 09:44:57 +02:00
Thomas Müller
d359765bdc Update PHPDoc 2014-06-06 09:44:34 +02:00
Georg Ehrke
a110973b3a some additional type checks 2014-06-06 09:41:53 +02:00
Georg Ehrke
498aa66648 add additional type check 2014-06-06 09:33:34 +02:00
Thomas Müller
ad4ec414c9 use system function to recursive remove the directory used by temporary storage 2014-06-06 09:29:31 +02:00
Jenkins for ownCloud
ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Jörn Friedrich Dreyer
aaf0d13171 make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api 2014-06-06 01:17:02 +02:00
Georg Ehrke
0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
 2014-06-05 22:54:27 +02:00
Jörn Friedrich Dreyer
5034bd1b12 minor phpdoc cleanup and imports 2014-06-05 19:49:21 +02:00
Andrew Brown
7a224f5762 Move new search results to 'lib/private/search' 2014-06-05 19:23:44 +02:00
Andrew Brown
8a223eb62d Move legacy search to 'lib/private/legacy' 
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
 2014-06-05 19:23:44 +02:00
Andrew Brown
794a133f9a Re-add type to legacy OC_Search_Result class 2014-06-05 19:23:44 +02:00
Andrew Brown
70be98f6d0 Add audio and image result types 2014-06-05 19:22:22 +02:00
Andrew Brown
c46d514733 Add audio and image result types 2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer
afd24385a8 fix formatting 2014-06-05 19:22:22 +02:00
Andrew Brown
a6583d3976 Add legacy adapters for file search 2014-06-05 19:21:47 +02:00
Andrew Brown
ac72828eae Move to new namespace convention and add new result sub-classing 2014-06-05 19:21:47 +02:00
Thomas Müller
70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences 
[encryption] use oc preferences
 2014-06-05 18:54:25 +02:00
Bernhard Posselt
587a8df566 remove controller serializers 2014-06-05 18:00:36 +02:00
Vincent Petry
1c59808517 Merge pull request #8865 from owncloud/improve_share_settings 
Improve share settings
 2014-06-05 17:23:42 +02:00
Bjoern Schiessle
2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller
4b650a20a4 Merge pull request #8893 from owncloud/feature/get-users-by-preference 
Add method to get users by their preference
 2014-06-05 16:52:00 +02:00
Thomas Müller
fad3bd7fc0 reenable checkCode() 2014-06-05 16:32:46 +02:00
Robin Appelman
00539cf8f9 Verify that we have a valid storage in View->getPath 2014-06-05 15:50:19 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Thomas Müller
3dbfd1fe46 Merge pull request #8529 from owncloud/remove-legacy-routing 
Remove legacy routing code
 2014-06-05 15:22:46 +02:00
Markus Goetz
e6665a0542 WebDAV Permissions: Distinguish between renameing and moving 2014-06-05 14:39:06 +02:00
Thomas Müller
e1beb8c6c3 Merge pull request #8889 from owncloud/mtime-reuse 
Don't update the mtime if the storage mtime hasn't changed
 2014-06-05 13:18:18 +02:00
Vincent Petry
bbdcbb9911 Merge pull request #8866 from owncloud/flock-quotafix 
Fixed quota wrapper to return the value from flock()
 2014-06-05 13:11:45 +02:00
Joas Schilling
4b18967129 Hack around oracle for CLOB fields 2014-06-05 12:19:48 +02:00
Jan-Christoph Borchardt
9e56acbdc9 add snap.js script 2014-06-05 11:52:17 +02:00
Joas Schilling
879237f32a Add method to get users by their preference 2014-06-05 11:50:43 +02:00
Lukas Reschke
7c4abce373 Move authentication to it's own call 2014-06-05 11:45:45 +02:00
Lukas Reschke
ac7fb1b23e Remove legacy routing code 
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.

This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.

Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
 2014-06-05 11:45:45 +02:00
icewind1991
bd373d9621 Merge pull request #7878 from owncloud/quota-extstorageswitch 
Added switch to count external storage data in quota
 2014-06-05 11:23:32 +02:00
Jörn Friedrich Dreyer
f1bf06f8cf Merge pull request #8884 from owncloud/move-flock-to-app 
remove file locking - code will continue to live in it's own app
 2014-06-05 10:54:24 +02:00
Thomas Müller
1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two 
Toggle app navigation not only on mobile, but on desktop as well
 2014-06-05 10:53:22 +02:00
Vincent Petry
71b86136c2 Merge pull request #8878 from owncloud/update-checkmigrationforapps 
Simulate apps database schema update on upgrade
 2014-06-05 10:28:30 +02:00
Robin Appelman
3e73251750 Don't update the mtime if the storage mtime hasn't changed 2014-06-05 10:08:25 +02:00
Thomas Müller
ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master 
Kill permissions table
 2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2 - drop permissions table and related code 
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
 2014-06-05 08:22:01 +02:00
josh4trunks
ea162c8a39 Fix variable not always being defined. 2014-06-04 23:03:13 -07:00
Jenkins for ownCloud
cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
josh4trunks
e77c9bb97e Work with MySQL Sockets 
This passes anything that is not a valid port (0<int<65535) as a unix socket.
I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues.

To use a unix socket, even one different than PHP's mysql.default_socket..
* Database Host = localhost:/path/to/socket
 2014-06-04 22:50:23 -07:00
Thomas Müller
c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0 
Update SabreDAV to 1.8.10
 2014-06-04 23:05:34 +02:00
Thomas Müller
ec7225da66 remove file locking - code will continue to live in it's own app 2014-06-04 20:11:54 +02:00
Vincent Petry
95fda3c17c Do not load apps when upgrade is needed 
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
 2014-06-04 18:52:52 +02:00
Thomas Müller
a2db53b928 Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size 
[versioning] let the file cache track the size of the versions
 2014-06-04 18:19:48 +02:00
Vincent Petry
d4ffafe467 Removed simulate db update flag and split into separate methods 2014-06-04 18:17:46 +02:00
Thomas Müller
48eee0b432 use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface 2014-06-04 17:47:09 +02:00
Vincent Petry
5b97369b00 Simulate apps database schema update on upgrade 
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
 2014-06-04 17:16:44 +02:00
Georg Ehrke
724d027f19 add unit test 2014-06-04 16:29:41 +02:00
Vincent Petry
da889ff029 Added experimental switch to count external storage data in quota 
This includes all mountpoints except the Shared one in
the used space calculation.

Added unit tests for ext storage inclusion in quota calculation
 2014-06-04 16:08:59 +02:00
Jan-Christoph Borchardt
35308f5b09 hide navigation by default, not only on small screens, first step 2014-06-04 14:29:46 +02:00
Vincent Petry
b5f0a17918 Merge pull request #8822 from owncloud/cache-change-propagator 
[WIP] Improved propagation of cache changes
 2014-06-04 13:03:14 +02:00
Vincent Petry
3507964820 Fixed quota wrapper to return the value from flock() 2014-06-04 12:36:53 +02:00
Thomas Müller
76e04027bc Upgrade SabreDAV to 1.8.10 
Updating SabreDAV namespaces
 2014-06-04 12:22:23 +02:00
Georg Ehrke
2c00ab13cf update autoloader 2014-06-04 11:34:09 +02:00
Bernhard Posselt
ade6ed3797 Merge pull request #8701 from owncloud/slide-up-toggle 
Create reusable data attribute for apps setting slideup
 2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt
a244172219 Merge pull request #8853 from owncloud/design-typeface 
Use Open Sans as typeface
 2014-06-04 11:16:03 +02:00
Thomas Müller
4ab77f90d2 Merge pull request #8662 from owncloud/f-lock 
f-lock
 2014-06-04 10:26:02 +02:00
Jan-Christoph Borchardt
6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels 
Remove infieldlabels
 2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
ringmaster
0a417b1174 Use ->instanceOfStorage() not instanceof for Storage instances. 2014-06-04 07:55:46 +02:00
Bjoern Schiessle
48eb0515e9 only lock if unlink is called for a file 2014-06-04 07:55:46 +02:00
Bjoern Schiessle
ab6680e9ab name the storage wrapper to make sure that we don't apply the wrapper multiple times 2014-06-04 07:55:46 +02:00
ringmaster
cda87fd9c4 Normalize lock exception messages. 2014-06-04 07:55:45 +02:00
ringmaster
ba887d2b17 Restore the reference to this used exception class. 2014-06-04 07:55:45 +02:00
ringmaster
54865815f5 Move Lock to private namespace, add interface. Update PHPDoc. 2014-06-04 07:55:45 +02:00
ringmaster
c9c6a0ab1e Don't error out on console. 2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662 Removed unused vars/declarations, update PHPDoc. 2014-06-04 07:55:45 +02:00
Lukas Reschke
826b14e36b Fix typo 2014-06-04 07:55:45 +02:00
Lukas Reschke
9bbc4b0034 Fix typo 2014-06-04 07:55:44 +02:00
ringmaster
896bc526e6 Remove unused methods. 2014-06-04 07:55:44 +02:00
ringmaster
6b94732bdf Respect locked files, surface correct exception. 2014-06-04 07:55:44 +02:00
ringmaster
428510a4f8 Simpler log unique id. 2014-06-04 07:55:44 +02:00
ringmaster
f9dbdb7c5c Add actual locking and log changes necessary for debugging. 2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2 Continued flock work. 2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e flock changes. Work in progress. 2014-06-04 07:55:44 +02:00
Robin Appelman
a6bb1e1bf8 Fix size calculation during recursive scan 2014-06-03 19:54:59 +02:00
Morris Jobke
3a1994d001 Merge pull request #8686 from owncloud/session-early 
Make the session available as early as possible
 2014-06-03 19:23:30 +02:00