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

26721 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Robin McCorkell
f97359706a Merge pull request #18773 from owncloud/fix-useless-deletes 
Soft fail when deleting and no entry found
 2015-09-02 15:12:07 +01:00
Robin McCorkell
c9c246a3f5 Soft fail when deleting and no entry found 2015-09-02 14:50:07 +01:00
Jenkins for ownCloud
772d39f006 [tx-robot] updated from transifex 2015-09-02 07:08:44 -04:00
Christoph Wurst
ba9457264f add title attribute for the login button 2015-09-02 12:32:16 +02:00
Lukas Reschke
36e26c6f09 Use "json_encode" and "json_decode" instead of unserialize 2015-09-02 12:26:37 +02:00
Jan-Christoph Borchardt
4539377113 Merge pull request #18632 from owncloud/sidebad-image-preview 
larger preview for images in the sidebar
 2015-09-02 10:53:59 +02:00
Morris Jobke
0884211c0f Merge pull request #18752 from owncloud/proper-setup-check 
use config.php value instead of version string for appstore detection
 2015-09-02 10:36:19 +02:00
Robin Appelman
e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Robin Appelman
c6060f53cd allow handling thumbnail errors 2015-09-02 10:32:43 +02:00
Robin Appelman
0f6df2e0b6 Allow creating previewss that cover the specified dimensions 2015-09-02 10:32:39 +02:00
Morris Jobke
c86cac6a2b use config.php value instead of version string 2015-09-02 08:16:27 +02:00
Morris Jobke
73b43db4f9 Merge pull request #18744 from owncloud/fix-ocs-router 
Delay adding OCS prefix to route collection until all is loaded
 2015-09-02 08:05:15 +02:00
Jenkins for ownCloud
310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04:00
Robin McCorkell
e50b3bd87f Merge pull request #18707 from owncloud/autotest-xdebug 
Allow easy XDEBUG debugging with autotest
 2015-09-01 16:29:33 +01:00
Robin Appelman
9858a6f705 Merge pull request #18743 from owncloud/autoloader-check-log-path 
Show the path as part of the exception for not allowed autoloading paths
 2015-09-01 17:20:21 +02:00