Commit Graph

9265 Commits

Author SHA1 Message Date
Thomas Müller f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Jan-Christoph Borchardt 108cdeb892 Merge pull request #11867 from owncloud/settings-sidebar-admin
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
Jan-Christoph Borchardt 1dfabfb491 admin settings: fix LDAP settings header layout 2014-10-30 16:04:26 +01:00
Thomas Müller 24feb74638 fixing ldap listing in admin sidebar - needs styling review 2014-10-30 13:55:33 +01:00
Vincent Petry 5536f6edd0 Properly register sharing hooks and proxies
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
Jenkins for ownCloud ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Lukas Reschke 2cd35e94b4 Close session for files_trashbin
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +01:00
Arthur Schiwon 8a48b088ed on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848 2014-10-29 18:53:07 +01:00
Vincent Petry 106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke 7d10ec41e6 Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Vincent Petry e8f9b929bd Added encryption test when moving file as non-owner 2014-10-29 12:57:12 +01:00
Vincent Petry f44e617dfd Fix warning with unset extension check 2014-10-29 12:56:49 +01:00
Vincent Petry b920f888ae Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
Thomas Müller 9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Lukas Reschke 206cb5ba63 Fix typo 2014-10-29 10:11:01 +01:00
Bjoern Schiessle 9d1be0bbaf get the source path and owner in a pre hook and the target path and owner in a
post hook
2014-10-29 10:11:01 +01:00
Vincent Petry ec1a73fab9 Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Jenkins for ownCloud cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
jknockaert 4faee4011d initialisation of cipher 2014-10-28 19:19:10 +01:00
Jenkins for ownCloud 23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Arthur Schiwon 05b2a037f2 dont fail with 500 if configured display name attribute is not set 2014-10-27 15:58:23 +01:00
Jenkins for ownCloud 5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud 214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Jenkins for ownCloud 3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Lukas Reschke b3a04840b5 Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Robin Appelman 4438c7de1d Fix shared cache getFolderContents 2014-10-24 12:32:55 +02:00
Robin Appelman 6ed9f53fcd also update shared watcher 2014-10-24 12:32:55 +02:00
Lukas Reschke d060180140 Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Lukas Reschke 9739a25547 Merge pull request #11758 from owncloud/fix-permissions
Make files non executable
2014-10-24 12:15:19 +02:00
Lukas Reschke 0525341a12 Merge pull request #11754 from owncloud/fix-division-null
Prevent division by zero
2014-10-24 11:59:29 +02:00
Lukas Reschke 2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
Jenkins for ownCloud 9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Lukas Reschke 3efac5a4f2 Prevent division by zero
Potentially fixes https://github.com/owncloud/core/issues/11742
2014-10-24 00:10:22 +02:00
Morris Jobke 7c14a17361 Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
Morris Jobke ca01530f57 Merge pull request #11726 from owncloud/s3-fixunittests
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
Jenkins for ownCloud e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Vincent Petry 188effa433 Fix S3 folder creation for new AWS API
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
Vincent Petry 71dce48bd3 Fix S3 connection 2014-10-22 22:17:07 +02:00
Vincent Petry 075e8d8e86 Lazy initialize external storages
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
2014-10-22 12:42:36 +02:00
Jörn Friedrich Dreyer a9aa7841c9 Merge pull request #11684 from owncloud/guess_mimetype_on_touch
guess mimetype on touch
2014-10-22 12:32:09 +02:00
Jenkins for ownCloud 916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Lukas Reschke cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jörn Friedrich Dreyer 1c9004409b guess mimetype on touch 2014-10-21 12:58:26 +02:00
Lukas Reschke 3e499d1ac4 Merge pull request #11675 from owncloud/urlencode-for-special-characters
URLEncode filenames to be compatible with special characters
2014-10-21 10:05:00 +02:00
Jenkins for ownCloud 8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
jknockaert da44150a15 small fix 2014-10-20 23:25:54 +02:00
jknockaert d277ef6ac2 bugfixes 2014-10-20 23:04:11 +02:00
Lukas Reschke f451ecb8d8 URLEncode filenames to be compatible with special characters 2014-10-20 20:00:34 +02:00
Thomas Müller d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Jörn Friedrich Dreyer cb3a4d22b1 make tests compatible with hook based skeleton generation 2014-10-20 11:29:20 +02:00
Jörn Friedrich Dreyer 9b0f0df7f5 make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud 87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
jknockaert 1b7e9d66b3 ok; still some bugs that had to be fixed 2014-10-20 00:28:41 +02:00
jknockaert 3be57d0169 small fix 2014-10-19 22:54:34 +02:00
jknockaert e318858152 rework getFileSize 2014-10-19 22:27:15 +02:00
Jenkins for ownCloud 245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud 68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Arthur Schiwon e16122f2a1 add one simple cache test 2014-10-17 20:16:04 +02:00
Arthur Schiwon 4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon 5170dc3ae6 fix retrievel of group members and cache group members
fix changed variable name
2014-10-17 20:14:52 +02:00
Björn Schießle 2e875bc6b6 Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
2014-10-17 14:18:59 +02:00
Morris Jobke f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master
Fix SVG icons
2014-10-17 12:01:27 +02:00
Thomas Müller d37eee09a5 fixing usage of EncryptionException 2014-10-17 11:46:22 +02:00
Jörn Friedrich Dreyer e679a4c81c Merge pull request #11552 from owncloud/fix_files_external_flickering
Fix files external flickering
2014-10-17 09:49:52 +02:00
Jenkins for ownCloud 92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04: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
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
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
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
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
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
Nazar Mokrynskyi 6ec9c99d48 Use this.$el instead of the absolute selector 2014-10-15 14:16:17 +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
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
Arthur Schiwon c26e9c675a show Spinner when stuff is being saved 2014-10-14 17:39:27 +02:00
Jenkins for ownCloud 526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Jörn Friedrich Dreyer 7535b09851 cleanup variable names and duplicate jQuery selectors 2014-10-13 18:40:57 +02:00
Jörn Friedrich Dreyer 7f1ba86789 fix flickering users 2014-10-13 17:58:29 +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
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
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
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
Arthur Schiwon 836f0839e5 show a spinner next to test filter button when the test is running 2014-10-10 13:41:32 +02:00
Arthur Schiwon ea7975ac8b always abort running ajax request when the method is fired up again 2014-10-10 13:30:03 +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
Arthur Schiwon f31d4caf57 coding style, no effective code changes 2014-10-10 11:49:45 +02:00
Jenkins for ownCloud 2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Bjoern Schiessle 8e077cf1a4 make sure that we always delete oldest first 2014-10-09 19:15:58 +02:00
Vincent Petry 9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Arthur Schiwon 6f83b537fe remove debug output 2014-10-09 17:56:27 +02:00
Arthur Schiwon 2cf0102797 fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck 2014-10-09 17:17:50 +02:00
Lukas Reschke 16cd749065 Add support for keys in the info.xml
This allows to have links to different doc base URLs

