Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19374 from owncloud/rename-config-test | Thomas Müller | 2015-09-28 | 1 | -2/+4 |
|\ | | | | | rename config test to prevent autoloader issue | ||||
| * | rename config test to prevent autoloader issue | Robin Appelman | 2015-09-28 | 1 | -2/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-28 | 480 | -450/+1622 |
| | | |||||
* | | Merge pull request #19363 from owncloud/checkboxes-sidebar | Thomas Müller | 2015-09-28 | 3 | -10/+10 |
|\ \ | | | | | | | Restyle checkboxes in sidebar | ||||
| * | | restyle checkboxes in sidebar | Hendrik Leppelsack | 2015-09-25 | 3 | -10/+10 |
| | | | |||||
* | | | Merge pull request #19398 from owncloud/fix-tranifex | Thomas Müller | 2015-09-28 | 1 | -6/+0 |
|\ \ \ | |_|/ |/| | | Remove webdavauth from tranisfex | ||||
| * | | Remove webdavauth from tranisfex | Thomas Müller | 2015-09-28 | 1 | -6/+0 |
| | | | |||||
* | | | Merge pull request #19379 from owncloud/remove-auth-button-border | Thomas Müller | 2015-09-28 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | remove border around button of password protected link confirmation | ||||
| * | | | remove border around button of password protected link confirmation | Jan-Christoph Borchardt | 2015-09-28 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #19395 from owncloud/15037-universal-shebang | Thomas Müller | 2015-09-28 | 18 | -18/+18 |
|\ \ \ \ | | | | | | | | | | | Use a universal shebang | ||||
| * | | | | Use a universal shebang | Olivier Paroz | 2015-09-27 | 18 | -18/+18 |
| | |/ / | |/| | | | | | | | | | | Fixes #15037 | ||||
* | | | | Merge pull request #19394 from owncloud/18203-math-ceil | Thomas Müller | 2015-09-28 | 2 | -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 Preview | Olivier Paroz | 2015-09-27 | 2 | -6/+6 |
| |/ / | | | | | | | | | | Fixes #18203 | ||||
* | | | Merge pull request #19378 from owncloud/fix-sharing-autocomplete | Thomas Müller | 2015-09-28 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | fix name autocomplete not showing on mobile, fix #18551 | ||||
| * | | fix name autocomplete not showing on mobile, fix #18551 | Jan-Christoph Borchardt | 2015-09-25 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #19380 from owncloud/gallery-icon-visibility | Thomas Müller | 2015-09-25 | 10 | -11/+42 |
|\ \ \ | | | | | | | | | increase visibility of slideshow controls, fix owncloud/gallery#51 | ||||
| * | | | increase visibility of slideshow controls, fix @owncloud/gallery#51 | Jan-Christoph Borchardt | 2015-09-25 | 10 | -11/+42 |
| |/ / | |||||
* | | | Merge pull request #19383 from owncloud/simplify-upload-icon | Thomas Müller | 2015-09-25 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | simplify upload icon | ||||
| * | | | simplify upload icon | Jan-Christoph Borchardt | 2015-09-25 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #19366 from owncloud/fix-sidebar-spinner | Roeland Douma | 2015-09-25 | 2 | -4/+10 |
|\ \ \ | | | | | | | | | Fix sidebar spinner | ||||
| * | | | fix sidebar spinner | Hendrik Leppelsack | 2015-09-25 | 2 | -4/+10 |
|/ / / | |||||
* | | | Merge pull request #19362 from owncloud/fix_capabilities_shareAPI | Roeland Douma | 2015-09-25 | 2 | -17/+62 |
|\ \ \ | | | | | | | | | Reflect enabled shareAPI in capabilities | ||||
| * | | | Reflect enabled shareAPI in capabilities | Roeland Jago Douma | 2015-09-25 | 2 | -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-log | Thomas Müller | 2015-09-25 | 4 | -9/+77 |
|\ \ \ | | | | | | | | | Remove passwords from logged exception stack traces | ||||
| * | | | Remove passwords from logged exception stack traces | Morris Jobke | 2015-09-24 | 4 | -9/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | * fixed #16318 * create logException in ILogger * add unit tests | ||||
* | | | | Merge pull request #19297 from owncloud/fix_19119 | Thomas Müller | 2015-09-25 | 2 | -1/+37 |
|\ \ \ \ | | | | | | | | | | | Do not blindy copy expiration date on reshare | ||||
| * | | | | Do not blindy copy expiration date on reshare | Roeland Jago Douma | 2015-09-25 | 2 | -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üller | 2015-09-25 | 1 | -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 rule | Morris Jobke | 2015-09-25 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | * ref #16891 | ||||
* | | | | | Merge pull request #19030 from owncloud/oparoz-smarter-logger | Thomas Müller | 2015-09-25 | 2 | -1/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | [jenkins] Dump Arrays, Objects and Exceptions to the log | ||||
| * | | | | | Adding 3rdparty ref | Thomas Müller | 2015-09-24 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Use a 3rd party normalizer for the logger | Olivier Paroz | 2015-09-24 | 1 | -1/+14 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #19354 from owncloud/fix_12727 | Thomas Müller | 2015-09-25 | 3 | -5/+46 |
|\ \ \ \ \ | | | | | | | | | | | | | Save the settings in the user management page | ||||
| * | | | | | Save the settings in the user management page | Roeland Jago Douma | 2015-09-25 | 3 | -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-object | Thomas Müller | 2015-09-25 | 7 | -48/+102 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move the filtering of sensitive data to the config class | ||||
| * | | | | | | Deduplicate constant | Joas Schilling | 2015-09-25 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Add the method to the mock | Joas Schilling | 2015-09-25 | 2 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Move the filtering of sensitive data to the config class | Joas Schilling | 2015-09-25 | 5 | -48/+99 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19293 from owncloud/individual-it-move_initTemplate | Thomas Müller | 2015-09-25 | 4 | -91/+146 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [jenkins] do not load unnecessary code in case of webdav | ||||
| * | | | | | | Todo for myself to eliminate double code | Individual IT Services | 2015-09-25 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | This will be in a new PR | ||||
| * | | | | | | 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 #13145 from owncloud/issue/11951-activity-sharing-email | Thomas Müller | 2015-09-25 | 2 | -0/+39 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Publish an activity when sending a share link via email | ||||
| * | | | | | | Publish an activity when sending a share link via email | Joas Schilling | 2015-09-22 | 2 | -0/+39 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19356 from owncloud/add-l10n-factory-to-interface | Thomas Müller | 2015-09-25 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Add the L10N Factory to the container interface | ||||
| * | | | | | | Add the L10N Factory to the container interface | Joas Schilling | 2015-09-25 | 1 | -0/+6 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19329 from owncloud/checkbox-class | Raghu Nayyar | 2015-09-25 | 7 | -21/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add .checkbox class for new checkbox style | ||||
| * | | | | | fix multiselect | Hendrik Leppelsack | 2015-09-25 | 1 | -0/+3 |
| | | | | | |