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

24741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Thomas Müller
5aa3525479 Merge pull request #16045 from owncloud/reduce-autotest-hhvm 
Combine autotest-hhvm.sh with autotest.sh
 2015-05-05 11:48:20 +02:00
Morris Jobke
179472aeef Merge pull request #16058 from owncloud/fix-app-check-code-parameter-description 
Fix the "app-id" parameter description of app:check-code
 2015-05-05 10:56:03 +02:00
Joas Schilling
efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller 
Fix PHPDoc for the ext. share controller
 2015-05-05 10:52:28 +02:00
Björn Schießle
2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key 
[encryption] check recovery key setting for the correct user
 2015-05-05 10:48:09 +02:00
Jan-Christoph Borchardt
a7deba74a7 Merge pull request #16031 from owncloud/fix-15953-master 
No clickable app for local apps
 2015-05-05 09:27:47 +02:00
Joas Schilling
87787a3af4 Fix the "app-id" parameter description of app:check-code 2015-05-05 08:23:59 +02:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Jan-Christoph Borchardt
fa6a67ccc1 Merge pull request #15544 from rullzer/fix_15263 
[WIP] Only show SSL table header if there are certificates
 2015-05-04 20:27:40 +02:00
Lukas Reschke
044ee7ead5 Merge pull request #16048 from owncloud/fix-mb-string 
Check `mbstring.func_overload` only if the mb module is installed.
 2015-05-04 20:19:11 +02:00
Roeland Jago Douma
a9a9adc217 Only show SSL table header if there are certificates 2015-05-04 19:08:43 +02:00
Lukas Reschke
d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Björn Schießle
ed16127a8d Merge pull request #16026 from owncloud/enc_ux_improvements 
[encryption] some small ux improvements
 2015-05-04 17:40:05 +02:00
Lukas Reschke
7c5558327d Check mbstring.func_overload only if the mb module is installed. 
Fixes https://github.com/owncloud/core/issues/14670
 2015-05-04 17:13:25 +02:00
Lukas Reschke
64393b4c03 Remove PHP 5.4 warning in checkSetup 
This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
 2015-05-04 17:11:17 +02:00
Thomas Müller
08b98a8ede Merge pull request #16042 from owncloud/fix-output-buffering 
Remove hard-dependency on disabled output_buffering
 2015-05-04 16:43:32 +02:00
Thomas Müller
e5c5c908a3 Merge pull request #16044 from owncloud/issue-15977-occ-encryption-status 
Add an occ command to get the status of encryption
 2015-05-04 16:40:47 +02:00
Andreas Fischer
636d0635db Combine autotest-hhvm.sh with autotest.sh 2015-05-04 16:37:23 +02:00
Lukas Reschke
51936e68aa Merge pull request #16040 from owncloud/fix-orphaned-shares-job 
Fix DeleteOrphanedSharesJob
 2015-05-04 16:27:26 +02:00
Lukas Reschke
5c7d15b941 Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favorite 
Fix undefined variable $tagId
 2015-05-04 16:22:21 +02:00
Joas Schilling
50f6386c63 Fix undefined variable $tagId 2015-05-04 16:19:26 +02:00
Joas Schilling
5180c2398d Add an occ command to get the status of encryption 2015-05-04 15:31:19 +02:00
Joas Schilling
59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner 
Do not restrict permissions for the original owner
 2015-05-04 15:07:37 +02:00
Lukas Reschke
4b9e034968 Remove hard-dependency on disabled output_buffering 
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.

However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.

Fixes https://github.com/owncloud/core/issues/16013
 2015-05-04 14:15:15 +02:00
Morris Jobke
760ce3bd63 Fix DeleteOrphanedSharesJob 
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
 2015-05-04 13:58:58 +02:00
Bjoern Schiessle
f76c055244 some small ux improvements 2015-05-04 11:55:06 +02:00
Lukas Reschke
17fedc80da Merge pull request #15652 from oparoz/better-text-previews 
Show a text preview instead of a bitmap preview of text
 2015-05-04 11:44:51 +02:00
Thomas Müller
0f7b8dd338 Merge pull request #15752 from owncloud/feature/fix-encryption-return-values 
[enc2] fixing return values and adding tests
 2015-05-04 11:44:15 +02:00
Thomas Müller
7112824229 fix l10n strings 2015-05-04 11:37:30 +02:00
Thomas Müller
c2fd7b1d12 no link if there is no detailpage property set - fixes #15953 2015-05-04 11:35:30 +02:00
Thomas Müller
7376ea9b26 Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder 
skip user if we don't have a public key
 2015-05-04 09:57:19 +02:00
Thomas Müller
870ac88c85 Merge pull request #16020 from owncloud/set-charset-via-ini-set 
Try to set required ini values in base.php
 2015-05-04 09:35:32 +02:00
Thomas Müller
4de45b5e61 Merge pull request #15958 from owncloud/usage-of-public-log-interface 
Use internally \OCP\ILogger instead of \OC\Log
 2015-05-04 09:13:26 +02:00
Jenkins for ownCloud
7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Frank Karlitschek
55b2570f64 8.1 alpha 3 2015-05-03 19:04:41 -04:00
Lukas Reschke
8a85d8bc17 Try to set required ini values in base.php 
Fixes https://github.com/owncloud/core/issues/16006
 2015-05-03 13:23:29 +02:00
Morris Jobke
7a3b74a8b9 Merge pull request #15486 from owncloud/versions-rollbackkeepfileid 
Keep fileid when restoring version, using stream copy
 2015-05-03 13:12:54 +02:00
Morris Jobke
6bd861910b Merge pull request #16009 from owncloud/fix-searchresults 
fix search results from other places, account for margin-bottom in files list
 2015-05-03 11:48:00 +02:00
Jenkins for ownCloud
9f76b8b356 [tx-robot] updated from transifex 2015-05-03 01:55:17 -04:00
Morris Jobke
182304591d Merge pull request #16001 from owncloud/add-multiselect-new-title 
also add title to multiselect create new element, force multiselect wider width, fix #15954
 2015-05-02 21:46:28 +02:00
Morris Jobke
c4dc988c2e Merge pull request #16015 from owncloud/add-proper-versioning 
Add proper versioning for doc URL
 2015-05-02 21:44:09 +02:00
Lukas Reschke
6738c17cb5 Add proper versioning for doc URL 
As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`.

Fixes https://github.com/owncloud/core/issues/16002
 2015-05-02 21:05:11 +02:00
Lukas Reschke
6528a17ea3 Merge pull request #16005 from owncloud/remove-more-apps 
remove 'More apps' link from apps mgmt now that we have support for experimental apps
 2015-05-02 19:54:42 +02:00
Jan-Christoph Borchardt
954968e9d8 fix search results from other places, account for margin-bottom in files list 2015-05-02 09:07:42 -04:00
Jenkins for ownCloud
aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jan-Christoph Borchardt
4c070b3e12 remove 'More apps' link from apps mgmt now that we have support for experimental apps 2015-05-01 18:07:55 -04:00
Jan-Christoph Borchardt
8ccf1c85d9 force minimum multiselect width to properly show longer groups 2015-05-01 13:51:01 -04:00
Jan-Christoph Borchardt
4dd8a22e51 also add title to multiselect create new element, fix #15954 2015-05-01 13:47:37 -04:00
Thomas Müller
6b691e3840 Merge pull request #15937 from owncloud/file-locking 
Add memcache based shared/exclusive locking
 2015-05-01 17:47:23 +02:00
Jenkins for ownCloud
eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00