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

6932 commits

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