ab690371b7
Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1
2016-04-25 14:49:49 +02:00
5348424417
Merge pull request #24205 from owncloud/scanner-locking
...
add locks in the scanner to prevent multiple scanners running on the …
2016-04-25 14:48:20 +02:00
972ce1fe6e
Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
...
Add missing use statement
2016-04-25 14:46:29 +02:00
d43e769e90
Merge pull request #24231 from owncloud/updater_psr4
...
Move \OC\Updater to PSR-4
2016-04-25 14:41:34 +02:00
21643150aa
error out if a local storage isn't setup correctly
2016-04-25 14:36:53 +02:00
ca5b189522
add test
2016-04-25 14:28:01 +02:00
7e8fd2c639
don't get the config for the same mount multiple times
2016-04-25 14:21:15 +02:00
9491d0f65b
Add missing use statement
2016-04-25 13:22:54 +02:00
604b7a49f6
Merge pull request #24230 from owncloud/you-form-of-activities
...
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
7a22e3f083
Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
...
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
76c72b5f43
Move \OC\Updater to PSR-4
2016-04-25 11:32:09 +02:00
4ac16001e0
add locks in the scanner to prevent multiple scanners running on the same files
2016-04-25 11:09:08 +02:00
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
d4c9566cd5
Translate the current user with "You ..."
2016-04-25 10:30:58 +02:00
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
a4b1d9feee
Merge pull request #24226 from owncloud/files_psr4
...
Move \OC\Files to PSR-4
2016-04-25 08:27:57 +02:00
dab4633300
[tx-robot] updated from transifex
2016-04-25 01:54:53 -04:00
dedf392751
Move \OC\Files to PSR-4
2016-04-24 21:37:35 +02:00
dc5c570d7c
Merge pull request #24213 from owncloud/systemtag_psr4
...
Move \OC\SystemTag to PSR-4
2016-04-24 21:02:39 +02:00
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
203b0e9cba
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
a1373ae259
Move \OC\SystemTag to PSR-4
2016-04-22 20:49:16 +02:00
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
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
cb5779f513
Merge pull request #24209 from owncloud/encryption_psr4
...
Move \OC\Encryption to PSR-4
2016-04-22 19:38:49 +02:00
af781af980
Add link to security page
...
Because some people do not think…
2016-04-22 18:52:00 +02:00
d379157289
Move \OC\Encryption to PSR-4
2016-04-22 17:34:01 +02:00
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
48b61b7b5a
Deprecate appinfo/update.php - RepairSteps within info.xml are to be used
2016-04-22 17:22:40 +02:00
e37b95ae53
Merge pull request #24200 from owncloud/appframework_psr4
...
Move \OC\AppFramework to PSR-4
2016-04-22 17:22:02 +02:00
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
4eebccd81f
Fix inconsistent nameing of AppFramework
2016-04-22 16:00:00 +02:00
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
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
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
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
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
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
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
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
d0c1dfd30d
Merge pull request #24191 from owncloud/setup_psr4
...
Move \OC\Setup to PSR-4
2016-04-22 14:21:17 +02:00
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
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
479245a301
Move \OC\Repair to PSR-4
2016-04-22 13:00:41 +02:00
486c5b1112
Drop old calendar and contacts tables - fixes #21889
2016-04-22 12:26:03 +02:00
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
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
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
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
Thomas Müller
Thomas Müller
Robin Appelman
Joas Schilling
Lukas Reschke
Vincent Petry
Roeland Jago Douma
Björn Schießle
Jenkins for ownCloud
Arthur Schiwon
Roeland Douma