Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix sidebar spinner | Hendrik Leppelsack | 2015-09-25 | 1 | -3/+5 |
| | |||||
* | Merge pull request #19360 from owncloud/move-filter-method-into-config-object | Thomas Müller | 2015-09-25 | 1 | -39/+4 |
|\ | | | | | Move the filtering of sensitive data to the config class | ||||
| * | Move the filtering of sensitive data to the config class | Joas Schilling | 2015-09-25 | 1 | -39/+4 |
| | | |||||
* | | Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email | Thomas Müller | 2015-09-25 | 1 | -0/+31 |
|\ \ | |/ |/| | 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 | 1 | -0/+31 |
| | | |||||
* | | fix multiselect | Hendrik Leppelsack | 2015-09-25 | 1 | -0/+3 |
| | | |||||
* | | fix login | Hendrik Leppelsack | 2015-09-25 | 2 | -3/+3 |
| | | |||||
* | | add .checkbox class for new checkbox style | Hendrik Leppelsack | 2015-09-25 | 2 | -14/+11 |
| | | |||||
* | | 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 | 2 | -2/+67 |
|\ \ | | | | | | | [App Code Check] add check for version and mandatory fields | ||||
| * | | encode arrays as string | Morris Jobke | 2015-09-24 | 1 | -3/+0 |
| | | | |||||
| * | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 2 | -2/+70 |
| | | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions | ||||
* | | | Merge pull request #18517 from owncloud/17753_to_master | Thomas Müller | 2015-09-24 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix preview of old file on public upload conflicts | ||||
| * | | | Fix preview of old file on public upload conflicts | Olivier Paroz | 2015-09-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | Fix ShareItemModel.hasUserShares to only check shares of current item | Vincent Petry | 2015-09-23 | 2 | -2/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shares array is based on what the server returns and can contain share info for parent folders. hasUserShares is now fixed to ignore parent folders and only checks for shares on the current item. | ||||
* | | | | | Expiration date was always a string | Vincent Petry | 2015-09-24 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Merge pull request #19328 from owncloud/update-shipped-apps-list | Thomas Müller | 2015-09-24 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Update the list of shipped apps | ||||
| * | | | | | Remove user_webdavauth which is now part of user_external | Joas Schilling | 2015-09-24 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Update the list of shipped apps | Joas Schilling | 2015-09-24 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #19292 from owncloud/close-icon | Thomas Müller | 2015-09-24 | 2 | -1/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | add slight shadow to close icon to make it visible on top of dark images | ||||
| * | | | | | add slight shadow to close icon to make it visible on top of dark images, ↵ | Jan-Christoph Borchardt | 2015-09-23 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | fix #19291 | ||||
* | | | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker | Thomas Müller | 2015-09-24 | 1 | -0/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Implement the autocomplete blocker from #18341 into the OCS endpoint | ||||
| * | | | | | Add option to disable autocomplete in share dialog | Morris Jobke | 2015-09-23 | 1 | -0/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | fix wording of other search results to 'in other folders' | Jan-Christoph Borchardt | 2015-09-23 | 1 | -2/+2 |
| |/ / / |/| | | | |||||
* | | | | display checkboxes in ie8 | Hendrik Leppelsack | 2015-09-23 | 1 | -0/+5 |
|/ / / | |||||
* | | | Fix parsing int attributes from share.php response | Vincent Petry | 2015-09-23 | 2 | -7/+70 |
| | | | | | | | | | | | | | | | | | | | | | Sometimes the attributes returned by share.php are integers but packaged as strings. This fix makes sure that such attributes are parsed as integers | ||||
* | | | Merge pull request #19220 from individual-it/fix_19164 | Thomas Müller | 2015-09-23 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | re initialize OC.Share.currentShares OC.Share.itemShares | ||||
| * | | | re initialize OC.Share.currentShares OC.Share.itemShares | Individual IT Services | 2015-09-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | otherwise old values are kept. fix for #19164 | ||||
* | | | | Merge pull request #19279 from owncloud/share-fixbogusentry | Thomas Müller | 2015-09-23 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Fix bogus entry that appears when switching with arrow keys | ||||
| * | | | | Fix bogus entry that appears when switching with arrow keys | Vincent Petry | 2015-09-22 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | implement builder pattern in tipsy shim | Hendrik Leppelsack | 2015-09-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | add style for disabled checkboxes | Hendrik Leppelsack | 2015-09-22 | 1 | -0/+2 |
| | | | | |||||
* | | | | left align checkboxes in group dropdown | Hendrik Leppelsack | 2015-09-22 | 1 | -3/+2 |
| | | | | |||||
* | | | | Update mimetypes | Lukas Reschke | 2015-09-22 | 1 | -34/+23 |
|/ / / | |||||
* | | | improve description and help output for the encrypt-all and decrypt-all command | Bjoern Schiessle | 2015-09-21 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #18709 from owncloud/cleanup-login-semantics | Thomas Müller | 2015-09-21 | 2 | -5/+4 |
|\ \ \ | | | | | | | | | Pushes input inside the bottom group - login. | ||||
| * | | | Squashing all commits in one, remove typos. | Raghu Nayyar | 2015-09-12 | 2 | -5/+4 |
| | | | | |||||
* | | | | fix missing checkboxes in file comparator | Hendrik Leppelsack | 2015-09-21 | 2 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typo | Thomas Müller | 2015-09-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Typo | ||||
| * | | | | Typo | Olivier Paroz | 2015-09-19 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #19148 from ↵ | Thomas Müller | 2015-09-21 | 2 | -7/+35 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | owncloud/issue-19113-stop-setting-single-user-in-constructor Do not set single user in constructor of encryption occ commands | ||||
| * | | | Also catch exceptions on encryptAll and reset trashbin and singleUser mode | Joas Schilling | 2015-09-18 | 1 | -2/+7 |
| | | | | |||||
| * | | | Do not set single user in constructor | Joas Schilling | 2015-09-18 | 2 | -5/+28 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-20 | 2 | -0/+4 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-19 | 2 | -0/+4 |
| | | | |||||
* | | | Merge pull request #19008 from owncloud/jquery_avatar_tests | Thomas Müller | 2015-09-18 | 2 | -1/+241 |
|\ \ \ | |/ / |/| | | JS tests for jquery.avatar | ||||
| * | | Added js tests for jquery.avatar | Roeland Jago Douma | 2015-09-14 | 2 | -1/+241 |
| | | | | | | | | | | | | * Ceil avatar request size | ||||
* | | | Merge pull request #19126 from owncloud/fix-19117 | Thomas Müller | 2015-09-18 | 1 | -6/+12 |
|\ \ \ | | | | | | | | | Fix missing checkboxes in share dialog | ||||
| * | | | fix missing checkboxes in share dialog | Hendrik Leppelsack | 2015-09-17 | 1 | -6/+12 |
| | | | |