Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 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 | 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 | 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 | Roeland Jago Douma | 2015-09-25 | 2 | -17/+62 |
|/ / | |||||
* | | 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 | Morris Jobke | 2015-09-24 | 4 | -9/+77 |
* | | | 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 | Roeland Jago Douma | 2015-09-25 | 2 | -1/+37 |
* | | | | Merge pull request #19357 from owncloud/add-config.sample.php-for-enforce-hom... | Thomas Müller | 2015-09-25 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Add doc to config.sample for enforce LDAP home folder naming rule | Morris Jobke | 2015-09-25 | 1 | -0/+15 |
* | | | | | Merge pull request #19030 from owncloud/oparoz-smarter-logger | Thomas Müller | 2015-09-25 | 2 | -1/+14 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Roeland Jago Douma | 2015-09-25 | 3 | -5/+46 |
* | | | | | | Merge pull request #19360 from owncloud/move-filter-method-into-config-object | Thomas Müller | 2015-09-25 | 7 | -48/+102 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Todo for myself to eliminate double code | Individual IT Services | 2015-09-25 | 1 | -0/+5 |
| * | | | | | | 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 |
* | | | | | | | 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 | 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 | Joas Schilling | 2015-09-25 | 1 | -0/+6 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19329 from owncloud/checkbox-class | Raghu Nayyar | 2015-09-25 | 7 | -21/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix multiselect | Hendrik Leppelsack | 2015-09-25 | 1 | -0/+3 |
| * | | | | | fix login | Hendrik Leppelsack | 2015-09-25 | 2 | -3/+3 |
| * | | | | | fix filecomparator | Hendrik Leppelsack | 2015-09-25 | 1 | -2/+2 |
| * | | | | | fix filelist checkboxes | Hendrik Leppelsack | 2015-09-25 | 3 | -4/+4 |
| * | | | | | add .checkbox class for new checkbox style | Hendrik Leppelsack | 2015-09-25 | 2 | -14/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue | Thomas Müller | 2015-09-24 | 4 | -1/+49 |
|\ \ \ \ \ | |||||
| * | | | | | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 4 | -1/+49 |
* | | | | | | Merge pull request #19349 from owncloud/revert-18692-patch-2 | Lukas Reschke | 2015-09-24 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)" | Jan-Christoph Borchardt | 2015-09-24 | 1 | -1/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19306 from owncloud/app-code-check-version | Thomas Müller | 2015-09-24 | 13 | -2/+340 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | public, remote and default_enable are not deprecated | Morris Jobke | 2015-09-24 | 1 | -3/+3 |
| * | | | | | encode arrays as string | Morris Jobke | 2015-09-24 | 2 | -4/+6 |
| * | | | | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 13 | -2/+338 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #18517 from owncloud/17753_to_master | Thomas Müller | 2015-09-24 | 2 | -13/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Fix preview of old file on public upload conflicts | Olivier Paroz | 2015-09-20 | 2 | -13/+15 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #18834 from owncloud/delay-listen-owner-changes | Thomas Müller | 2015-09-24 | 2 | -2/+22 |
|\ \ \ \ \ |