263dc70bfd
Merge pull request #11627 from owncloud/fix-sample.php-syntax
...
fix the RST syntax of config.sample.php
2014-10-17 10:12:46 +02:00
e679a4c81c
Merge pull request #11552 from owncloud/fix_files_external_flickering
...
Fix files external flickering
2014-10-17 09:49:52 +02:00
92f2914335
[tx-robot] updated from transifex
2014-10-17 01:58:25 -04:00
72c2ee9f9c
fix the RST syntax of config.sample.php
2014-10-17 00:57:35 +02:00
dd74744039
read config.sample.php options and whitespace fixes
2014-10-17 00:35:51 +02:00
8ec5b40217
Merge pull request #11626 from owncloud/add-l10n
...
Use l10n on this string as well
2014-10-16 23:35:42 +02:00
0412f83035
Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-condition
...
Add a try catch block
2014-10-16 22:27:08 +02:00
852c7ef9da
Use l10n on this string as well
2014-10-16 22:04:24 +02:00
53e0cf2f74
Add a try catch block
...
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
2014-10-16 21:45:09 +02:00
1ebeb6792e
Merge pull request #11617 from owncloud/fix-unit
...
Fix unit test
2014-10-16 16:57:40 +02:00
a37dcf94fd
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS
...
Add app version to JS and CSS
2014-10-16 15:54:57 +02:00
df5b98afa8
Merge pull request #11521 from owncloud/configsamplephp
...
small corrections to config.sample.php
2014-10-16 15:54:36 +02:00
8502354382
Fix unit test
...
Regression introduced with https://github.com/owncloud/core/pull/11615
2014-10-16 15:41:45 +02:00
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
5f3ddf5c80
Merge pull request #11383 from ockham/share-tags2
...
Share tags
2014-10-16 15:36:04 +02:00
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
4f2422ffbe
fixing typo in English source string
2014-10-16 15:24:28 +02:00
a04159090f
include the apps' versions hash to invalidate the cached assets
2014-10-16 13:29:51 +02:00
480fd1353e
Merge pull request #11609 from owncloud/trashbin-space-constant
...
Fix SPACE_UNKNOWN constant
2014-10-16 13:01:30 +02:00
4deb57bfae
Remove insane comment
2014-10-16 12:42:00 +02:00
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
c71deea0d5
Fix SPACE_UNKNOWN constant
2014-10-16 12:26:26 +02:00
7b15fcc3f8
left-align checkbox on server tab
2014-10-16 12:08:05 +02:00
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
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
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
c8d8578d1a
[tx-robot] updated from transifex
2014-10-16 01:56:30 -04:00
f48c973876
Merge pull request #11570 from owncloud/backport-11408-master
...
Backport 11408 master
2014-10-15 21:21:45 +02:00
63e0599218
Merge pull request #11565 from owncloud/fix-behaviourOnOSX
...
Add darwin to if block
2014-10-15 21:12:50 +02:00
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
8198e70f24
Changed fileList.pageSize to function call
2014-10-15 19:18:35 +02:00
63145f5765
Typo
2014-10-15 19:17:21 +02:00
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
c714e9bf02
rephrase xp'ed user mode label
2014-10-15 17:44:41 +02:00
b7db454fff
remove debug output
2014-10-15 17:28:18 +02:00
c27fd94ec8
in cli mode return true for isHtaccessWorking
2014-10-15 16:59:28 +02:00
b4efd83f2b
Merge pull request #10426 from owncloud/enhanced-apps-management
...
Enhanced apps management
2014-10-15 16:26:53 +02:00
da27797e8d
Even better - usage of this.$container instead of this.$el.parent()
2014-10-15 15:24:03 +02:00
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
5033fc4e52
Stub for pageSize, because now it is dynamically calculated
2014-10-15 15:09:01 +02:00
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
33ada11a64
Use function call for FileList.pageSize
2014-10-15 14:55:24 +02:00
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
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
6ec9c99d48
Use this.$el instead of the absolute selector
2014-10-15 14:16:17 +02:00
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
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
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
ab6890b854
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
2014-10-15 12:51:46 +02:00
4385188920
show busy cursor and lock tabs on save
2014-10-15 12:41:53 +02:00
Thomas Müller
Jörn Friedrich Dreyer
Jenkins for ownCloud
Morris Jobke
Lukas Reschke
Vincent Petry
Clark Tomlinson
blizzz
Robin Appelman
Robin Appelman
Nazar Mokrynskyi
Jan-Christoph Borchardt
Bjoern Schiessle