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

23076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
5bb0889b30 Remove uneeded assignment 
'files' is neither used in the controller or the template
 2015-02-24 19:50:23 +01:00
Thomas Müller
09a06e4f0a Merge pull request #14068 from owncloud/autotest-external-sftp 
[files_external] sftp tests
 2015-02-24 08:06:27 -08:00
Lukas Reschke
52495dc995 Merge pull request #13740 from owncloud/fix-12190-2 
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
 2015-02-24 16:37:49 +01:00
Lukas Reschke
b6289542e8 Merge pull request #14400 from owncloud/fix-cron-deadlock 
Use flock instead of just checking if there is a file to prevent deadloc...
 2015-02-24 16:16:48 +01:00
Bernhard Posselt
5b506ab518 use flock instead of just checking if there is a file to prevent deadlocks when the process crashed or the unlink wasnt done 
move cron.lock into top directory to prevent external storage issues

use tmp directory lock file

use new config interface

incorporate #13770

add dots
 2015-02-24 15:41:20 +01:00
Lukas Reschke
d43d34c93f Merge pull request #14195 from owncloud/activity-manager-performance-improvements 
Activity manager performance improvements
 2015-02-24 15:19:15 +01:00
Thomas Müller
7325414481 Merge pull request #14282 from owncloud/disable-non-shipped-apps-master 
3rd-party apps are disabled on upgrade
 2015-02-24 14:39:45 +01:00
Thomas Müller
48cefd9bd5 Merge pull request #14461 from owncloud/fix-code-that-never-worked 
Fix code that never worked
 2015-02-24 14:00:43 +01:00
Joas Schilling
88cfe46906 Merge pull request #11555 from goodkiller/patch-1 
Update group.php
 2015-02-24 13:58:41 +01:00
Lukas Reschke
276824299c Merge pull request #13340 from owncloud/use-http-only 
Use "HTTPOnly" for cookies when logging out
 2015-02-24 13:50:49 +01:00
Lukas Reschke
65dcbccee0 Merge pull request #14459 from owncloud/fix-oracle 
Dont break code which relies on the cursor being open after insert/updat...
 2015-02-24 13:35:07 +01:00
Lukas Reschke
1229184873 Fix code that never worked 
Introduced with 1df8a5a774 in February 2013…
 2015-02-24 13:26:23 +01:00
Bernhard Posselt
fd3663f563 Dont break code which relies on the cursor being open after insert/update/delete 2015-02-24 12:58:36 +01:00
Thomas Müller
58cedc07b5 print app upgrade information to console as well 2015-02-24 12:52:16 +01:00
Thomas Müller
80cafe29a8 3rd-party apps are only disabled in case core is upgraded 2015-02-24 12:51:55 +01:00
Lukas Reschke
e08ebe87dc Merge pull request #10830 from Finkregh/patch-1 
add question about user-backend
 2015-02-24 12:13:55 +01:00
Thomas Müller
fe7e7677e9 shipped and 3rd-party apps of type authentication and session will remain enabled during update 2015-02-24 12:02:37 +01:00
Thomas Müller
bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Lukas Reschke
e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text 
Make the password changed msg inline to fix #10242
 2015-02-24 11:54:17 +01:00
Thomas Müller
da8e34cf7f Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid 
don't allow installation of already installed apps - fixes #14004
 2015-02-24 10:34:06 +01:00
Joas Schilling
a320edaca5 Merge pull request #14419 from owncloud/preview_apostrophe_fix 
fix issue with previews not being displayed if filename contains apostrophe
 2015-02-24 09:58:53 +01:00
Lukas Reschke
8bd3d55517 Merge pull request #14442 from owncloud/fix-oracle-ci-master 
Close the cursor after the affected count has been extracted.
 2015-02-24 09:20:59 +01:00
