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

31734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
5a8238788b Merge pull request #24177 from owncloud/deprecate-update.php 
Deprecate appinfo/update.php - RepairSteps within info.xml are to be …
 2016-04-22 20:34:48 +02:00
Thomas Müller
a8f985a433 Merge pull request #24210 from owncloud/because-some-people-do-not-think 
Add link to security page
 2016-04-22 20:34:22 +02:00
Thomas Müller
cb5779f513 Merge pull request #24209 from owncloud/encryption_psr4 
Move \OC\Encryption to PSR-4
 2016-04-22 19:38:49 +02:00
Lukas Reschke
af781af980 Add link to security page 
Because some people do not think…
 2016-04-22 18:52:00 +02:00
Roeland Jago Douma
d379157289
Move \OC\Encryption to PSR-4 2016-04-22 17:34:01 +02:00
Thomas Müller
8c7c713e86 Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfoundagain 
Mark $usersSetup only if user was found in initMountPoints
 2016-04-22 17:25:40 +02:00
Thomas Müller
48b61b7b5a
Deprecate appinfo/update.php - RepairSteps within info.xml are to be used 2016-04-22 17:22:40 +02:00
Thomas Müller
e37b95ae53 Merge pull request #24200 from owncloud/appframework_psr4 
Move \OC\AppFramework to PSR-4
 2016-04-22 17:22:02 +02:00
Thomas Müller
1e400cc113 Merge pull request #24201 from owncloud/no-web-updater-for-ldap-and-shibboleth 
Disable web updater if ldap or shibboleth are installed
 2016-04-22 17:17:43 +02:00
Roeland Jago Douma
4eebccd81f
Fix inconsistent nameing of AppFramework 2016-04-22 16:00:00 +02:00
Thomas Müller
f56be022a3
Disable web updater if ldap or shibboleth are installed - refs https://github.com/owncloud/core/issues/23913#issuecomment-213432232 2016-04-22 15:53:27 +02:00
Roeland Jago Douma
1d33a5ef13
Move \OC\AppFramework to PSR-4 
* Also moved the autoloader setup a bit up since we need it in initpaths
 2016-04-22 15:28:09 +02:00
Thomas Müller
a3813c55da Merge pull request #24124 from owncloud/encryped-size-progation 
dont do optimized size propagation for encrypted files
 2016-04-22 15:23:42 +02:00
Björn Schießle
606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares 
bring back CRUDS permissions for federated shares
 2016-04-22 14:50:42 +02:00
Thomas Müller
cc4efc4c03 Merge pull request #24085 from owncloud/feedback-on-app-migrations 
App migration steps need to push feedback to the user ....
 2016-04-22 14:39:11 +02:00
Vincent Petry
13c01e62cf
Mark $usersSetup only if user was found in initMountPoints 
initMountPoints is marking a user as successfully initialized too
early. If the user was not found an NoUserException was thrown, the
second time initMountPoints is called would not rethrow the exception
and happily continue.

This fix makes sure that we consistently throw NoUserException when
initMountPoints is called repeatedly with invalid users.
 2016-04-22 14:29:41 +02:00
Thomas Müller
c26145aab3 Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tables 
Drop old calendar and contacts tables
 2016-04-22 14:23:49 +02:00
Roeland Douma
d0c1dfd30d Merge pull request #24191 from owncloud/setup_psr4 
Move \OC\Setup to PSR-4
 2016-04-22 14:21:17 +02:00
Thomas Müller
43323b0062 Merge pull request #24183 from owncloud/change-background-job-sort-order 
Change the sort order of background jobs to be DESC instead of ASC
 2016-04-22 13:33:54 +02:00
Thomas Müller
e0514d2c04 Merge pull request #24186 from owncloud/fs-initmountpoint-nulluser 
Throw NoUserException when attempting to init mount point for null user
 2016-04-22 13:32:20 +02:00
Roeland Jago Douma
479245a301
Move \OC\Repair to PSR-4 2016-04-22 13:00:41 +02:00
Thomas Müller
486c5b1112
Drop old calendar and contacts tables - fixes #21889 2016-04-22 12:26:03 +02:00
Vincent Petry
085bcd7da2
Throw NoUserException when attempting to init mount point for null user 
In some scenarios initMountPoints is called with an empty user, and
also there is no user in the session.

