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

7081 commits

Author SHA1 Message Date
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
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
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
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