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

26734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Morris Jobke
f67a691215 Merge pull request #18895 from owncloud/make-code-analyzers-happier 
Add proper PHPDoc
 2015-09-09 23:40:30 +02:00
Lukas Reschke
46a328a75a Merge pull request #18873 from owncloud/enc_use_master_password 
Allow admin to use a master key for all files
 2015-09-09 17:05:53 +02:00
Lukas Reschke
6b22006f52 Merge pull request #18931 from owncloud/fix-files_sharing-breakage 
Check if files_sharing is actually enabled before using it
 2015-09-09 16:11:36 +02:00
Morris Jobke
7445afdb6f Merge pull request #18925 from owncloud/change-risky-test 
Rename data provider to avoid risky test warning
 2015-09-09 16:05:01 +02:00
Robin McCorkell
29dd7d83c4 Check if files_sharing is actually enabled before using it 2015-09-09 14:56:49 +01:00
Lukas Reschke
a05ccd969c Merge pull request #18913 from owncloud/put-in-single-field-for-speed 
Put session data in single field for speed
 2015-09-09 14:10:01 +02:00
Lukas Reschke
0943781ccf Rename data provider to avoid risky test warning 
```
06:49:56 There was 1 risky test:
06:49:56
06:49:56 1) OC\AppFramework\Http\JSONResponseTest::testRenderProvider
06:49:56 This test did not perform any assertions
```
 2015-09-09 12:52:54 +02:00
Lukas Reschke
0b91087489 Write to session in batch at the end of the request 2015-09-09 12:48:37 +02:00
Lukas Reschke
e579dd62fd Write session data to single key 
This prevents decrypting values multiple times.
 2015-09-09 12:48:08 +02:00
Lukas Reschke
bfa26db472 Use md5 over the version file to prevent cyclyc dependency 2015-09-09 12:48:08 +02:00
Morris Jobke
c4c9c5ffad Merge pull request #18684 from owncloud/explicit-upgrade-version 
Explicit upgrade version + prevent downgrades
 2015-09-09 11:08:55 +02:00
Björn Schießle
acee9d4750 Merge pull request #18908 from owncloud/allow-0-as-password 
Allow 0 and false as password
 2015-09-09 10:29:29 +02:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Lukas Reschke
8958247b4e Merge pull request #18914 from owncloud/generate-requesttoken-only-once 
Cache generated result
 2015-09-08 21:51:24 +02:00
Lukas Reschke
a03422c55a Cache generated result 
Saves 50ms
 2015-09-08 21:28:15 +02:00
Lukas Reschke
7cbf2bc56d Allow 0 and false as password 
When we use the check for "empty" here passwords such as 0 will not work.

Fixes https://github.com/owncloud/password_policy/issues/8
 2015-09-08 17:53:29 +02:00
Bjoern Schiessle
b2e6d7b5f4 occ command to enable master key 2015-09-08 14:58:42 +02:00
Lukas Reschke
a7f132a964 Add proper PHPDoc 
Makes my IDE happier when going through that file.
 2015-09-08 14:02:30 +02:00
Morris Jobke
73d3839962 Merge pull request #18881 from owncloud/kill-sendfile 
Remove XSendFile support
 2015-09-08 14:02:12 +02:00
Lukas Reschke
75f939b8fe Merge pull request #18882 from owncloud/load-all-apps-tests 
Load all enabled apps in test bootstrap
 2015-09-08 13:02:12 +02:00
Jenkins for ownCloud
d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Robin McCorkell
08d2202abb Load all enabled apps in test bootstrap 2015-09-07 16:06:53 +01:00
Lukas Reschke
84797023ed Remove XSendFile support 
Required to ensure proper locking
 2015-09-07 16:52:50 +02:00
Morris Jobke
f3e6e0121d Merge pull request #18876 from owncloud/missing-context-on-update-file-target 
Use context function call instead of static
 2015-09-07 16:41:41 +02:00
