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
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
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
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
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
Jenkins for ownCloud
a0db01ecd3
[tx-robot] updated from transifex
2014-10-11 01:55:02 -04:00
Björn Schießle
3f9cab00e3
Merge pull request #11507 from owncloud/versioning_expire
...
make sure that we always delete oldest first
2014-10-10 17:31:26 +02:00
Björn Schießle
87899db204
Merge pull request #11380 from owncloud/fix_performance_issue_sharing
...
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle
527e1d001f
try to get path from filesystem
2014-10-10 14:47:41 +02:00
Lukas Reschke
4a4ea1dae9
Merge pull request #11499 from owncloud/ldap-warningwhenuidismissing
...
Log warning when no uid was found for user
2014-10-10 12:42:31 +02:00
Jan-Christoph Borchardt
4faa424157
Merge pull request #11480 from owncloud/ldap-enterkey-deletefix
...
Prevent button click when enter key is pressed in LDAP wizard
2014-10-10 12:37:44 +02:00
Bjoern Schiessle
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
Vincent Petry
660e9c4012
Merge pull request #11501 from Ansud/master
...
Urlencode file name before passing it to cURL
2014-10-10 10:57:59 +02:00
Jenkins for ownCloud
2cc26c9022
[tx-robot] updated from transifex
2014-10-10 01:55:10 -04:00
Morris Jobke
e5eeefbc16
Merge pull request #11486 from owncloud/config-update
...
Config update
2014-10-10 01:47:04 +02:00
Morris Jobke
090bf44ab6
Additional changes to config.sample.php and typo fixes
2014-10-09 19:23:03 +02:00
Morris Jobke
7238cb601c
apply @carlaschroder's changes from owncloud/documentation#594
2014-10-09 19:23:03 +02:00
Bjoern Schiessle
8e077cf1a4
make sure that we always delete oldest first
2014-10-09 19:15:58 +02:00