summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | adjust the height of the sidebar preview image when resizing the browserRobin Appelman2015-09-232-5/+9
* | | | | | | 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-245-49/+425
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Do not allow user enumeration if the config is disabledJoas Schilling2015-09-232-49/+409
| * | | | | | | Add option to disable autocomplete in share dialogMorris Jobke2015-09-233-0/+16
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19163 from owncloud/search-elsewhere-wordingJan-Christoph Borchardt2015-09-231-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix wording of other search results to 'in other folders'Jan-Christoph Borchardt2015-09-231-2/+2
|/ / / / / /
* | | | | | Merge pull request #19301 from owncloud/ie8-checkboxesHendrik Leppelsack2015-09-231-0/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | display checkboxes in ie8Hendrik Leppelsack2015-09-231-0/+5
|/ / / / /
* | | | | Merge pull request #19139 from owncloud/ext-revert-permissionsThomas Müller2015-09-2319-243/+253
|\ \ \ \ \
| * | | | | Mark SMB_OC and SFTP_Key as deprecated backendsRobin McCorkell2015-09-232-4/+8
| * | | | | Hide deprecated backends in external storage GUIRobin McCorkell2015-09-232-3/+19
| * | | | | Add deprecation mechanic to IdentifierTraitRobin McCorkell2015-09-233-0/+37
| * | | | | Revert "Implement more fine-grained external storage permissions model"Robin McCorkell2015-09-2317-237/+190
| | |/ / / | |/| | |
* | | | | Merge pull request #19308 from owncloud/fix-titleMorris Jobke2015-09-232-3/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Show 'Apps' in the browser title when app management is openThomas Müller2015-09-232-3/+8
|/ / / /
* | | | Revert "use correct variable"Jörn Friedrich Dreyer2015-09-231-1/+1
* | | | Merge pull request #19295 from owncloud/share-fixintparsingThomas Müller2015-09-232-7/+70
|\ \ \ \
| * | | | Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
| |/ / /
* / / / use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
|/ / /
* | | Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\ \ \
| * \ \ Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-233-13/+28
| |\ \ \
| * | | | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
* | | | | 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 #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-2310-12/+12
|\ \ \ \ \ \
| * | | | | | Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI...Martin2015-09-2210-12/+12
* | | | | | | Merge pull request #19277 from owncloud/files-plusbuttonfixThomas Müller2015-09-231-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Only render the plus button when it makes senseVincent Petry2015-09-221-3/+4
* | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-232-42/+98
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | catch excexptions during the copy operation and make sure that we free the lo...Bjoern Schiessle2015-09-222-42/+98
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_fil...Thomas Müller2015-09-231-12/+24
|\ \ \ \ \ \ \
| * | | | | | | reduce amount of db calls needed for file-locksIndividual IT Services2015-09-221-12/+24
| |/ / / / / /
* | | | | | | Merge pull request #19169 from owncloud/3rdpartyhintThomas Müller2015-09-231-1/+3
|\ \ \ \ \ \ \
| * | | | | | | add example for 3rdparty configurationCarla Schroder2015-09-231-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19285 from owncloud/fix-strengthify-tipsyThomas Müller2015-09-231-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
|/ / / / / /
* | | | | | Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandcoThomas Müller2015-09-222-3/+3
|\ \ \ \ \ \
| * | | | | | Properly show sidebar for trash and sharing sectionsVincent Petry2015-09-222-3/+3
* | | | | | | Merge pull request #19282 from owncloud/disabled-checkboxesHendrik Leppelsack2015-09-221-0/+2
|\ \ \ \ \ \ \
| * | | | | | | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #19275 from owncloud/fix-19158Hendrik Leppelsack2015-09-221-3/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
|/ / / / / /
* | | | | | Merge pull request #18893 from owncloud/move-static-dataLukas Reschke2015-09-2210-90/+87
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update mimetypesLukas Reschke2015-09-221-34/+23
| * | | | | Move mimetype files into /resources/config/Lukas Reschke2015-09-225-47/+62
| * | | | | Move certificate bundle into resources/config/Lukas Reschke2015-09-224-9/+2
|/ / / / /