summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add $prepend option to addStyle() & addVendorStyle()Individual IT Services2015-09-252-18/+28
|
* Clean codeThomas Müller2015-09-241-56/+66
|
* getService() is not needed -> removeThomas Müller2015-09-231-20/+0
|
* do not load unnecessary code in case of webdavIndividual IT Services2015-09-234-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-tipsyThomas Müller2015-09-231-0/+1
|\ | | | | Implement builder pattern in tipsy shim
| * implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
|/
* Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandcoThomas Müller2015-09-222-3/+3
|\ | | | | Properly show sidebar for trash and sharing sections
| * Properly show sidebar for trash and sharing sectionsVincent Petry2015-09-222-3/+3
| |
* | Merge pull request #19282 from owncloud/disabled-checkboxesHendrik Leppelsack2015-09-221-0/+2
|\ \ | | | | | | Add style for disabled checkboxes
| * | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
|/ /
* | Merge pull request #19275 from owncloud/fix-19158Hendrik Leppelsack2015-09-221-3/+2
|\ \ | | | | | | Left align checkboxes in group dropdown
| * | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
|/ /
* | Merge pull request #18893 from owncloud/move-static-dataLukas Reschke2015-09-2210-90/+87
|\ \ | | | | | | Move static data from config to resources/config/
| * | Update mimetypesLukas Reschke2015-09-221-34/+23
| | |
| * | Move mimetype files into /resources/config/Lukas Reschke2015-09-225-47/+62
| | |
| * | Move certificate bundle into resources/config/Lukas Reschke2015-09-224-9/+2
|/ /
* | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \ | | | | | | Revert "Show cached previews directly"
| * | Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| | | | | | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6.
* | | Merge pull request #19266 from owncloud/fileactions-translate-detailsThomas Müller2015-09-224-1/+5
|\ \ \ | | | | | | | | Properly translate file actions
| * | | Properly translate file actionsVincent Petry2015-09-224-1/+5
| |/ /
* | | Merge pull request #19177 from owncloud/docker-check-stateThomas Müller2015-09-221-2/+8
|\ \ \ | | | | | | | | Connect to database to verify if it is running
| * | | Connect to database to verify if it is runningLukas Reschke2015-09-181-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-sidebarFrank Karlitschek2015-09-221-4/+1
|\ \ \ \ | | | | | | | | | | remove float from file/folder name in sidebar, fix #19243
| * | | | remove float from file/folder name in sidebar, fix #19243Jan-Christoph Borchardt2015-09-221-4/+1
| | |/ / | |/| |
* | | | Merge pull request #19262 from owncloud/fix_18970Roeland Douma2015-09-222-3/+37
|\ \ \ \ | |_|_|/ |/| | | Respect disabled sharing API settings
| * | | Respect disabled sharing API settingsRoeland Jago Douma2015-09-222-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-backendVincent Petry2015-09-2226-117/+121
|\ \ \ | |/ / |/| | Move dummy backend to Tests namespace
| * | Move dummy backend to Tests namespaceLukas Reschke2015-09-2226-117/+121
|/ /
* | Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-215-7/+7
|\ \ | | | | | | Minor text typos
| * | Minor text typosPhil Davis2015-09-215-7/+7
| | | | | | | | | | | | that I noticed while looking at some code.
* | | Merge pull request #19229 from owncloud/webdavauth-in-user-externalThomas Müller2015-09-21156-1279/+0
|\ \ \ | | | | | | | | Move WebDAVAuth to User_External
| * | | Move WebDAVAuth to User_ExternalThomas Müller2015-09-21156-1279/+0
|/ / /
* | | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_allBjörn Schießle2015-09-213-3/+5
|\ \ \ | | | | | | | | Improve description of the encrypt-all and decrypt-all command line tool
| * | | fix small typoBjoern Schiessle2015-09-211-1/+1
| | | |
| * | | improve description and help output for the encrypt-all and decrypt-all commandBjoern Schiessle2015-09-212-2/+4
|/ / /
* | | Merge pull request #18934 from owncloud/bump-3rdpartyThomas Müller2015-09-211-0/+0
|\ \ \ | | | | | | | | Update 3rdparty reference
| * | | Bump 3rdparty referenceLukas Reschke2015-09-211-0/+0
| |/ /
* | | Merge pull request #19215 from owncloud/fix_trashbin_previewsThomas Müller2015-09-211-0/+4
|\ \ \ | | | | | | | | fix trashbin previews for text files
| * | | make sure to add the correct file size to the file info, otherwise we will ↵Bjoern Schiessle2015-09-211-0/+4
| | | | | | | | | | | | | | | | not show the preview for every filetype
* | | | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-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üller2015-09-211-4/+6
| |/ / / | | | | | | | | | | | | information in the session again
* | | | Merge pull request #18709 from owncloud/cleanup-login-semanticsThomas Müller2015-09-212-5/+4
|\ \ \ \ | | | | | | | | | | Pushes input inside the bottom group - login.
| * | | | Squashing all commits in one, remove typos.Raghu Nayyar2015-09-122-5/+4
| | | | |
* | | | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-212-0/+20
|\ \ \ \ \ | | | | | | | | | | | | decrypt-all: improved error message if user doesn't exists
| * | | | | improved error message if user doesn't existsBjoern Schiessle2015-09-212-0/+20
| | |/ / / | |/| | |
* | | | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-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 itRobin Appelman2015-09-211-2/+7
| | | | | |
* | | | | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-212-2/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | prevent 0 byte downloads when storage returns false
| * | | | | add unit testRobin Appelman2015-09-171-0/+17
| | | | | |
| * | | | | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
| | | | | |