summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix SVG iconsLukas Reschke2014-10-162-3/+14
| | | | | | | | | | | | FIXME: Ugly hack to prevent SVG of being returned if the SVG provider is not enabled. This is required because the preview system is designed in a bad way and relies on opt-in with asterisks (i.e. image/*) which will lead to the fact that a SVG will also match the image provider. Conflicts: lib/private/preview.php
* Merge pull request #11595 from owncloud/make_get_display_name_more_robustblizzz2014-10-162-2/+58
|\ | | | | strip whitespace from the beginning and end of the display name
| * strip whitespace from the beginning and end of the display name to avoid ↵Bjoern Schiessle2014-10-152-2/+58
| | | | | | | | empty display names
* | Merge pull request #11524 from nazar-pc/patch-1Vincent Petry2014-10-163-8/+11
|\ \ | | | | | | Page size calculation based on real page height
| * | Changed fileList.pageSize to function callNazar Mokrynskyi2014-10-151-1/+1
| | |
| * | TypoNazar Mokrynskyi2014-10-151-1/+1
| | |
| * | Even better - usage of this.$container instead of this.$el.parent()Nazar Mokrynskyi2014-10-151-1/+1
| | |
| * | Stub for pageSize, because now it is dynamically calculatedNazar Mokrynskyi2014-10-151-2/+3
| | |
| * | this.$el is not the same as $('#app-content')Nazar Mokrynskyi2014-10-151-1/+1
| | | | | | | | | That is why we use `this.$el.parent()` instead
| * | Use function call for FileList.pageSizeNazar Mokrynskyi2014-10-151-1/+1
| | |
| * | Use this.$el instead of the absolute selectorNazar Mokrynskyi2014-10-151-1/+1
| | |
| * | Page size calculation based on real page heightNazar Mokrynskyi2014-10-111-4/+6
| | | | | | | | | | | | | | | | | | This is fix for https://github.com/owncloud/core/issues/10060 Instead of hard coding page size as 20 items, we check real page height, and divide by 50 (height of one row). This will allow to load fewer items on small screens and enough items on large screens (4k, portrait orientation, etc.). Also checking page height on every load to respond on browser window resizing,
* | | make trashbin compatible with objectstore, replace glob with search in ↵Jörn Friedrich Dreyer2014-10-162-5/+23
| | | | | | | | | | | | cache, make unknown free space work like unlimited free space
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1688-1453/+776
| | |
* | | Merge pull request #11570 from owncloud/backport-11408-masterLukas Reschke2014-10-159-207/+532
|\ \ \ | | | | | | | | Backport 11408 master
| * | | fixing typosThomas Müller2014-10-142-1/+2
| | | |
| * | | Refactor MailSettings controllerLukas Reschke2014-10-149-207/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not store the password (fixes https://github.com/owncloud/core/issues/11385) - Refactor to AppFramework - Add unit tests Conflicts: settings/admin/controller.php
* | | | Merge pull request #11565 from owncloud/fix-behaviourOnOSXLukas Reschke2014-10-151-1/+1
|\ \ \ \ | | | | | | | | | | Add darwin to if block
| * | | | Add darwin to if blockLukas Reschke2014-10-141-1/+1
| |/ / / | | | | | | | | | | | | Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
* | | | Merge pull request #11528 from owncloud/use-raw-urlLukas Reschke2014-10-153-3/+7
|\ \ \ \ | | | | | | | | | | Use `rawurlencode` since this seems to be expected by cURL
| * | | | Use `rawurlencode` since this seems to be expected by cURLLukas Reschke2014-10-143-3/+7
| |/ / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
* | | | Merge pull request #11596 from ↵Jörn Friedrich Dreyer2014-10-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/in_cli_mode_return_true_for_ishtaccessworking in cli mode return true for isHtaccessWorking
| * | | | in cli mode return true for isHtaccessWorkingJörn Friedrich Dreyer2014-10-151-1/+1
|/ / / /
* | | | Merge pull request #10426 from owncloud/enhanced-apps-managementJan-Christoph Borchardt2014-10-1534-504/+1135
|\ \ \ \ | | | | | | | | | | Enhanced apps management
| * | | | introduce new app page layoutThomas Müller2014-10-1534-504/+1135
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter installed and not-installed apps properly kill unneeded file load category 'Installed' on page load adding documentation links new apps mgmt: first style adjustment apps mgmt: only show license and preview if they exist adding buttons new apps mgmt: fix for mobile use app icon if available new apps mgmt: position enable/disable toggle to the right new apps mgmt: proper display of icons or previews new apps mgmt: fix loading spinner reenable group selection for apps new apps mgmt: position enable button normally again new apps mgmt: clarify wording from 'Installed' to 'Enabled' reintroduce enable/disable Move rating image path generation to client-side Move expression outside of l10n fix group handling add buttons for 'More apps' and 'Add your app' again disable changed date of app for now adding recommended label style 'Recommended' app tag fixing php warning sort by rating adding meta-category 'Recommended' Only show existing documentation links lacy loading of screenshots making group based app activation work again adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg' adding app.svg for all core apps query string '?installed' is not longer needed update and uninstall is back + error feedback remove unneeded parameter fix alignment of 'recommended' label
* | | | Merge pull request #11538 from owncloud/webdav-creatable-infoVincent Petry2014-10-151-1/+1
|\ \ \ \ | |_|_|/ |/| | | Use the cached fileinfo to get creatable permissions
| * | | Use the cached fileinfo to get creatable permissionsRobin Appelman2014-10-131-1/+1
| | | |
* | | | Merge pull request #11541 from owncloud/usersession-activeuser-setsessionVincent Petry2014-10-152-44/+75
|\ \ \ \ | | | | | | | | | | Unset the cached active user when using a different session object
| * | | | Add unit testRobin Appelman2014-10-131-33/+63
| | | | |
| * | | | Unset the cached active user when using a different session objectRobin Appelman2014-10-131-11/+12
| |/ / /
* | | | Merge pull request #11548 from owncloud/extstorage-ocfieldsVincent Petry2014-10-153-2/+93
|\ \ \ \ | | | | | | | | | | Allow specifying protocol in ext storage OC config
| * | | | Allow specifying protocol in ext storage OC configVincent Petry2014-10-133-2/+93
| |/ / / | | | | | | | | | | | | | | | | | | | | Allow specifying a protocol in the host field when mounting another ownCloud instance. Note that this was already possible with the WebDAV config but this bug made it inconsistent.
* | | | Merge pull request #11590 from owncloud/publiclinkscrollanimatefixVincent Petry2014-10-151-1/+7
|\ \ \ \ | | | | | | | | | | Use body element when animating scroll in public page
| * | | | Use body element when animating scroll in public pageVincent Petry2014-10-151-1/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | In the public page the scroll container is the window instead of a div. The $(window) object doesn't support animating the scroll property, so the $('body') element is used instead.
* | / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-1512-12/+12
| |/ / |/| |
* | | Merge pull request #11556 from owncloud/cache-js-and-cssJörn Friedrich Dreyer2014-10-141-0/+5
|\ \ \ | | | | | | | | adding cache control headers for css and js - fixes #11496
| * | | adding cache control headers for css and js - fixes #11496Thomas Müller2014-10-141-0/+5
| | | |
* | | | Merge pull request #11534 from owncloud/issue/11500Vincent Petry2014-10-143-1/+12
|\ \ \ \ | | | | | | | | | | Issue/11500 Do not set overwrite* settings by default
| * | | | Set overwritemailurl* configs on setupJoas Schilling2014-10-143-1/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly use overwritemailurl value when generating absolute urls in CLI Fix #11500 Rename the config to *cli Add overwrite.cli.url to the sample config Revert separator fix, fixes unit test
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-1416-63/+70
|/ / /
* | | Merge pull request #11543 from owncloud/closeSessionForAppsLoadingThomas Müller2014-10-131-0/+1
|\ \ \ | | | | | | | | Close session when loading apps
| * | | Close session when loading appsLukas Reschke2014-10-131-0/+1
| | | | | | | | | | | | | | | | Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
* | | | Merge pull request #11546 from owncloud/users-deletewithfilecacheVincent Petry2014-10-131-1/+1
|\ \ \ \ | | | | | | | | | | Retrieve storage numeric id earlier when still available
| * | | | Retrieve storage numeric id earlier when still availableVincent Petry2014-10-131-1/+1
| | |/ / | |/| | | | | | | | | | | | | | The numeric id is only available before the storage entry is deleted, so get it at that time.
* | | | Merge pull request #11542 from owncloud/fix_failing_unit_testsBjörn Schießle2014-10-131-2/+3
|\ \ \ \ | | | | | | | | | | distinguish between file dependent shares and other shares
| * | | | distinguish between file dependent shares and other sharesBjoern Schiessle2014-10-131-2/+3
| |/ / /
* | | | Merge pull request #11537 from owncloud/filenamewithzeroesVincent Petry2014-10-131-1/+1
|\ \ \ \ | |/ / / |/| | | Fixed array detection on public download
| * | | Fixed array detection on public downloadVincent Petry2014-10-131-1/+1
|/ / / | | | | | | | | | | | | When downloading a folder called "0001" PHP should fallback to parsing it as string and properly detect that it is not a JSON array.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1315-15/+15
| | |
* | | Merge pull request #11367 from owncloud/removeIsMimeSupportedLukas Reschke2014-10-121-3/+1
|\ \ \ | | | | | | | | Remove uneeded slicing of element
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 18:23:51 +0000