aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder'Morris Jobke2015-01-071-5/+5
|\
| * smb: rename textfield from root to subfolderMartin2015-01-071-5/+5
|/ | | | | | "root" or "subfolder" -> "Remote subfolder" on selected storages missed ftp...
* Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-073-6/+38
|\ | | | | don't delete share table entries for the unique name if re-share permission was removed
| * shareType and permissions are integersBjoern Schiessle2015-01-071-2/+2
| |
| * don't delete share table entries for the unique name if re-share permission ↵Bjoern Schiessle2015-01-072-4/+36
| | | | | | | | was removed
* | Merge pull request #13150 from owncloud/fix-sharing-activity-extensionMorris Jobke2015-01-071-5/+3
|\ \ | | | | | | Correctly return false when translating a foreign activity
| * | Correctly return false when translating a foreign activityJoas Schilling2015-01-071-5/+3
|/ /
* | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-075-17/+45
|\ \ | | | | | | Auto escape t placeholders
| * | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-075-17/+45
| | | | | | | | | | | | | | | | | | | | | * add disableEscape parameter to disable this functionality * drop usage of escapeHTML() that is now done inside t() * add unit test for escaped and not escaped placeholder * proper JSDoc
* | | Merge pull request #13140 from owncloud/issue/13139-provisioning-api-testsMorris Jobke2015-01-074-310/+286
|\ \ \ | | | | | | | | Extend Test\TestCase and do not use uniqid()
| * | | Extend Test\TestCase and do not use uniqid()Joas Schilling2015-01-074-310/+286
| | | |
* | | | Merge pull request #13138 from ↵Lukas Reschke2015-01-072-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue/13134-incorrect-admin-warning-overwrite-cli-url Fix incorrect warning about setting the overwrite.cli.url
| * | | | Fix incorrect warning about setting the overwrite.cli.urlJoas Schilling2015-01-072-6/+6
| | | | |
* | | | | Merge pull request #13132 from aptivate/improve_debug_logging_messagesMorris Jobke2015-01-072-9/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Improve debugging for ServiceUnavailable exceptions
| * | | | Improve debugging for ServiceUnavailable exceptionsChris Wilson2015-01-062-9/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was getting a lot of these in my logs for no apparent reason, and file uploads were failing: {"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"} In order to debug it, I had to add unique messages to all the places where this exception was thrown, to identify which one it was, and that made the logs much more useful: {"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
* | | | Merge pull request #13063 from AdamWill/assets-relocateThomas Müller2015-01-074-7/+19
|\ \ \ \ | |_|/ / |/| | | allow css/js asset directory to be relocated ('assetdirectory')
| * | | allow css/js asset directory to be relocated (#13053)Adam Williamson2015-01-054-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the directory where CSS/JS asset collections are written to be changed, in case SERVERROOT is not writeable. Note it does *not* allow the expected URL to be changed: whatever directory is used, the server must be configured to serve it at WEBROOT/assets. It may be possible to add another config parameter to allow the admin to specify a custom asset URL, but I thought I'd keep the first implementation simple.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-07264-70/+338
| | | |
* | | | Merge pull request #13131 from owncloud/db-connect-stacktraceMorris Jobke2015-01-071-0/+10
|\ \ \ \ | | | | | | | | | | Prevent leaking db connection info in the stacktrace
| * | | | Prevent leaking db connection info in the stacktraceRobin Appelman2015-01-061-0/+10
| | |/ / | |/| |
* | | | Merge pull request #13126 from owncloud/update-jquery-strengthifyThomas Müller2015-01-063-51/+53
|\ \ \ \ | | | | | | | | | | Update jquery strengthify
| * | | | bower update for jquery.strengthify 0.4.1Morris Jobke2015-01-062-50/+52
| | | | |
| * | | | bump jquery.strengthify to 0.4.1Morris Jobke2015-01-061-1/+1
| | | | |
* | | | | Merge pull request #13129 from owncloud/group-select-fix-autocompleteRobin Appelman2015-01-061-16/+12
|\ \ \ \ \ | | | | | | | | | | | | Fix group select autocomplete
| * | | | | Fix group select autocompleteRobin Appelman2015-01-061-16/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #13130 from owncloud/getstoragestats-error-handlingLukas Reschke2015-01-062-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Add error handling to getstoragestats.php
| * | | | | Add error handling to getstoragestats.phpRobin Appelman2015-01-062-1/+8
| |/ / / /
* | | | | Merge pull request #13128 from owncloud/files-scan-pathThomas Müller2015-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix check if a path argument is passed to occ files:scan
| * | | | | Fix check if a path argument is passed to occ files:scanRobin Appelman2015-01-061-1/+1
| |/ / / /
* | | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-0626-289/+983
|\ \ \ \ \ | |/ / / / |/| | | | Full content width search results
| * | | | use cancelable timeout, on scroll only fetch next page if last query had any ↵Jörn Friedrich Dreyer2015-01-061-21/+25
| | | | | | | | | | | | | | | | | | | | results
| * | | | use class for no results div instead of id. the elements are not unique.Jörn Friedrich Dreyer2015-01-067-12/+12
| | | | |
| * | | | clear search when navigating via breadcrumbsJörn Friedrich Dreyer2015-01-061-0/+1
| | | | |
| * | | | correctly clear searchbox when switching filelistsJörn Friedrich Dreyer2015-01-052-0/+11
| | | | |
| * | | | fix onScroll breaking search, fix keyboard navigation, fix filter for files ↵Jörn Friedrich Dreyer2015-01-052-3/+8
| | | | | | | | | | | | | | | | | | | | in other dirs
| * | | | search with endless scrollingJörn Friedrich Dreyer2015-01-052-5/+7
| | | | |
| * | | | filter trashbin and share viewsJörn Friedrich Dreyer2015-01-056-8/+43
| | | | |
| * | | | pluralize translationJörn Friedrich Dreyer2015-01-021-2/+6
| | | | |
| * | | | delay hiding no results message until search is triggeredJörn Friedrich Dreyer2015-01-021-1/+4
| | | | |
| * | | | use correct spinnerJörn Friedrich Dreyer2015-01-021-1/+1
| | | | |
| * | | | clear search results when clicking the x in type=search input fieldJörn Friedrich Dreyer2015-01-021-0/+11
| | | | |
| * | | | use " to avoid escaping 'Jörn Friedrich Dreyer2015-01-021-1/+1
| | | | |
| * | | | text and icon fixesJörn Friedrich Dreyer2015-01-021-2/+2
| | | | |
| * | | | do not hide search results when clicking, but hide on ESCJörn Friedrich Dreyer2015-01-022-14/+14
| | | | |
| * | | | correctly update search results when query is changed, show spinner when ↵Jörn Friedrich Dreyer2015-01-024-113/+119
| | | | | | | | | | | | | | | | | | | | searching
| * | | | show no files found messageJörn Friedrich Dreyer2015-01-025-18/+51
| | | | |
| * | | | make OCA.Search.Files available in tests and for other appsJörn Friedrich Dreyer2015-01-022-1/+3
| | | | |
| * | | | add file summary filter spec testsJörn Friedrich Dreyer2015-01-021-0/+63
| | | | |
| * | | | Fix rendering search resultsRobin Appelman2015-01-021-6/+13
| | | | |
| * | | | fix countJörn Friedrich Dreyer2015-01-022-1/+4
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 16:18:08 +0000