summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-241-2/+2
|\
| * Fix preview of old file on public upload conflictsOlivier Paroz2015-09-201-2/+2
* | Merge pull request #19305 from owncloud/share-hasusersharesThomas Müller2015-09-242-2/+72
|\ \
| * | Fix ShareItemModel.hasUserShares to only check shares of current itemVincent Petry2015-09-232-2/+72
* | | Expiration date was always a stringVincent Petry2015-09-242-5/+5
* | | Merge pull request #19328 from owncloud/update-shipped-apps-listThomas Müller2015-09-241-2/+2
|\ \ \
| * | | 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 #19292 from owncloud/close-iconThomas Müller2015-09-242-1/+8
|\ \ \ \
| * | | | add slight shadow to close icon to make it visible on top of dark images, fix...Jan-Christoph Borchardt2015-09-232-1/+8
* | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blockerThomas Müller2015-09-241-0/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add option to disable autocomplete in share dialogMorris Jobke2015-09-231-0/+10
| | |/ / | |/| |
* | | | fix wording of other search results to 'in other folders'Jan-Christoph Borchardt2015-09-231-2/+2
| |/ / |/| |
* | | display checkboxes in ie8Hendrik Leppelsack2015-09-231-0/+5
|/ /
* | Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
* | Merge pull request #19220 from individual-it/fix_19164Thomas Müller2015-09-231-0/+2
|\ \
| * | re initialize OC.Share.currentShares OC.Share.itemShares Individual IT Services2015-09-211-0/+2
* | | Merge pull request #19279 from owncloud/share-fixbogusentryThomas Müller2015-09-231-0/+3
|\ \ \
| * | | Fix bogus entry that appears when switching with arrow keysVincent Petry2015-09-221-0/+3
* | | | implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
* | | | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
* | | | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
* | | | Update mimetypesLukas Reschke2015-09-221-34/+23
|/ / /
* | | improve description and help output for the encrypt-all and decrypt-all commandBjoern Schiessle2015-09-212-2/+4
* | | Merge pull request #18709 from owncloud/cleanup-login-semanticsThomas Müller2015-09-212-5/+4
|\ \ \
| * | | Squashing all commits in one, remove typos.Raghu Nayyar2015-09-122-5/+4
* | | | fix missing checkboxes in file comparatorHendrik Leppelsack2015-09-212-0/+7
* | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typoThomas Müller2015-09-211-1/+1
|\ \ \ \
| * | | | TypoOlivier Paroz2015-09-191-1/+1
| | |/ / | |/| |
* | | | Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-...Thomas Müller2015-09-212-7/+35
|\ \ \ \ | |_|_|/ |/| | |
| * | | Also catch exceptions on encryptAll and reset trashbin and singleUser modeJoas Schilling2015-09-181-2/+7
| * | | Do not set single user in constructorJoas Schilling2015-09-182-5/+28
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-202-0/+4
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-192-0/+4
* | | Merge pull request #19008 from owncloud/jquery_avatar_testsThomas Müller2015-09-182-1/+241
|\ \ \ | |/ / |/| |
| * | Added js tests for jquery.avatarRoeland Jago Douma2015-09-142-1/+241
* | | Merge pull request #19126 from owncloud/fix-19117Thomas Müller2015-09-181-6/+12
|\ \ \
| * | | fix missing checkboxes in share dialogHendrik Leppelsack2015-09-171-6/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-1810-0/+20
* | | | Merge pull request #19121 from owncloud/sidebar-design-detailsThomas Müller2015-09-171-13/+3
|\ \ \ \
| * | | | fix sidebar Sharing layout a bitJan-Christoph Borchardt2015-09-171-13/+3
| |/ / /
* | | | Fix the singleuser config casing in new encryption codeJoas Schilling2015-09-172-6/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-17152-2314/+1978
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-1754-0/+70
* | | | Merge pull request #17998 from owncloud/highres_avatarThomas Müller2015-09-161-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use srcset to select best avatar sizeRoeland Jago Douma2015-09-141-2/+4
| |/ /
* | | Merge pull request #18692 from fuhaoshih/patch-2Thomas Müller2015-09-161-0/+1
|\ \ \
| * | | Update apps.cssfuhaoshih2015-08-311-0/+1
* | | | Merge pull request #19048 from owncloud/details-iconThomas Müller2015-09-163-0/+8
|\ \ \ \
| * | | | add details iconJan-Christoph Borchardt2015-09-153-0/+8