wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20799 commits 157 branches 562 tags 714 MiB
Commit graph

20799 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
756f64d728 Merge pull request #11595 from owncloud/make_get_display_name_more_robust 
strip whitespace from the beginning and end of the display name
 2014-10-16 11:33:12 +02:00
Vincent Petry
08582d145c Merge pull request #11524 from nazar-pc/patch-1 
Page size calculation based on real page height
 2014-10-16 11:21:49 +02:00
Jörn Friedrich Dreyer
0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Lukas Reschke
f48c973876 Merge pull request #11570 from owncloud/backport-11408-master 
Backport 11408 master
 2014-10-15 21:21:45 +02:00
Lukas Reschke
63e0599218 Merge pull request #11565 from owncloud/fix-behaviourOnOSX 
Add darwin to if block
 2014-10-15 21:12:50 +02:00
Lukas Reschke
f82b996f57 Merge pull request #11528 from owncloud/use-raw-url 
Use `rawurlencode` since this seems to be expected by cURL
 2014-10-15 19:58:27 +02:00
Nazar Mokrynskyi
8198e70f24 Changed fileList.pageSize to function call 2014-10-15 19:18:35 +02:00
Nazar Mokrynskyi
63145f5765 Typo 2014-10-15 19:17:21 +02:00
Jörn Friedrich Dreyer
7c40261ca9 Merge pull request #11596 from owncloud/in_cli_mode_return_true_for_ishtaccessworking 
in cli mode return true for isHtaccessWorking
 2014-10-15 18:43:12 +02:00
Jörn Friedrich Dreyer
c27fd94ec8 in cli mode return true for isHtaccessWorking 2014-10-15 16:59:28 +02:00
Jan-Christoph Borchardt
b4efd83f2b Merge pull request #10426 from owncloud/enhanced-apps-management 
Enhanced apps management
 2014-10-15 16:26:53 +02:00
Nazar Mokrynskyi
da27797e8d Even better - usage of this.$container instead of this.$el.parent() 2014-10-15 15:24:03 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
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
 2014-10-15 15:21:40 +02:00
Nazar Mokrynskyi
5033fc4e52 Stub for pageSize, because now it is dynamically calculated 2014-10-15 15:09:01 +02:00
Nazar Mokrynskyi
9de874f015 this.$el is not the same as $('#app-content') 
That is why we use `this.$el.parent()` instead
 2014-10-15 15:06:35 +02:00
Nazar Mokrynskyi
33ada11a64 Use function call for FileList.pageSize 2014-10-15 14:55:24 +02:00
Bjoern Schiessle
239bff5766 strip whitespace from the beginning and end of the display name to avoid empty display names 2014-10-15 14:54:35 +02:00
Vincent Petry
6824a5ce7f Merge pull request #11538 from owncloud/webdav-creatable-info 
Use the cached fileinfo to get creatable permissions
 2014-10-15 14:39:07 +02:00
Nazar Mokrynskyi
6ec9c99d48 Use this.$el instead of the absolute selector 2014-10-15 14:16:17 +02:00
Vincent Petry
6fa03870e9 Merge pull request #11541 from owncloud/usersession-activeuser-setsession 
Unset the cached active user when using a different session object
 2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674 Merge pull request #11548 from owncloud/extstorage-ocfields 
Allow specifying protocol in ext storage OC config
 2014-10-15 13:27:23 +02:00
Vincent Petry
dd0b1e83b2 Merge pull request #11590 from owncloud/publiclinkscrollanimatefix 
Use body element when animating scroll in public page
 2014-10-15 10:52:29 +02:00
Vincent Petry
704ffaa6a3 Use body element when animating scroll in public page 
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.
 2014-10-15 10:14:20 +02:00
Jenkins for ownCloud
3b3affa1ef [tx-robot] updated from transifex 2014-10-15 01:54:26 -04:00
Thomas Müller
d3eebad591 fixing typos 2014-10-14 15:38:39 +02:00
Lukas Reschke
13b1b45ee4 Refactor MailSettings controller 
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests

Conflicts:
	settings/admin/controller.php
 2014-10-14 15:38:34 +02:00
Lukas Reschke
1b3feb710d Use rawurlencode since this seems to be expected by cURL 
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
 2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc Add darwin to if block 
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.
 2014-10-14 12:58:00 +02:00
Jörn Friedrich Dreyer
766314a6be Merge pull request #11556 from owncloud/cache-js-and-css 
adding cache control headers for css and js - fixes #11496
 2014-10-14 10:41:10 +02:00
Vincent Petry
c2cfeea888 Merge pull request #11534 from owncloud/issue/11500 
Issue/11500 Do not set overwrite* settings by default
 2014-10-14 09:16:31 +02:00
Jenkins for ownCloud
526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Thomas Müller
4b5c7d3d9d adding cache control headers for css and js - fixes #11496 2014-10-14 06:36:53 +02:00
Joas Schilling
0407bc0978 Set overwritemailurl* configs on setup 
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
 2014-10-14 05:07:09 +02:00
Thomas Müller
baffe5353f Merge pull request #11543 from owncloud/closeSessionForAppsLoading 
Close session when loading apps
 2014-10-13 17:59:12 +02:00
Vincent Petry
e95372bf01 Merge pull request #11546 from owncloud/users-deletewithfilecache 
Retrieve storage numeric id earlier when still available
 2014-10-13 17:27:13 +02:00
Vincent Petry
ab5149f5df Allow specifying protocol in ext storage OC config 
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.
 2014-10-13 17:15:58 +02:00
Björn Schießle
48ce2ef18b Merge pull request #11542 from owncloud/fix_failing_unit_tests 
distinguish between file dependent shares and other shares
 2014-10-13 17:01:13 +02:00
Vincent Petry
4fd8cb43ae Merge pull request #11537 from owncloud/filenamewithzeroes 
Fixed array detection on public download
 2014-10-13 16:56:11 +02:00
Robin Appelman
7dd4314fea Add unit test 2014-10-13 16:31:26 +02:00
Vincent Petry
d485c0098d Retrieve storage numeric id earlier when still available 
The numeric id is only available before the storage entry is deleted, so
get it at that time.
 2014-10-13 15:52:48 +02:00
Bjoern Schiessle
c6c9a51b11 distinguish between file dependent shares and other shares 2014-10-13 15:04:54 +02:00
Lukas Reschke
50841f8307 Close session when loading apps 
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.
 2014-10-13 15:03:44 +02:00
Robin Appelman
912fbfab01 Unset the cached active user when using a different session object 2014-10-13 13:11:48 +02:00
Robin Appelman
19de425a50 Use the cached fileinfo to get creatable permissions 2014-10-13 13:09:05 +02:00
Vincent Petry
6cbabdf217 Fixed array detection on public download 
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
 2014-10-13 12:54:21 +02:00
Jenkins for ownCloud
4b9465b937 [tx-robot] updated from transifex 2014-10-13 01:54:35 -04:00
Lukas Reschke
bf674487aa Merge pull request #11367 from owncloud/removeIsMimeSupported 
Remove uneeded slicing of element
 2014-10-12 19:45:00 +02:00
Jenkins for ownCloud
a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Nazar Mokrynskyi
257cf1fc34 Page size calculation based on real page height 
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,
 2014-10-11 15:10:54 +02:00