Jenkins for ownCloud
cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller
b40d4c9cbc app store can be used with any edition 2015-02-23 23:16:28 +01:00
Thomas Müller
39d8406933 don't allow installation of already installed apps - fixes #14004 2015-02-23 23:16:28 +01:00
Thomas Müller
0cdc2cebbf Merge pull request #14433 from owncloud/fix-public-php 
Use `getParam` instead of `server`
 2015-02-23 22:43:51 +01:00
Thomas Müller
e87ada86d1 Merge pull request #14416 from owncloud/setup-command 
Setup command
 2015-02-23 22:41:10 +01:00
Thomas Müller
66e3211fd8 Merge pull request #13439 from owncloud/app-filter 
Make the search box filter apps
 2015-02-23 21:51:53 +01:00
Thomas Müller
0a9b8242ee properly initialize OC::$WEBROOT and host name 2015-02-23 21:49:35 +01:00
Thomas Müller
c350da1a28 Merge pull request #14119 from owncloud/dbal251 
Update doctrine/dbal to 2.5.1 #13537
 2015-02-23 20:59:51 +01:00
Thomas Müller
eae6471105 Fix error handling 2015-02-23 17:46:08 +01:00
Thomas Müller
5bdf42a925 Close the cursor after the affected count has been extracted. 2015-02-23 17:17:20 +01:00
Thomas Müller
bcd10d3dc5 implement command maintenance:install 2015-02-23 16:47:47 +01:00
Thomas Müller
1fd1b355e4 Fix namespace of OC_Setup -> \OC\Setup 2015-02-23 16:44:40 +01:00
Lukas Reschke
f54cd14c7e Merge pull request #14439 from owncloud/fix-ajax-files-external 
Fix Ajax type casting for files_external
 2015-02-23 16:29:45 +01:00
Vincent Petry
4290e1990e Merge pull request #13829 from owncloud/appmanager-list 
Better caching for enabled apps
 2015-02-23 16:03:32 +01:00
Robin McCorkell
9d36959d82 Fix Ajax type casting for files_external 2015-02-23 14:57:37 +00:00
Vincent Petry
e144d3aa49 Added unit test for app filter 2015-02-23 15:29:25 +01:00
Lukas Reschke
615bc5a827 Use getParam instead of server 
`server` is completely wrong here and this will not work on master. With `getParam` it will work fine though.

Testplan:
- [ ] Without patch: Share a file and try to access `http://localhost/public.php?service=files&t=THESHAREDTOKEN` => Fails
- [ ] With patch: Try the same => Works

Master only.
 2015-02-23 14:07:42 +01:00
Bernhard Posselt
8176032176 Merge pull request #14427 from owncloud/fix-some-php-docs 
Fix some PHPDocs
 2015-02-23 14:04:35 +01:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Lukas Reschke
c06a94ecc2 Fix some PHPDocs 2015-02-23 12:19:52 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Thomas Müller
f693d439e2 Merge pull request #14422 from owncloud/use-off-and-off 
Use "off" and "off" instead of true booleans
 2015-02-23 11:12:53 +01:00
Lukas Reschke
9a08c7ecb9 Merge pull request #14275 from chris-se/master 
DAV authentication: use Owncloud's internal user instead of HTTP auth one
 2015-02-23 10:25:13 +01:00
Lukas Reschke
43641d917b Use "off" and "off" instead of true booleans 
Apparently a boolean in php.ini is according to the documentation "on" or "off"…

Fixes itself.
 2015-02-23 09:40:15 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Thomas Müller
fd6d56290e Adding .mailmap - helps to add unified authors to the license header 2015-02-22 20:36:36 +00:00
Thomas Müller
b868914354 php script which updates the license header in all php file in the repo 2015-02-22 20:36:36 +00:00
Thomas Müller
0751ee087f Merge pull request #14414 from owncloud/add-ini-helper 
Add helper to check for `ini` values in `OC_Util::checkServer`
 2015-02-22 20:44:02 +01:00