Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add $prepend option to addStyle() & addVendorStyle() | Individual IT Services | 2015-09-25 | 2 | -18/+28 |
| | |||||
* | Clean code | Thomas Müller | 2015-09-24 | 1 | -56/+66 |
| | |||||
* | getService() is not needed -> remove | Thomas Müller | 2015-09-23 | 1 | -20/+0 |
| | |||||
* | do not load unnecessary code in case of webdav | Individual IT Services | 2015-09-23 | 4 | -72/+122 |
| | | | | | | | | | | | | changing from "protected static" to "protected" as suggested by @nickvergessen https://github.com/owncloud/core/pull/19114#discussion_r39719851 moving initTemplate() into template constr. reduce to move initTemplate only cleanup spaces | ||||
* | Merge pull request #19285 from owncloud/fix-strengthify-tipsy | Thomas Müller | 2015-09-23 | 1 | -0/+1 |
|\ | | | | | Implement builder pattern in tipsy shim | ||||
| * | implement builder pattern in tipsy shim | Hendrik Leppelsack | 2015-09-23 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco | Thomas Müller | 2015-09-22 | 2 | -3/+3 |
|\ | | | | | Properly show sidebar for trash and sharing sections | ||||
| * | Properly show sidebar for trash and sharing sections | Vincent Petry | 2015-09-22 | 2 | -3/+3 |
| | | |||||
* | | Merge pull request #19282 from owncloud/disabled-checkboxes | Hendrik Leppelsack | 2015-09-22 | 1 | -0/+2 |
|\ \ | | | | | | | Add style for disabled checkboxes | ||||
| * | | add style for disabled checkboxes | Hendrik Leppelsack | 2015-09-22 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #19275 from owncloud/fix-19158 | Hendrik Leppelsack | 2015-09-22 | 1 | -3/+2 |
|\ \ | | | | | | | Left align checkboxes in group dropdown | ||||
| * | | left align checkboxes in group dropdown | Hendrik Leppelsack | 2015-09-22 | 1 | -3/+2 |
|/ / | |||||
* | | Merge pull request #18893 from owncloud/move-static-data | Lukas Reschke | 2015-09-22 | 10 | -90/+87 |
|\ \ | | | | | | | Move static data from config to resources/config/ | ||||
| * | | Update mimetypes | Lukas Reschke | 2015-09-22 | 1 | -34/+23 |
| | | | |||||
| * | | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 5 | -47/+62 |
| | | | |||||
| * | | Move certificate bundle into resources/config/ | Lukas Reschke | 2015-09-22 | 4 | -9/+2 |
|/ / | |||||
* | | Merge pull request #19268 from owncloud/revert-18911 | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
|\ \ | | | | | | | Revert "Show cached previews directly" | ||||
| * | | Revert "Show cached previews directly" | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
| | | | | | | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6. | ||||
* | | | Merge pull request #19266 from owncloud/fileactions-translate-details | Thomas Müller | 2015-09-22 | 4 | -1/+5 |
|\ \ \ | | | | | | | | | Properly translate file actions | ||||
| * | | | Properly translate file actions | Vincent Petry | 2015-09-22 | 4 | -1/+5 |
| |/ / | |||||
* | | | Merge pull request #19177 from owncloud/docker-check-state | Thomas Müller | 2015-09-22 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | Connect to database to verify if it is running | ||||
| * | | | Connect to database to verify if it is running | Lukas Reschke | 2015-09-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | Try to connect to the OCI host via sqlplus to ensure that the connection is already running. Required by the new OCI configuration on CI. | ||||
* | | | | Merge pull request #19257 from owncloud/fix-floating-in-sidebar | Frank Karlitschek | 2015-09-22 | 1 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | remove float from file/folder name in sidebar, fix #19243 | ||||
| * | | | | remove float from file/folder name in sidebar, fix #19243 | Jan-Christoph Borchardt | 2015-09-22 | 1 | -4/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #19262 from owncloud/fix_18970 | Roeland Douma | 2015-09-22 | 2 | -3/+37 |
|\ \ \ \ | |_|_|/ |/| | | | Respect disabled sharing API settings | ||||
| * | | | Respect disabled sharing API settings | Roeland Jago Douma | 2015-09-22 | 2 | -3/+37 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If the sharing API setting is disabled that sharing check middle ware should block the request. Thus making link shares unavailable. Fixes #18970 * Unit test added * Unit tests updated | ||||
* | | | Merge pull request #19233 from owncloud/remove-dummy-backend | Vincent Petry | 2015-09-22 | 26 | -117/+121 |
|\ \ \ | |/ / |/| | | Move dummy backend to Tests namespace | ||||
| * | | Move dummy backend to Tests namespace | Lukas Reschke | 2015-09-22 | 26 | -117/+121 |
|/ / | |||||
* | | Merge pull request #19231 from phil-davis/r1 | Thomas Müller | 2015-09-21 | 5 | -7/+7 |
|\ \ | | | | | | | Minor text typos | ||||
| * | | Minor text typos | Phil Davis | 2015-09-21 | 5 | -7/+7 |
| | | | | | | | | | | | | that I noticed while looking at some code. | ||||
* | | | Merge pull request #19229 from owncloud/webdavauth-in-user-external | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|\ \ \ | | | | | | | | | Move WebDAVAuth to User_External | ||||
| * | | | Move WebDAVAuth to User_External | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|/ / / | |||||
* | | | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all | Björn Schießle | 2015-09-21 | 3 | -3/+5 |
|\ \ \ | | | | | | | | | Improve description of the encrypt-all and decrypt-all command line tool | ||||
| * | | | fix small typo | Bjoern Schiessle | 2015-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | improve description and help output for the encrypt-all and decrypt-all command | Bjoern Schiessle | 2015-09-21 | 2 | -2/+4 |
|/ / / | |||||
* | | | Merge pull request #18934 from owncloud/bump-3rdparty | Thomas Müller | 2015-09-21 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | Update 3rdparty reference | ||||
| * | | | Bump 3rdparty reference | Lukas Reschke | 2015-09-21 | 1 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #19215 from owncloud/fix_trashbin_previews | Thomas Müller | 2015-09-21 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | fix trashbin previews for text files | ||||
| * | | | make sure to add the correct file size to the file info, otherwise we will ↵ | Bjoern Schiessle | 2015-09-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | not show the preview for every filetype | ||||
* | | | | Merge pull request #18481 from owncloud/fix-apache-login-master | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | Repeated calls to loginWithApache() should not not try to set user in… | ||||
| * | | | | Repeated calls to loginWithApache() should not not try to set user ↵ | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
| |/ / / | | | | | | | | | | | | | information in the session again | ||||
* | | | | Merge pull request #18709 from owncloud/cleanup-login-semantics | Thomas Müller | 2015-09-21 | 2 | -5/+4 |
|\ \ \ \ | | | | | | | | | | | Pushes input inside the bottom group - login. | ||||
| * | | | | Squashing all commits in one, remove typos. | Raghu Nayyar | 2015-09-12 | 2 | -5/+4 |
| | | | | | |||||
* | | | | | Merge pull request #19221 from owncloud/improved_error_messages | Thomas Müller | 2015-09-21 | 2 | -0/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | decrypt-all: improved error message if user doesn't exists | ||||
| * | | | | | improved error message if user doesn't exists | Bjoern Schiessle | 2015-09-21 | 2 | -0/+20 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #17347 from owncloud/dav-fopen-overwrite | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | dont download the existing file for webdav if we're going to overwrite it | ||||
| * | | | | | dont download the existing file for webdav if we're going to overwrite it | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #19081 from owncloud/prevent0bytedownloads | Robin Appelman | 2015-09-21 | 2 | -2/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | prevent 0 byte downloads when storage returns false | ||||
| * | | | | | add unit test | Robin Appelman | 2015-09-17 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | prevent 0 byte downloads when storage returns false | Jörn Friedrich Dreyer | 2015-09-17 | 1 | -2/+5 |
| | | | | | |