summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19374 from owncloud/rename-config-testThomas Müller2015-09-281-2/+4
|\ | | | | rename config test to prevent autoloader issue
| * rename config test to prevent autoloader issueRobin Appelman2015-09-281-2/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-09-28480-450/+1622
| |
* | Merge pull request #19363 from owncloud/checkboxes-sidebarThomas Müller2015-09-283-10/+10
|\ \ | | | | | | Restyle checkboxes in sidebar
| * | restyle checkboxes in sidebarHendrik Leppelsack2015-09-253-10/+10
| | |
* | | Merge pull request #19398 from owncloud/fix-tranifexThomas Müller2015-09-281-6/+0
|\ \ \ | |_|/ |/| | Remove webdavauth from tranisfex
| * | Remove webdavauth from tranisfexThomas Müller2015-09-281-6/+0
| | |
* | | Merge pull request #19379 from owncloud/remove-auth-button-borderThomas Müller2015-09-281-1/+2
|\ \ \ | | | | | | | | remove border around button of password protected link confirmation
| * | | remove border around button of password protected link confirmationJan-Christoph Borchardt2015-09-281-1/+2
| | | |
* | | | Merge pull request #19395 from owncloud/15037-universal-shebangThomas Müller2015-09-2818-18/+18
|\ \ \ \ | | | | | | | | | | Use a universal shebang
| * | | | Use a universal shebangOlivier Paroz2015-09-2718-18/+18
| | |/ / | |/| | | | | | | | | | Fixes #15037
* | | | Merge pull request #19394 from owncloud/18203-math-ceilThomas Müller2015-09-282-6/+6
|\ \ \ \ | |_|/ / |/| | | Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
| * | | Switch from Math.floor() to Math.ceil() when sending the dimension to PreviewOlivier Paroz2015-09-272-6/+6
| |/ / | | | | | | | | | Fixes #18203
* | | Merge pull request #19378 from owncloud/fix-sharing-autocompleteThomas Müller2015-09-281-0/+4
|\ \ \ | |/ / |/| | fix name autocomplete not showing on mobile, fix #18551
| * | fix name autocomplete not showing on mobile, fix #18551Jan-Christoph Borchardt2015-09-251-0/+4
| | |
* | | 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
| | | | | |