a.
2014-10-09 15:48:30 +02:00
Vincent Petry 59f9107dd9 Log warning when no uid was found for user
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
2014-10-09 14:58:53 +02:00
blizzz cc717c27d6 Merge pull request #10527 from owncloud/fix-10526
properly cancel a Paginated Results operation in order to avoid protocol...
2014-10-09 12:40:13 +02:00
Arthur Schiwon 9f036e776e bump version 2014-10-09 11:15:56 +02:00
Vincent Petry f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Vincent Petry 3791de64ed Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225
fix retrieval of group members and cache group members
2014-10-09 10:19:58 +02:00
Morris Jobke b11cf6f838 Merge pull request #11474 from owncloud/fix_trash_permission_check
check if I can create a file at the location
2014-10-09 08:59:48 +02:00
Jenkins for ownCloud 295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
MTRichards c7f936cdcb Updated info.xml with
Added description in line with other apps.
2014-10-08 21:27:40 -04:00
MTRichards f511977832 Updated info.xml app description
Added updates description
2014-10-08 21:24:54 -04:00
MTRichards 511ad6e106 Forgot a '.' 2014-10-08 21:08:20 -04:00
MTRichards 3a2d50b76f Updated info.xml app description
Made app description paralell in structure to other app descriptions
2014-10-08 21:07:12 -04:00
MTRichards fc0ae29be5 Updated info.xml app description
Added larger app description
2014-10-08 20:49:22 -04:00
MTRichards d532683e20 Updated info.xml app description
Added new app description
Removed links to CE documentation
2014-10-08 20:48:00 -04:00
MTRichards 48980fbc46 Updated info.xml with description
Updated the description of the app for the app panel.
2014-10-08 20:44:09 -04:00
brumsoel 1e1be409b7 Fix timestamp comparator return value 2014-10-08 22:40:57 +02:00
Morris Jobke 2f1605cfc3 Merge pull request #11471 from brumsoel/master
Fix file size comparator return value
2014-10-08 20:39:13 +02:00
Jörn Friedrich Dreyer f664a31dec extract batchDelete(), better comments 2014-10-08 18:50:02 +02:00
André Gaul 0d0c9d0bb3 files_extern: remove empty Body and ContentLength in Amazon S3 mount
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-08 18:49:59 +02:00
Jörn Friedrich Dreyer aa3ad898a9 fix amazon s3 issues
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
2014-10-08 18:49:47 +02:00
Jörn Friedrich Dreyer 18e3856092 log exceptions when listing files 2014-10-08 18:49:43 +02:00
Arthur Schiwon 02985c9ec5 smaller corrections to make scruitinizer happier, no effective changes 2014-10-08 16:20:52 +02:00
Vincent Petry bb424802c8 Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
2014-10-08 15:09:02 +02:00
Arthur Schiwon ab3535855f more beautiful white spaces 2014-10-08 15:04:29 +02:00
Arthur Schiwon 39aa5868ac rename internal var name to avoid collision 2014-10-08 14:55:47 +02:00
Morris Jobke 6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements
[encryption] some visual improvements
2014-10-08 14:36:24 +02:00
Vincent Petry 26e242a8a4 Added PHP docs for etag propagator 2014-10-08 14:22:18 +02:00
Robin Appelman bcf654127f More phpdoc 2014-10-08 14:22:17 +02:00
Robin Appelman 1030f0a763 Hookup the etag propagator 2014-10-08 14:22:17 +02:00
Robin Appelman 5d7bd8be42 Add EtagPropagator to handle etag changes when external storages are changed 2014-10-08 14:22:17 +02:00
Robin Appelman 9a5d0f6084 Fix add/remove mountpoint hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 6585eaa5df Added failing unit tests for mount config hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 0610937ac3 Added filesystem hooks for mount/unmount ext storage 2014-10-08 14:22:17 +02:00
Arthur Schiwon 29b0e9bfbc confirmation before switching to assisted mode when admin is experienced 2014-10-08 13:29:13 +02:00
Arthur Schiwon 7ba787e649 user and group counts are only upated on demand in experienced mode 2014-10-08 13:06:18 +02:00
Arthur Schiwon b6fc7f5599 Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once 2014-10-08 11:38:39 +02:00
Bjoern Schiessle 5b5e9d148e check if I can create a file at the location 2014-10-08 10:56:06 +02:00
Jenkins for ownCloud a9c9b5edf4 [tx-robot] updated from transifex 2014-10-08 01:54:49 -04:00
brumsoel 40174b6b10 Fix file size comparator return value 2014-10-08 01:17:45 +02:00
Arthur Schiwon 3ff4c8e3fc sets user filters to raw mode when marking user as experienced 2014-10-07 17:28:09 +02:00
Arthur Schiwon efd940133b must be empty not auto 2014-10-07 16:45:22 +02:00
Arthur Schiwon 67292a5345 add checkbox for experienced users to server tab 2014-10-07 16:43:58 +02:00
Morris Jobke 814bce4cac Merge pull request #11451 from owncloud/reduce-bottom-padding
reduce bottom padding in filelist, fix perceived glitching, fix #11213
2014-10-07 14:45:21 +02:00
Bjoern Schiessle b060123155 improved visual feedback if user enabled recovery key 2014-10-07 12:52:01 +02:00
Bjoern Schiessle 794d3ef949 improved visual feedback if recovery key password gets changed 2014-10-07 12:32:09 +02:00
Bjoern Schiessle 5fa1cbc4e5 improved visual feedback if recovery key gets enabled/disabled 2014-10-07 12:32:09 +02:00
Vincent Petry 396a71b005 Merge pull request #11378 from owncloud/sort-indicator-style
fix position and style of sort indicator
2014-10-07 11:06:37 +02:00
Jan-Christoph Borchardt 2b8066bff3 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 10:44:01 +02:00
Jenkins for ownCloud 01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Morris Jobke e5b4e54141 Merge pull request #11392 from owncloud/fix_version_previews
we also encrypt/decrypt files in the versions folder
2014-10-06 13:03:48 +02:00
Bjoern Schiessle 9147219377 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 12:02:08 +02:00
Jenkins for ownCloud 6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Jenkins for ownCloud f191e5b088 [tx-robot] updated from transifex 2014-10-05 01:54:50 -04:00
Jenkins for ownCloud 537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Arthur Schiwon 3b3ad0bc4f fix changed variable name 2014-10-01 21:44:36 +02:00
Jan-Christoph Borchardt 3cd6b99a0b fix position and style of sort indicator 2014-10-01 15:21:28 +02:00
Lukas Reschke 001f223baa Merge pull request #10104 from owncloud/s3-overwrite
Fix S3 copy and rename overwriting target directory
2014-10-01 13:07:28 +02:00
Jenkins for ownCloud 553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Arthur Schiwon 6c502e11f8 make scrutinizer happy, very minor changes 2014-10-01 11:55:53 +02:00
Arthur Schiwon f9e085b020 init a new paged search on read operations to satisfy OpenLDAP 2014-09-30 17:00:25 +02:00
Lukas Reschke 306bf71c62 Use SVG previews for public sharing
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-09-30 15:49:49 +02:00
Arthur Schiwon 2b9696efae abandond paged search only if PHP supports them 2014-09-30 13:13:52 +02:00
Arthur Schiwon 53ec32807a abandon ongoing paged search before starting a new one 2014-09-30 12:42:37 +02:00
Arthur Schiwon 9a63693227 properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526 2014-09-30 12:42:37 +02:00
Jenkins for ownCloud 5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Martin Konrad fd9b79b218 Add a CLI command that deletes an LDAP config
With this change LDAP configurations can be managed completely from
the command line.
2014-09-30 03:23:00 +02:00
Lukas Reschke 659b9fc030 Merge pull request #11337 from danbartram/better_encryption_recovery_labels
Add clickable labels to encryption recovery radios
2014-09-29 22:06:00 +02:00
Lukas Reschke b13b86502f Merge pull request #11347 from mark0n/create_empty_config
Add a CLI command that creates an empty LDAP config
2014-09-29 21:42:07 +02:00
Lukas Reschke 8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares
[sharing] group shares
2014-09-29 20:26:41 +02:00
Lukas Reschke 6b45cb5416 Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
dn needs to be fetched to be able to detect memberOf support
2014-09-29 14:46:10 +02:00
Bjoern Schiessle 6e7acb8ae0 some small fixed, suggested by scrutinizer 2014-09-29 11:23:18 +02:00
Bjoern Schiessle e5f0dded84 throw a exception if we can't handle the provided path 2014-09-29 11:13:06 +02:00
Jenkins for ownCloud 63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Martin Konrad b57960aeec Add a CLI command that creates an empty LDAP config
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
2014-09-29 00:21:20 -04:00
Jenkins for ownCloud 84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Dan Bartram 1b9c31d349 Add clickable labels to encryption recovery radios
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal

