Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | only initialize once | Robin Appelman | 2015-09-23 | 1 | -0/+6 | |
| * | | | | | | | Delay listening to owner changes untill we use a share for that owner | Robin Appelman | 2015-09-23 | 2 | -2/+16 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #19305 from owncloud/share-hasusershares | Thomas Müller | 2015-09-24 | 2 | -2/+72 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix ShareItemModel.hasUserShares to only check shares of current item | Vincent Petry | 2015-09-23 | 2 | -2/+72 | |
* | | | | | | | | Merge pull request #19335 from owncloud/phil-davis-view-typos | Thomas Müller | 2015-09-24 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Comment typos in tests/lib/files/view.php | Phil Davis | 2015-09-24 | 1 | -3/+3 | |
* | | | | | | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-apps | Thomas Müller | 2015-09-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Correctly check whether an app is shipped | Joas Schilling | 2015-09-24 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #19340 from owncloud/enc_fix_user_check | Thomas Müller | 2015-09-24 | 2 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | only check if the user exists if a user was added as parameter | Bjoern Schiessle | 2015-09-24 | 2 | -7/+11 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #19341 from owncloud/enc_all_improved_messages | Thomas Müller | 2015-09-24 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ |