Thomas Müller
f7097faf82
Special treatment for Oracle
2014-10-16 17:02:15 +02:00
Thomas Müller
1ebeb6792e
Merge pull request #11617 from owncloud/fix-unit
...
Fix unit test
2014-10-16 16:57:40 +02:00
Lukas Reschke
a37dcf94fd
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS
...
Add app version to JS and CSS
2014-10-16 15:54:57 +02:00
Lukas Reschke
df5b98afa8
Merge pull request #11521 from owncloud/configsamplephp
...
small corrections to config.sample.php
2014-10-16 15:54:36 +02:00
Lukas Reschke
8502354382
Fix unit test
...
Regression introduced with https://github.com/owncloud/core/pull/11615
2014-10-16 15:41:45 +02:00
Clark Tomlinson
d977938a05
Merge pull request #11615 from owncloud/fix-translation-source-string
...
fixing typo in English source string
2014-10-16 09:40:14 -04:00
Lukas Reschke
5f3ddf5c80
Merge pull request #11383 from ockham/share-tags2
...
Share tags
2014-10-16 15:36:04 +02:00
blizzz
8553e04a78
Merge pull request #11478 from owncloud/fix-11448
...
LDAP: add setting to wizard that disables auto-detection and enables raw mode
2014-10-16 15:35:30 +02:00
Thomas Müller
4f2422ffbe
fixing typo in English source string
2014-10-16 15:24:28 +02:00
Thomas Müller
a04159090f
include the apps' versions hash to invalidate the cached assets
2014-10-16 13:29:51 +02:00
Robin Appelman
480fd1353e
Merge pull request #11609 from owncloud/trashbin-space-constant
...
Fix SPACE_UNKNOWN constant
2014-10-16 13:01:30 +02:00
Lukas Reschke
4deb57bfae
Remove insane comment
2014-10-16 12:42:00 +02:00
Lukas Reschke
9cfbf7ed1c
Fix SVG icons
...
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
2014-10-16 12:35:51 +02:00
Robin Appelman
c71deea0d5
Fix SPACE_UNKNOWN constant
2014-10-16 12:26:26 +02:00
Arthur Schiwon
7b15fcc3f8
left-align checkbox on server tab
2014-10-16 12:08:05 +02:00
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
e4227658d9
Migrate new app settings to AppFramework
...
Let's migrate those two new files.
2014-10-15 22:01:56 +02: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
Arthur Schiwon
c714e9bf02
rephrase xp'ed user mode label
2014-10-15 17:44:41 +02:00
Arthur Schiwon
b7db454fff
remove debug output
2014-10-15 17:28:18 +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
Lukas Reschke
6ccda2ae98
Add app version to JS and CSS
...
This leads to the regeneration of the hash in case a single application is updated.
Fixes https://github.com/owncloud/core/issues/11374
2014-10-15 14:00:20 +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
Arthur Schiwon
ab6890b854
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
2014-10-15 12:51:46 +02:00
Arthur Schiwon
4385188920
show busy cursor and lock tabs on save
2014-10-15 12:41:53 +02:00
Bjoern Schiessle
d18da08a1a
set password field placeholder back if passward was disabled
2014-10-15 12:30:31 +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
Carla Schroder
887d6155b8
commented out instanceid and passwordsalt
2014-10-14 16:57:45 -07:00
Carla Schroder
a8a0bcaffc
some small tweaks
2014-10-14 10:00:20 -07:00
Arthur Schiwon
c26e9c675a
show Spinner when stuff is being saved
2014-10-14 17:39:27 +02:00