Bjoern Schiessle
acfc7d7c4d enable usage of a master key 2015-09-07 16:08:41 +02:00
Joas Schilling
7af7fdd929 Use context function call instead of static 2015-09-07 14:28:20 +02:00
Jan-Christoph Borchardt
004de1425e Merge pull request #18630 from owncloud/files-combineuploadbutton 
Combine upload action into the "New" menu
 2015-09-07 14:03:57 +02:00
Morris Jobke
a35bc974bb Merge pull request #18872 from owncloud/settings_users_ldap 
Check if app is enabled instead of if class exists
 2015-09-07 13:35:54 +02:00
Joas Schilling
f653a34d8f Merge pull request #18868 from owncloud/fix-files_version-js-load 
Remove unneeded include
 2015-09-07 12:06:16 +02:00
Robin McCorkell
c97147c99a Check if app is enabled instead of if class exists 2015-09-07 10:28:08 +01:00
Robin McCorkell
4c5afe85da Merge pull request #18866 from tflidd/doc_link_phpfpm 
Doc link phpfpm
 2015-09-07 09:59:47 +01:00
Morris Jobke
4251dcecca Remove unneeded include 
* fixes #18867
* ref #18748
 2015-09-07 10:33:23 +02:00
tflidd
90fd8bab55 remove spaces and empty line 2015-09-07 10:05:25 +02:00
tflidd
0893967588 Add documentation link php-fpm 
Admin-Page warning didn't have a direct link to the documentation.
 2015-09-07 09:30:45 +02:00
Jenkins for ownCloud
53a0009e7b [tx-robot] updated from transifex 2015-09-07 01:55:04 -04:00
Morris Jobke
f2ca0f6677 Merge pull request #18748 from owncloud/files-versions-tab 
Add versions tab to files sidebar
 2015-09-07 00:53:57 +02:00
Morris Jobke
c57595bcb4 Merge pull request #18839 from owncloud/autoloader-supersecure 
Restrict autoloaded paths to loaded apps (and other enhancements)
 2015-09-07 00:09:00 +02:00
Roeland Douma
24f5f50b20 Merge pull request #18742 from owncloud/mimetype-updatedb 
Introduce mimetype DB update occ command
 2015-09-06 16:56:35 +02:00
Jenkins for ownCloud
3642fb701a [tx-robot] updated from transifex 2015-09-06 01:54:56 -04:00
Robin McCorkell
0fac2e3f3a Unique exception for invalid autoload paths, better handling 
Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
 2015-09-05 16:50:02 +01:00
Jenkins for ownCloud
f3b8634058 [tx-robot] updated from transifex 2015-09-05 01:55:18 -04:00
Robin McCorkell
895e633732 Resolve autoloader valid roots before checking 
Allows symlinked app directories to work properly
 2015-09-05 00:04:59 +01:00
Robin McCorkell
b3acf09c60 Only add valid root for enabled apps 2015-09-05 00:04:58 +01:00
Robin McCorkell
c6314fc699 Unit tests for mimetype loader 2015-09-04 17:37:10 +01:00
Robin McCorkell
19830e6c24 Introduce mimetype DB update occ command 2015-09-04 17:37:09 +01:00
Robin McCorkell
cdf01f0419 Split mimetype handling to new class 2015-09-04 17:28:20 +01:00
Morris Jobke
7f8bca64cb Merge pull request #18833 from owncloud/share-prevent-twice 
Prevent sharing twice with user when already a group
 2015-09-04 18:26:50 +02:00
Robin Appelman
af5cfe585c Merge pull request #18832 from owncloud/fix-infinite-loop-share-propagation 
Avoid re-propagation of shares during one propagation run
 2015-09-04 16:34:35 +02:00
Vincent Petry
f100ef0fc6 Prevent sharing twice with user when already a group 2015-09-04 16:22:01 +02:00