summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* restyle checkboxes in sidebarHendrik Leppelsack2015-09-253-10/+10
|
* 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
| |
| * fix loginHendrik Leppelsack2015-09-252-3/+3
| |
| * fix filecomparatorHendrik Leppelsack2015-09-251-2/+2
| |
| * fix filelist checkboxesHendrik Leppelsack2015-09-253-4/+4
| |
| * add .checkbox class for new checkbox styleHendrik Leppelsack2015-09-252-14/+11
|/
* Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-244-1/+49
|\ | | | | fix issue with version rollback and thumbnails
| * delete cached preview when rolling back file's versionGeorg Ehrke2015-09-204-1/+49
| | | | | | | | | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called
* | Merge pull request #19349 from owncloud/revert-18692-patch-2Lukas Reschke2015-09-241-1/+0
|\ \ | | | | | | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"
| * | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"Jan-Christoph Borchardt2015-09-241-1/+0
|/ /
* | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-2413-2/+340
|\ \ | | | | | | [App Code Check] add check for version and mandatory fields
| * | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| | |
| * | encode arrays as stringMorris Jobke2015-09-242-4/+6
| | |
| * | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-2413-2/+338
| | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions
* | | Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-242-13/+15
|\ \ \ | | | | | | | | Fix preview of old file on public upload conflicts
| * | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-202-13/+15
| | |/ | |/|
* | | Merge pull request #18834 from owncloud/delay-listen-owner-changesThomas Müller2015-09-242-2/+22
|\ \ \ | | | | | | | | Delay listening to owner changes untill we use a share for that owner
| * | | only initialize onceRobin Appelman2015-09-231-0/+6
| | | |
| * | | Delay listening to owner changes untill we use a share for that ownerRobin Appelman2015-09-232-2/+16
| | | |
* | | | Merge pull request #19305 from owncloud/share-hasusersharesThomas Müller2015-09-242-2/+72
|\ \ \ \ | | | | | | | | | | Fix ShareItemModel.hasUserShares to only check shares of current item
| * | | | Fix ShareItemModel.hasUserShares to only check shares of current itemVincent Petry2015-09-232-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.
* | | | | Merge pull request #19335 from owncloud/phil-davis-view-typosThomas Müller2015-09-241-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Comment typos in tests/lib/files/view.php
| * | | | | Comment typos in tests/lib/files/view.phpPhil Davis2015-09-241-3/+3
| | | | | | | | | | | | | | | | | | Correct a comment typo just introduced at line 892, plus another and some white space at EOL.
* | | | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-appsThomas Müller2015-09-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correctly check whether an app is shipped
| * | | | | | Correctly check whether an app is shippedJoas Schilling2015-09-241-1/+1
| | | | | | |
* | | | | | | Merge pull request #19340 from owncloud/enc_fix_user_checkThomas Müller2015-09-242-7/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | only check if the user exists if a user was added as parameter
| * | | | | | | only check if the user exists if a user was added as parameterBjoern Schiessle2015-09-242-7/+11
| |/ / / / / /
* | | | | | | Merge pull request #19341 from owncloud/enc_all_improved_messagesThomas Müller2015-09-241-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | no need to list users if all users already had a key-pair
| * | | | | | | no need to list users if all users already had a key-pairBjoern Schiessle2015-09-241-0/+6
| |/ / / / / /
* | | | | | | Merge pull request #19342 from owncloud/fix-15836Thomas Müller2015-09-242-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | LDAP Wizard: enable/disable test login name button depending on wheth…
| * | | | | | | LDAP Wizard: enable/disable test login name button depending on whether a ↵Arthur Schiwon2015-09-242-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | login name is provided or not
* | | | | | | | Merge pull request #19339 from owncloud/share-expirationisstringThomas Müller2015-09-242-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Expiration date was always a string
| * | | | | | | Expiration date was always a stringVincent Petry2015-09-242-5/+5
| |/ / / / / /
* | | | | | | Merge pull request #19248 from ↵Thomas Müller2015-09-243-1/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/allow-status-code-403-and-503-for-listeners Convert exceptions to SabreExceptions for the HTTP status code
| * | | | | | Add since-tagJoas Schilling2015-09-232-0/+14
| | | | | | |
| * | | | | | Allow listeners to set status code and messageJoas Schilling2015-09-233-1/+120
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19303 from owncloud/usecorrectvariableThomas Müller2015-09-242-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use correct variable
| * | | | | | add is* storage testsJörn Friedrich Dreyer2015-09-231-0/+25
| | | | | | |
| * | | | | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | wow ... just wow ...
* | | | | | Merge pull request #19313 from owncloud/ext-validate-mountThomas Müller2015-09-2415-40/+143
|\ \ \ \ \ \ | | | | | | | | | | | | | | Validate storage backend and auth mechanism before mounting
| * | | | | | Unit tests for storage validation in serviceRobin McCorkell2015-09-232-0/+56
| | | | | | |
| * | | | | | Perform visibility checks on storagesRobin McCorkell2015-09-2314-40/+87
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StoragesService::getStorages() will check the visibility of the backend and auth mechanism for the storage, and if either are not visible to the user (aka disabled by admin) then the storage will be filtered out. The original method StoragesService::getAllStorages() still exists in case such storages need to be detected, but its use is discouraged.
* | | | | | Merge pull request #19328 from owncloud/update-shipped-apps-listThomas Müller2015-09-241-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Update the list of shipped apps
| * | | | | Remove user_webdavauth which is now part of user_externalJoas Schilling2015-09-241-1/+0
| | | | | |
| * | | | | Update the list of shipped appsJoas Schilling2015-09-241-1/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-nullThomas Müller2015-09-242-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
| * | | | | Allow `set('column', 'null')` to work like in DoctrineJoas Schilling2015-09-242-1/+5
| | | | | |
* | | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatchesThomas Müller2015-09-242-29/+107
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Prevent wrong matches in getRelativePath
| * | | | | Add more tests for relativePathJoas Schilling2015-09-221-23/+91
| | | | | |