summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Fix spinner positions in share tabVincent Petry2015-10-161-0/+1
* Fix DOM element ids in share dialogVincent Petry2015-10-165-119/+138
* Merge pull request #19631 from owncloud/share-emailsenterrorThomas Müller2015-10-144-13/+185
|\
| * Add unit tests for sending e-mail for link sharesRoeland Jago Douma2015-10-082-10/+170
| * Fix share email sending feedbackVincent Petry2015-10-082-3/+15
* | Merge pull request #19645 from owncloud/file-conflict-disablecontinueThomas Müller2015-10-141-0/+11
|\ \
| * | Check .conflicts for checkboxesMorris Jobke2015-10-081-1/+1
| * | Disable "Continue" button in conflict dialog when no selectionVincent Petry2015-10-081-0/+11
| |/
* | Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-linkThomas Müller2015-10-141-1/+1
|\ \
| * | refs #18241 Make the 'please reload this page' a clickable linkColin Hutchinson2015-10-101-1/+1
* | | [update] show default error message if empty messageMorris Jobke2015-10-141-0/+1
|/ /
* / Fix uploading avatar and root certs in IE8Vincent Petry2015-10-091-0/+1
|/
* Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-061-0/+1
|\
| * update licence headers via scriptMorris Jobke2015-10-051-0/+1
* | [admin] check for correct PHP memcached moduleMorris Jobke2015-10-062-6/+46
* | Merge pull request #19553 from owncloud/properly_format_date_shareviewThomas Müller2015-10-052-9/+11
|\ \
| * | Use DD-MM-YYYY consistently in share sidebarRoeland Jago Douma2015-10-042-9/+11
* | | Do not remove linkshare if there is noneRoeland Jago Douma2015-10-052-1/+42
| |/ |/|
* | Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorterThomas Müller2015-10-051-25/+43
|\ \ | |/ |/|
| * Fix filelist size issues, breadcrumb, multiselectVincent Petry2015-10-021-25/+43
* | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-022-24/+35
|\ \
| * | Updated some mimetypesRoeland Jago Douma2015-10-021-0/+1
| * | Allow recursive mimetype aliasesRobin McCorkell2015-10-021-1/+1
| * | Introduce a few new mimetypes for codeRobin McCorkell2015-10-021-23/+33
* | | Focus on share field after first displayVincent Petry2015-10-021-1/+8
|/ /
* | Merge pull request #19523 from owncloud/fix-seconds-agoThomas Müller2015-10-021-0/+4
|\ \
| * | Fix moment.js "a few seconds ago" with "seconds ago"Morris Jobke2015-10-021-0/+4
| |/
* / Make sure the conflict dialog is loaded before adding conflictsVincent Petry2015-10-021-4/+11
|/
* Merge pull request #19454 from owncloud/ie8-madness-returnsThomas Müller2015-09-301-0/+40
|\
| * [IE8] Fix filetype icon sizesVincent Petry2015-09-291-0/+40
* | Merge pull request #19443 from owncloud/sharedialog-passworderrorThomas Müller2015-09-301-3/+19
|\ \
| * | Fix share link password errorVincent Petry2015-09-291-3/+19
| |/
* / Use Hermite resampling for comparator canvas previewsOlivier Paroz2015-09-291-8/+85
|/
* Merge pull request #19418 from owncloud/fix-parsehashqueryThomas Müller2015-09-291-3/+1
|\
| * Consider both hash params and query when parsing URLVincent Petry2015-09-281-3/+1
* | Show loading spinner for first fetch of sharesVincent Petry2015-09-282-5/+28
|/
* Merge pull request #19363 from owncloud/checkboxes-sidebarThomas Müller2015-09-283-10/+10
|\
| * restyle checkboxes in sidebarHendrik Leppelsack2015-09-253-10/+10
* | fix sidebar spinnerHendrik Leppelsack2015-09-251-3/+5
|/
* fix multiselectHendrik Leppelsack2015-09-251-0/+3
* 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
|/ /
* | 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