aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19380 from owncloud/gallery-icon-visibilityThomas Müller2015-09-2510-11/+42
|\ | | | | increase visibility of slideshow controls, fix owncloud/gallery#51
| * increase visibility of slideshow controls, fix @owncloud/gallery#51Jan-Christoph Borchardt2015-09-2510-11/+42
| |
* | Merge pull request #19383 from owncloud/simplify-upload-iconThomas Müller2015-09-252-2/+2
|\ \ | | | | | | simplify upload icon
| * | simplify upload iconJan-Christoph Borchardt2015-09-252-2/+2
| |/
* | Merge pull request #19366 from owncloud/fix-sidebar-spinnerRoeland Douma2015-09-252-4/+10
|\ \ | | | | | | Fix sidebar spinner
| * | fix sidebar spinnerHendrik Leppelsack2015-09-252-4/+10
|/ /
* | Merge pull request #19362 from owncloud/fix_capabilities_shareAPIRoeland Douma2015-09-252-17/+62
|\ \ | | | | | | Reflect enabled shareAPI in capabilities
| * | Reflect enabled shareAPI in capabilitiesRoeland Jago Douma2015-09-252-17/+62
|/ / | | | | | | | | | | | | If the shareAPI is disabled we not return the other sharing capabilities. This allows clients to properly check if sharing is even available.
* | Merge pull request #19346 from owncloud/drop-passwords-from-exception-logThomas Müller2015-09-254-9/+77
|\ \ | | | | | | Remove passwords from logged exception stack traces
| * | Remove passwords from logged exception stack tracesMorris Jobke2015-09-244-9/+77
| | | | | | | | | | | | | | | | | | * fixed #16318 * create logException in ILogger * add unit tests
* | | Merge pull request #19297 from owncloud/fix_19119Thomas Müller2015-09-252-1/+37
|\ \ \ | | | | | | | | Do not blindy copy expiration date on reshare
| * | | Do not blindy copy expiration date on reshareRoeland Jago Douma2015-09-252-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file/folder is reshared we should not blindly copy the expiration date of the parent share. User/Group shares do not have expiration dates currently, and thus this is always set to null. Fixes #19119 * Added testcase
* | | | Merge pull request #19357 from ↵Thomas Müller2015-09-251-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/add-config.sample.php-for-enforce-home-folder-naming-rule Add doc to config.sample for enforce LDAP home folder naming rule
| * | | | Add doc to config.sample for enforce LDAP home folder naming ruleMorris Jobke2015-09-251-0/+15
| | | | | | | | | | | | | | | | | | | | * ref #16891
* | | | | Merge pull request #19030 from owncloud/oparoz-smarter-loggerThomas Müller2015-09-252-1/+14
|\ \ \ \ \ | | | | | | | | | | | | [jenkins] Dump Arrays, Objects and Exceptions to the log
| * | | | | Adding 3rdparty refThomas Müller2015-09-241-0/+0
| | | | | |
| * | | | | Use a 3rd party normalizer for the loggerOlivier Paroz2015-09-241-1/+14
| | |_|/ / | |/| | |
* | | | | Merge pull request #19354 from owncloud/fix_12727Thomas Müller2015-09-253-5/+46
|\ \ \ \ \ | | | | | | | | | | | | Save the settings in the user management page
| * | | | | Save the settings in the user management pageRoeland Jago Douma2015-09-253-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the setting in the user managerment page (e.g. show e-mail address). Fixes #12727
* | | | | | Merge pull request #19360 from owncloud/move-filter-method-into-config-objectThomas Müller2015-09-257-48/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move the filtering of sensitive data to the config class
| * | | | | | Deduplicate constantJoas Schilling2015-09-251-3/+4
| | | | | | |
| * | | | | | Add the method to the mockJoas Schilling2015-09-252-0/+2
| | | | | | |
| * | | | | | Move the filtering of sensitive data to the config classJoas Schilling2015-09-255-48/+99
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19293 from owncloud/individual-it-move_initTemplateThomas Müller2015-09-254-91/+146
|\ \ \ \ \ \ | | | | | | | | | | | | | | [jenkins] do not load unnecessary code in case of webdav
| * | | | | | Todo for myself to eliminate double codeIndividual IT Services2015-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | This will be in a new PR
| * | | | | | 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 #13145 from owncloud/issue/11951-activity-sharing-emailThomas Müller2015-09-252-0/+39
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Publish an activity when sending a share link via email
| * | | | | | Publish an activity when sending a share link via emailJoas Schilling2015-09-222-0/+39
| | | | | | |
* | | | | | | Merge pull request #19356 from owncloud/add-l10n-factory-to-interfaceThomas Müller2015-09-251-0/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add the L10N Factory to the container interface
| * | | | | | Add the L10N Factory to the container interfaceJoas Schilling2015-09-251-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19329 from owncloud/checkbox-classRaghu Nayyar2015-09-257-21/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add .checkbox class for new checkbox style
| * | | | | fix multiselectHendrik Leppelsack2015-09-251-0/+3
| | | | | |
| * | | | | fix loginHendrik Leppelsack2015-09-252-3/+3
| | | | | |
| * | | | | fix filecomparatorHendrik Leppelsack2015-09-251-2/+2
| | | | | |
| * | | | | fix filelist checkboxesHendrik Leppelsack2015-09-253-4/+4
| | | | | |
| * | | | | add .checkbox class for new checkbox styleHendrik Leppelsack2015-09-252-14/+11
|/ / / / /
* | | | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-244-1/+49
|\ \ \ \ \ | | | | | | | | | | | | fix issue with version rollback and thumbnails
| * | | | | delete cached preview when rolling back file's versionGeorg Ehrke2015-09-204-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called
* | | | | | Merge pull request #19349 from owncloud/revert-18692-patch-2Lukas Reschke2015-09-241-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"
| * | | | | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"Jan-Christoph Borchardt2015-09-241-1/+0
|/ / / / / /
* | | | | | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-2413-2/+340
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [App Code Check] add check for version and mandatory fields
| * | | | | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| | | | | |
| * | | | | encode arrays as stringMorris Jobke2015-09-242-4/+6
| | | | | |
| * | | | | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-2413-2/+338
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions
* | | | | Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-242-13/+15
|\ \ \ \ \ | | | | | | | | | | | | Fix preview of old file on public upload conflicts
| * | | | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-202-13/+15
| | |/ / / | |/| | |
* | | | | Merge pull request #18834 from owncloud/delay-listen-owner-changesThomas Müller2015-09-242-2/+22
|\ \ \ \ \ | | | | | | | | | | | | Delay listening to owner changes untill we use a share for that owner