Commit Graph

27487 Commits

Author SHA1 Message Date
Robin Appelman 24756cf90b specify where to enable locking 2015-09-07 15:09:40 +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
Robin McCorkell 227868fe16 Get sorted navigation list 2015-09-06 23:24:10 +01: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
Robin McCorkell c3a327dc38 Add config.sample.php parameter for tempdirectory 2015-09-06 18:11:34 +01: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 b64e3f8db6 Fallback to complete Memcached flush if getAllKeys fails
Newer Memcached's do not support the underlying protocol commands that
getAllKeys() is implemented with. We should fallback to clearing
everything in that case, as causing (temporary) performance problems for
other applications on the server is better than having stale cached data.
2015-09-05 20:02:49 +01: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 b06bc409e0 Rebuild app navigation in JS
Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.
2015-09-05 02:24:18 +01: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
Morris Jobke e1a79cd651 Avoid re-propagation of shares during one propagation run
* fix was proposed by @nickvergessen
2015-09-04 16:17:27 +02:00
Morris Jobke f6df37e0cc Merge pull request #18823 from owncloud/filetype-pngs
export correct 48px png fallbacks for filetype icons
2015-09-04 15:27:01 +02:00
Morris Jobke c9457fdcad Merge pull request #18762 from owncloud/use-json-instead-of-unserialize
Use "json_encode" and "json_decode" instead of unserialize
2015-09-04 11:40:01 +02:00
Individual IT Services 3bc287ff63 Merge pull request #18794 from individual-it/reuse_systemConfig
reuse existing $systemConfig variable
2015-09-04 14:03:56 +05:45
Jenkins for ownCloud 4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Robin McCorkell cacbae9d55 Merge pull request #18815 from owncloud/ext-update
Set default mount options for external storages
2015-09-03 16:05:19 +01:00
Vincent Petry 310d797284 Add versions tab to files sidebar
- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
2015-09-03 16:47:24 +02:00
Jan-Christoph Borchardt e7df6c0ca7 also modify other places icons to fit new style 2015-09-03 16:30:32 +02:00
Morris Jobke e54513cddd Merge pull request #18799 from owncloud/appconfig-with-one-request
Only query the appconfig once per request
2015-09-03 16:13:14 +02:00
Robin McCorkell f1e97433f7 Set default mount options for external storages 2015-09-03 14:57:14 +01:00
Jan-Christoph Borchardt 90fa2bd558 export correct 48px png fallbacks for filetype icons 2015-09-03 15:47:05 +02:00
Joas Schilling 38a164aa7a Make sure the array exists 2015-09-03 15:41:30 +02:00
Vincent Petry 1f9974894d Merge pull request #18810 from owncloud/shared-mount-delay-setup
Delay setting up the filesystem for a share owner untill the share is used
2015-09-03 15:09:57 +02:00
Robin McCorkell 3a99ef7077 Merge pull request #18812 from owncloud/move_updater_above_version
move updater panel above version number
2015-09-03 14:09:33 +01:00
Robin McCorkell 5f1dc41a38 Merge pull request #18811 from owncloud/better-submodule-warning
Proper details about git submodule update
2015-09-03 14:04:40 +01:00
Georg Ehrke 1a48499dcb move updater panel above version number 2015-09-03 15:03:16 +02:00
Morris Jobke 038b09b0b0 Proper details about git submodule update
* fixes #18801
2015-09-03 14:55:26 +02:00
Morris Jobke 2b9c34d756 Merge pull request #18781 from owncloud/move-background-job-registration-to-install-update
Move background job registration to install update
2015-09-03 14:55:07 +02:00
Robin Appelman 8123df9489 setup owner when getting users for share 2015-09-03 14:34:46 +02:00
Robin Appelman e9e42fff61 Merge pull request #18809 from owncloud/fix-tags-fileinfomodel
Tags in FileInfo map must be an array
2015-09-03 14:08:00 +02:00
Robin Appelman 5234090ee2 Merge pull request #18803 from owncloud/toggle-svg
use SVG for toggle image on installation instead of PNG
2015-09-03 14:06:03 +02:00