Pressing on the radio button text now toggles the state of the radio
button.
2014-09-27 16:20:06 +01:00
Jenkins for ownCloud 3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Arthur Schiwon 6041ae6224 dn needs to be fetched to be able to detect memberOf support 2014-09-26 15:36:49 +02:00
Jenkins for ownCloud 1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Bjoern Schiessle 52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Bjoern Schiessle d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Jenkins for ownCloud f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Robin Appelman e8280c80da Show a proper error message when trying to scan the filesystem for a non existing user 2014-09-24 15:48:54 +02:00
Bjoern Schiessle 5c7fe91041 clear share table after each test run 2014-09-24 14:02:02 +02:00
Lukas Reschke aeb516c3c9 Check for blacklisted characters
Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
2014-09-23 19:30:32 +02:00
Jan-Christoph Borchardt 1e915cc145 Merge pull request #11109 from owncloud/nstamm-patch-1
DragnDrop Upload text style
2014-09-23 14:03:08 +02:00
Jan-Christoph Borchardt 8c33a8e6fd adjust text size and opacity of drag'n'drop upload text style 2014-09-23 13:36:47 +02:00
Jan-Christoph Borchardt a062db4fd0 Merge pull request #11234 from owncloud/fix-icon-classes
Fix icon classes, disappeared delete icon
2014-09-23 12:39:06 +02:00
Vincent Petry 75593f87d5 Merge pull request #11137 from owncloud/enc-pregfix
Fix share key pattern matching
2014-09-23 12:36:34 +02:00
Vincent Petry 1e631754d7 Fix share key finding algorithm in various cases
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
Lukas Reschke 5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Lukas Reschke ff6c5331e9 Merge pull request #11224 from owncloud/fix_recovery_admin_user
first check if a private key exists, if not it is always a recovery szenario
2014-09-23 10:13:58 +02:00
Jenkins for ownCloud 479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Lukas Reschke 6eeb905871 Do only follow HTTP and HTTPS redirects
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Jan-Christoph Borchardt 1583ae1ed6 force show the loading icon in list for deletion, not only on hover 2014-09-22 18:24:52 +02:00
Jan-Christoph Borchardt 2ac953e6a8 correct progress-icon to icon-loading-small 2014-09-22 18:24:32 +02:00
Jan-Christoph Borchardt 91d9d45c6c correct delete-icon to icon-delete, fix #11128 2014-09-22 18:17:33 +02:00
Bjoern Schiessle 9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle 89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Vincent Petry 828ae65681 Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition
Added extra check to avoid deleting key folders
2014-09-22 16:36:23 +02:00
Morris Jobke 70937dabcd Merge pull request #11167 from owncloud/env-movetomountreenableproxy
Reenable file proxy when renaming between mount points
2014-09-22 16:30:19 +02:00
Bjoern Schiessle 744110905b first check if a private key exists, if not it is always a recovery szenario 2014-09-22 15:05:03 +02:00
Volkan Gezer d16b8c03e9 fix button text l10n 2014-09-22 09:32:03 +02:00
Georg Ehrke 9fd23d2edf files_sharing: add route for ajax/publicpreview 2014-09-21 18:21:42 +02:00
Jenkins for ownCloud a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Jenkins for ownCloud e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Vincent Petry 8aca127e52 Added extra check to avoid deleting key folders
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
2014-09-19 19:01:02 +02:00
Volkan Gezer 01808c8c84 fix typo 2014-09-19 18:22:09 +02:00
Lukas Reschke fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2
Use select2 for the groups excluded from sharing in admin page
2014-09-19 16:50:56 +02:00
Lukas Reschke fb033cce98 Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
[encryption] create backup from all keys before recovery
2014-09-19 16:40:19 +02:00
Lukas Reschke e94ec409ae Merge pull request #11171 from owncloud/fix-route
Match more URL fragments
2014-09-19 16:04:29 +02:00
Bjoern Schiessle a280859bf8 make sure that we really catch the files folder only 2014-09-19 11:47:18 +02:00
Bjoern Schiessle 2ee14c4734 create backup from all keys before recovery 2014-09-19 11:47:18 +02:00
Jenkins for ownCloud 786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke 7956765c12 Match more URL fragments
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
2014-09-18 23:18:07 +02:00
Vincent Petry f2a01dddbc Reenable file proxy when renaming between mount points
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-18 19:21:04 +02:00
Morris Jobke 112e570989 Merge pull request #11141 from owncloud/update_encrytionlink
update encryption doc link
2014-09-18 18:19:53 +02:00
Volkan Gezer ccaea93d6b update encryption doc link
I don't know how we missed to update this :/