In such cases, it is unsafe to let the code move on with an empty user.
 2016-04-22 11:46:33 +02:00
Lukas Reschke
2c4ef37025 Merge pull request #24126 from owncloud/err-reload-delay 
Delay reloading the page if an ajax error occurs, show notification
 2016-04-22 11:23:39 +02:00
Thomas Müller
3b3cff4f79 Merge pull request #24151 from owncloud/create-personal-calendar 
Personal calendar should be generated even if the birthday calendar a…
 2016-04-22 11:09:45 +02:00
Joas Schilling
04cee6a7db
Change the sort order of background jobs to be DESC instead of ASC 
In theory, if your instance ever creates more jobs then your system cron can
handle, the default background jobs get never executed anymore. Because
everytime when the joblist returns the next job it looks for the next ID,
however there is always a new next ID, so it will never wrap back to execute
the low IDs. But when we change the sort order to be DESC, we make sure that
these low IDs are always executed, before the system jumps back up to
execute the new IDs.
 2016-04-22 10:49:55 +02:00
Vincent Petry
7be1094ba5 Merge pull request #24173 from owncloud/master-certificate 
[master] Ignore certificate file if it starts with file://
 2016-04-22 09:28:07 +02:00
Thomas Müller
3aa77960ef
Adding pre- and post-migration repair steps 2016-04-22 09:26:31 +02:00
Thomas Müller
788005fd0c Merge pull request #24174 from owncloud/repair_psr4 
Move \OC\Repair to PSR-4
 2016-04-22 09:22:56 +02:00
Thomas Müller
d0030aad6c
Remove deprecated HTTPHelper from InfoParser 2016-04-22 08:38:41 +02:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Thomas Müller
a1da081c62 Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page 
OCA.Files.App is not available on public page
 2016-04-21 23:21:18 +02:00
Roeland Jago Douma
dbe316f3c5
Move \OC\Repair to PSR-4 2016-04-21 19:22:58 +02:00
Lukas Reschke
06a4da43ec
[master] Ignore certificate file if it starts with file:// 2016-04-21 19:02:31 +02:00
Vincent Petry
37f6b9eaf7 Merge pull request #24145 from owncloud/limit-cron-execution-time 
Make sure that CLI cron doesn't run for ever, but makes use of the ne…
 2016-04-21 18:23:15 +02:00
Thomas Müller
6e4a28ae86 Merge pull request #24155 from owncloud/fix-birthday_calendar-acl 
Birthday calendar should never have write acl
 2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a Merge pull request #24111 from owncloud/chunk-users-in-background-jobs 
Chunk the users correctly in the trashbin and versions background job
 2016-04-21 14:26:41 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page 2016-04-21 14:23:18 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154 2016-04-21 13:36:52 +02:00
Robin Appelman
5762a68c97 dont do optimized size propagation for encrypted files 2016-04-21 13:18:24 +02:00
Robin Appelman
b7867e9368 Add unit tests for shared size propagation with encryption 2016-04-21 13:13:18 +02:00
Thomas Müller
e673ff0f33 Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfix 
Revert "add word wrap to tooltips. Fixes #22746"
 2016-04-21 12:52:50 +02:00
Thomas Müller
38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082 2016-04-21 12:34:20 +02:00
Thomas Müller
93649d6fe8 Merge pull request #24135 from owncloud/also-write-htaccess-from-cli 
Write .htaccess also from CLI
 2016-04-21 12:17:55 +02:00
Vincent Petry
b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements 
Enc master key improvements
 2016-04-21 11:48:26 +02:00
Joas Schilling
e252967e83
Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-21 10:33:44 +02:00
Joas Schilling
6f5d3adfa4 Merge pull request #24133 from owncloud/tagging_psr4 
Move \OC\Tagging to PSR-4
 2016-04-21 10:16:31 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Lukas Reschke
e977a24ba1 Revert "add word wrap to tooltips. Fixes #22746" 2016-04-20 23:13:07 +02:00
Robin McCorkell
62024d74d4 Add test for reload delay 2016-04-20 22:09:59 +01:00