summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14972 from owncloud/add-group-styleMorris Jobke2015-03-181-2/+21
|\ | | | | User management design details
| * slight positioning fixes in user mgmt controls barJan-Christoph Borchardt2015-03-171-1/+4
| |
| * improve style of 'Add group' input and buttonJan-Christoph Borchardt2015-03-171-1/+17
| |
* | Merge pull request #14967 from owncloud/checkbox-alignmentMorris Jobke2015-03-181-2/+5
|\ \ | | | | | | Share dropdown: fix checkbox alignment, more whitespace
| * | add more whitespace to share link options in dropdown for better ↵Jan-Christoph Borchardt2015-03-171-2/+4
| | | | | | | | | | | | clickability and look
| * | fix checkbox alignment in share dialog, fix #11515Jan-Christoph Borchardt2015-03-171-0/+1
| |/
* | Merge pull request #14968 from owncloud/files-reallowsinglequoteThomas Müller2015-03-172-1/+27
|\ \ | | | | | | Reallow single quote in file names
| * | Use `FILTER_UNSAFE_RAW` instead of `FILTER_SANITIZE_STRING`Lukas Reschke2015-03-171-1/+1
| | | | | | | | | | | | `FILTER_SANITIZE_STRING` will still encode everything else.
| * | Add positive test for path verificationVincent Petry2015-03-171-0/+26
| |/
* | Merge pull request #14975 from owncloud/add-smtp-debug-modeThomas Müller2015-03-171-1/+16
|\ \ | | | | | | Add debug mode back to mailer
| * | Add debug mode back to mailerLukas Reschke2015-03-171-1/+16
| | | | | | | | | | | | This re-adds the debug mode for the mailer which will log the whole SMTP traffic within the log file if enabled.
* | | Merge pull request #14961 from owncloud/onlyrequireinfoBernhard Posselt2015-03-171-3/+3
|\ \ \ | | | | | | | | Only hard depend on the info.xml and not the app.php
| * | | only hard depend on the info.xml and not the app.phpBernhard Posselt2015-03-171-3/+3
| | | | | | | | | | | | | | | | fix comment
* | | | Merge pull request #14954 from owncloud/cache-image-pathRobin McCorkell2015-03-174-24/+51
|\ \ \ \ | |_|/ / |/| | | Cache \OC\URLGenerator::imagePath
| * | | Reuse cache resultLukas Reschke2015-03-171-2/+2
| | | |
| * | | Read theme only if requiredLukas Reschke2015-03-171-3/+3
| | | |
| * | | Cache \OC\URLGenerator::imagePathLukas Reschke2015-03-174-24/+51
| | | | | | | | | | | | | | | | \OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
* | | | Merge pull request #14962 from owncloud/safer-deletionMorris Jobke2015-03-172-3/+7
|\ \ \ \ | |_|_|/ |/| | | Add whitespace to right of list to prevent accidental deletion when scrolling
| * | | add whitespace to prevent file deletion when wanting to scrollJan-Christoph Borchardt2015-03-172-3/+7
|/ / /
* | | Merge pull request #14957 from owncloud/remove-unused-sectionLukas Reschke2015-03-171-1/+0
|\ \ \ | | | | | | | | Remove unused section
| * | | Remove unused sectionLukas Reschke2015-03-171-1/+0
| | | | | | | | | | | | | | | | This section is now unused as the security configuration has to happen on the webserver layer since https://github.com/owncloud/core/pull/14651
* | | | Merge pull request #14948 from owncloud/prefix-memcacheThomas Müller2015-03-172-1/+9
|\ \ \ \ | |/ / / |/| | | Add version and path to cache prefix
| * | | Add version and path to cache prefixLukas Reschke2015-03-172-1/+9
| |/ / | | | | | | | | | | | | | | | Prevents to have the cache reused by other instances on the server which have possible the same instance ID and also invalidates older cache entries after an upgrade which can cause unwanted side-effects. Impact for deployment: The same cache will only get used if ownCloud is installed with the same version and under the same path. But this should be a basic requirement anyways.
* | | Merge pull request #14952 from owncloud/issue/14881-files-app-follow-upThomas Müller2015-03-173-45/+38
|\ \ \ | |/ / |/| | Use a closure for the files app entry and deprecate old methods
| * | Use a closure for the files app entry and deprecate old methodsJoas Schilling2015-03-173-45/+38
|/ /
* | Merge pull request #14944 from owncloud/fix-php-doc-and-coThomas Müller2015-03-171-4/+12
|\ \ | | | | | | Fix PHPDoc and Co.
| * | Fix PHPDoc and Co.Lukas Reschke2015-03-171-4/+12
| | | | | | | | | | | | Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
* | | Merge pull request #14927 from oparoz/raw-mimetypesThomas Müller2015-03-174-2/+137
|\ \ \ | | | | | | | | Introducing the Raw media types
| * | | Introducing the Raw mimetypesOlivier Paroz2015-03-164-2/+137
| | | |
* | | | Merge pull request #14931 from ↵Lukas Reschke2015-03-173-4/+182
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue/14881-closures-for-navigation-entries Issue/14881 closures for navigation entries
| * | | | Add tests for the navigation manager (closure) behaviourJoas Schilling2015-03-161-0/+160
| | | | |
| * | | | Allow registering closures for navigation entriesJoas Schilling2015-03-162-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | This speeds up all pages that don't use the navigation by 0.04sec per app, because we don't need to create the routing anymore, unless we really need to.
* | | | | Merge pull request #12085 from owncloud/add-swift-mailerLukas Reschke2015-03-1719-319/+1027
|\ \ \ \ \ | |_|_|/ / |/| | | | Migrate OC_Mail to SwiftMailer
| * | | | Don't fallback to Plaintext per default for legacy classLukas Reschke2015-03-161-6/+15
| | | | |
| * | | | Add debug log message backLukas Reschke2015-03-163-5/+23
| | | | |
| * | | | Show more detailed error messageLukas Reschke2015-03-164-35/+16
| | | | |
| * | | | Adjust unit testLukas Reschke2015-03-161-1/+6
| | | | |
| * | | | Incorporate review changesLukas Reschke2015-03-168-116/+63
| | | | |
| * | | | Use new IMailer and add unit-tests for lostcontrollerLukas Reschke2015-03-163-20/+111
| | | | |
| * | | | Migrate to SwiftMailLukas Reschke2015-03-1620-286/+943
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly. Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014 Conflicts: 3rdparty lib/private/server.php lib/public/iservercontainer.php tests/lib/mail.php tests/settings/controller/mailsettingscontrollertest.php Conflicts: 3rdparty lib/private/mail.php lib/private/server.php lib/public/iservercontainer.php settings/ajax/lostpassword.php settings/application.php
* | | | | Merge pull request #14929 from owncloud/s2s-scanner-warningsVincent Petry2015-03-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix scanFile signature warnings
| * | | | | Fix scanFile signature warningsVincent Petry2015-03-161-1/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-17102-228/+68
| | | | |
* | | | | Merge pull request #14936 from owncloud/fix-setup-configMorris Jobke2015-03-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix setup config namespace
| * | | | | Fix setup configVincent Petry2015-03-161-1/+1
|/ / / / /
* | | | | Merge pull request #14923 from owncloud/fix-preference-key-definitionVincent Petry2015-03-166-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix user preference key definition for insertIfNotExists()
| * | | | | Also add a note that clob does not work in the compare arrayJoas Schilling2015-03-165-0/+5
| | | | | |
| * | | | | The key is over configkey, user and app, not the valueJoas Schilling2015-03-161-1/+1
| |/ / / / | | | | | | | | | | | | | | | stupid me :(
* | | | | Merge pull request #13733 from ↵Thomas Müller2015-03-161-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mmattel/Try_to_write_logtimezone_during_installation Write the parameter 'logtimezone' into config.php during setup
| * | | | | Write the parameter 'logtimezone' into config.php during setupMartin2015-01-281-0/+5
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 22:29:17 +0000