9aa809debf
update 3rdparty to match master - just adds the merge commit
2014-10-17 15:07:14 +02:00
7bf401e48a
Merge pull request #11430 from owncloud/minify-js-css-master
...
adding cssmin and jssmin(minify)
2014-10-17 15:05:59 +02:00
439b33ec38
Merge pull request #11634 from owncloud/loadapps-encapsulaterequire
...
Encapsulate require_once to avoid name space bleedind
2014-10-17 14:32:10 +02:00
2e875bc6b6
Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
...
fixing usage of EncryptionException
2014-10-17 14:18:59 +02:00
27c22f071d
Encapsulate require_once to avoid name space bleedind
...
The script required by require_once might use variable names like $app
which will conflict with the code that follows.
This fix encapsulates require_once into its own function to avoid such
issues.
2014-10-17 12:45:45 +02:00
93b0f1a3bf
adding cssmin and jssmin(minify)
...
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content
adding repair step to clean the asset cache after upgrade + coding style adjustments
2014-10-17 12:22:26 +02:00
688a141586
Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
...
drastic ldap speedup (update)
2014-10-17 12:07:27 +02:00
f1a5ebd59d
Merge pull request #11611 from owncloud/fix-svg-master
...
Fix SVG icons
2014-10-17 12:01:27 +02:00
d37eee09a5
fixing usage of EncryptionException
2014-10-17 11:46:22 +02:00
276db93dac
Merge pull request #11629 from owncloud/add-notice-to-php-doc
...
Add PHPDoc about sanitization of "insertIfNotExist"
2014-10-17 11:35:16 +02:00
eceb1d03cb
Merge pull request #11594 from owncloud/sharing_toggle_password
...
set password field placeholder back if passward was disabled
2014-10-17 11:32:29 +02:00
af335a39f1
Add PHPDoc about sanitization of "insertIfNotExist"
...
Let's document this potential pitfall properly.
2014-10-17 11:06:49 +02:00
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
Morris Jobke
Lukas Reschke
Björn Schießle
Vincent Petry
Thomas Müller
blizzz
Jörn Friedrich Dreyer
Jenkins for ownCloud
Clark Tomlinson
Robin Appelman
Robin Appelman
Nazar Mokrynskyi
Jan-Christoph Borchardt