update ldap doc link
2014-09-18 18:14:51 +02:00
Arthur Schiwon 4ed926b954 fix retrievel of group members and cache group members 2014-09-18 17:12:35 +02:00
Morris Jobke 338db48c0b Merge pull request #9541 from owncloud/force_loading_of_encryption_app
force loading of encryption app to show correct error
2014-09-18 09:04:53 +02:00
Jenkins for ownCloud dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke 7db0d55129 Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
Tentative fix for legacy file actions unit test side effect
2014-09-17 18:10:49 +02:00
Lukas Reschke 14571d4103 force loading of encryption app 2014-09-17 17:13:25 +02:00
Robin Appelman 6d60630f08 Skip test for unsuported feature for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman 11ac9ce28b Fix copy overwrite for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman 3b08b3fad4 Fix amazon s3 rename overwrite 2014-09-17 15:51:57 +02:00
Robin Appelman 6e12d830d5 Fix AmazonS3 rmdir on the root 2014-09-17 15:50:27 +02:00
Robin Appelman 2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Jenkins for ownCloud 2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Lukas Reschke 45b17207cc Merge pull request #10745 from owncloud/fix-10708-doctrine
Use Doctrine Platform to generate SQL query for table truncation.
2014-09-16 23:56:20 +02:00
Lukas Reschke 21afcb3e94 Merge pull request #10902 from owncloud/fix-ellepsis
Adding link to ellipsis and fixing styling
2014-09-16 21:09:47 +02:00
Lukas Reschke 368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Nicolas Stamm a2a1f5da6a DragnDrop Upload text style
The 8px margin was uggly.
2014-09-16 16:51:48 +02:00
Lukas Reschke 4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
Thomas Müller 7e2bff8545 adding unit test to truncate the table 2014-09-16 16:17:25 +02:00
Vincent Petry 05cf940983 Tentative fix for legacy file actions unit test side effect
Sometimes the JS unit test with legacy file actions fail.

This fix runs the legacy file actions tests on a dummy instead of the
real one.
2014-09-16 15:38:44 +02:00
Clark Tomlinson 140c89f1c3 Adding link to ellipsis and fixing styling 2014-09-16 09:18:01 -04:00