Commit Graph

27107 Commits

Author SHA1 Message Date
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
Robin Appelman fd7b210654 Delay setting up the filesystem for a share owner untill the share is used 2015-09-03 13:46:08 +02:00
Vincent Petry 73c61941e2 Tags in FileInfo map must be an array
Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
2015-09-03 13:01:14 +02:00
Vincent Petry 4ba2333507 Added unit tests for "new" file menu and small fixes
- added unit tests for NewFileMenu
- use generateUrl for FileList.createFile and FileList.createDirectory
- added unit tests for FileList.createFile and FileList.createDirectory
2015-09-03 12:17:35 +02:00
Robin Appelman 4361ff92e2 Replace server status message about transitional file locking with setup warnings 2015-09-03 11:59:47 +02:00
Jan-Christoph Borchardt 8684420d0a Merge pull request #18798 from owncloud/collapse-html-code
Collapse HTML code for federated code
2015-09-03 11:59:01 +02:00
Lukas Reschke ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Jan-Christoph Borchardt acc9fa49fc use SVG for toggle image instead of PNG, fix installation and personal settings toggle 2015-09-03 11:49:28 +02:00
Morris Jobke a1e13d95ad Merge pull request #18777 from owncloud/locking-default
enable transational locking by default
2015-09-03 11:33:10 +02:00
Joas Schilling 21ba3b8737 Only query the appconfig once 2015-09-03 11:30:57 +02:00
Morris Jobke c4096767cc Merge pull request #18780 from owncloud/isimage-fallback
fallback for isimage
2015-09-03 11:11:48 +02:00
Lukas Reschke 929fc8eea2 Merge pull request #18787 from owncloud/encode-tags-in-json
Encode HTML tags in JSON
2015-09-03 11:02:11 +02:00
Vincent Petry d4104ed9f7 Remove ellipsis on new file menu items 2015-09-03 10:57:34 +02:00
Robin McCorkell 442f5269ef Fix Swift legacy auth mechanism fallback 2015-09-03 09:57:29 +01:00
Robin McCorkell e33d7b34fa Fix typo in SMB_OC 2015-09-03 09:57:18 +01:00
Individual IT Services cd0a5372ee reuse existing $systemConfig variable 2015-09-03 12:44:35 +05:45
Vincent Petry 3ea9f97c36 Fix sidebar thumbnail loading JS unit tests 2015-09-03 08:24:50 +02:00
Jenkins for ownCloud 189f4044dd [tx-robot] updated from transifex 2015-09-03 01:55:23 -04:00
Jan-Christoph Borchardt 69b6358df6 fix icon and layout details for new menu 2015-09-03 00:58:03 +02:00
Morris Jobke e7314b3ad8 Merge pull request #18764 from owncloud/login-template-accessibility
add title attribute for the login button
2015-09-03 00:45:14 +02:00
Lukas Reschke f9e90e92d4 Encode HTML tags in JSON
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
2015-09-03 00:44:46 +02:00
Jan-Christoph Borchardt d03db5ac0d Merge pull request #18682 from owncloud/quota-select-style
Makes settings quota select like multiselect.
2015-09-03 00:36:11 +02:00
Jan-Christoph Borchardt a55f81e774 use proper triangle for multiselect dropdowns as well 2015-09-03 00:35:09 +02:00
Raghu Nayyar 59cf11c612 Makes settings select like multiselect 2015-09-03 00:28:08 +02:00
Joas Schilling e2cc778947 Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletes
Revert "Soft fail when deleting and no entry found"
2015-09-02 19:53:18 +02:00
Joas Schilling 8f2110e5da Revert "Soft fail when deleting and no entry found" 2015-09-02 19:52:45 +02:00
Joas Schilling 49b98abc25 Move registration of background job to install/update 2015-09-02 19:26:22 +02:00
Robin Appelman 068ff09cfe fallback for isimage 2015-09-02 19:22:46 +02:00
Joas Schilling cea8cc73c8 Move registration of LDAP background jobs to the install and update 2015-09-02 19:21:45 +02:00
Robin Appelman 389c8077b0 update config sample 2015-09-02 17:31:02 +02:00
Robin Appelman 4880d7729b enable transational locking by default 2015-09-02 16:56:47 +02:00