Thomas Müller
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
Arthur Schiwon
30c0f5dee6
LDAP Wizard: proper strings and translations for user and group count text
2013-10-23 12:20:13 +02:00
Jörn Friedrich Dreyer
3121dc8cb5
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-23 12:02:06 +02:00
Arthur Schiwon
d78a80a689
merge master with resolved conflicts
2013-10-23 12:01:45 +02:00
Jörn Friedrich Dreyer
8ed73e5ced
use a more descriptive error message when the user tries to create '/Shared'
2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer
a9735c8a6f
cleanup array value assignment
2013-10-23 11:01:05 +02:00
Jörn Friedrich Dreyer
af7ec3169b
cleanup precondition checking when creating new files / folders
...
- use i18n
- use trim when checking for empty file / folder name
- use more verbose error descriptions
2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
bc0faa1c4e
use correct filename in error result json
2013-10-23 10:59:01 +02:00
Björn Schießle
2d14daf36b
Merge pull request #5472 from owncloud/enc_init_status_on_enable
...
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
Christian Berendt
128d3221cc
make Swift::testLocal workable by using a delimiter
2013-10-23 08:07:59 +02:00
Christian Berendt
a1e956263c
Revert "make Swift::testLocal workable by fixing the prefix used with the object listing in opendir"
...
This reverts commit b92061da5a
.
2013-10-23 08:01:32 +02:00
Christian Berendt
b92061da5a
make Swift::testLocal workable by fixing the prefix used with the object listing in opendir
2013-10-23 07:57:41 +02:00
Christopher Schäpers
70c0d7d6bc
Merge pull request #5310 from owncloud/hide_filestable-header_when_empty
...
Hide files list header, when theres no files to see
2013-10-22 14:39:14 -07:00
Thomas Müller
cea1f80c1a
Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle
...
Fixed ugly white space while loading file thumbnail
2013-10-22 14:20:48 -07:00
Thomas Müller
e6aa7a8643
Merge pull request #5467 from owncloud/fixing-5063-master
...
display the original file name - this will change in case of renames
2013-10-22 14:10:35 -07:00
Thomas Müller
9019ad550f
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-22 23:06:53 +02:00
Thomas Müller
ca3771f8fd
fixing js syntax error
2013-10-22 22:39:28 +02:00
Thomas Müller
bf46e0c317
fixing undefined variable $newname
2013-10-22 22:38:48 +02:00
Thomas Müller
0283589a19
adding PHPDoc comments
2013-10-22 22:38:05 +02:00
Jörn Friedrich Dreyer
45e6d96702
prevent user from creating or renaming sth. to an existing filename
...
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
2013-10-22 18:11:03 +02:00
Vincent Petry
263f8bebfe
Added FileList.setViewerMode to hide controls
...
Some files app embed themselves under the controls (like the text
editor). The new method FileList.setViewerMode() makes it possible to
properly show/hide the control buttons using the correct permissions.
Apps using this approach must call setViewerMode(true) when starting and
setViewerMode(false) upon closing to restore the controls.
This is needed for #5284
2013-10-22 16:44:57 +02:00
Bjoern Schiessle
3d1d443529
remove debug output
2013-10-22 16:21:04 +02:00
Bjoern Schiessle
eb348b776c
set the init status to "NOT_INITIALIZED" if the encryption app gets enabled
2013-10-22 16:15:24 +02:00
Christian Berendt
506db6c63a
rewrite of OC\Files\Storage\Swift
2013-10-22 14:59:09 +02:00
Christian Berendt
452d0a20a6
renaming OC\Files\Storage\SWIFT to OC\Files\Storage\Swift
2013-10-22 14:22:03 +02:00
Thomas Müller
e23433f771
display the original file name - this will change in case of renames
2013-10-22 14:02:44 +02:00
Christian Berendt
e0bac3ec71
adapted existing test cases
2013-10-22 13:36:23 +02:00
Christian Berendt
f0d04f3ac6
adjustment of the configuration parameters
2013-10-22 13:34:24 +02:00
Christian Berendt
67779680a6
added stripped library php-opencloud (version 1.6.0)
2013-10-22 13:22:41 +02:00
Vincent Petry
3bb7cf939e
Fixed ugly white space while loading file thumbnail
...
Preview images are now pre-loaded before being set on the file element.
This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
2013-10-22 12:08:05 +02:00
Thomas Müller
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
Arthur Schiwon
76a195a0be
LDAP Wizard: l10n improvements
2013-10-21 23:15:21 +02:00
Vincent Petry
d1c27e08e5
Fixed empty content logic
...
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
2013-10-21 22:18:10 +02:00
Thomas Müller
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
Vincent Petry
bd7cf436c6
Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix
...
Fixed share with link checkbox missing as regular user
2013-10-21 11:46:01 -07:00
kondou
732e7db319
Fix mind-boggling emptycontent logic
2013-10-21 19:49:27 +02:00
Jenkins for ownCloud
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
kondou
7864a3bf07
Fix shared folder still showing fileheader
2013-10-21 17:59:51 +02:00
Vincent Petry
a1038c271c
Merge pull request #5424 from owncloud/sharing-directlink
...
Added direct link in public share page
2013-10-21 08:26:51 -07:00
Vincent Petry
f8717bc260
Fixed share with link checkbox missing as regular user
...
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.
Fixes #5440
2013-10-21 11:29:40 +02:00
Jan-Christoph Borchardt
5ac4ec3a84
unbold the 'Direct link' label
2013-10-21 00:12:38 +03:00
Jan-Christoph Borchardt
8a643ac5bc
reduce width of direct link input field
2013-10-21 00:09:45 +03:00
kondou
40cc57ab3e
Improve updateEmptyContent logic
2013-10-20 22:55:49 +02:00
kondou
60b25a2e97
Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion
2013-10-20 22:47:44 +02:00
Jan-Christoph Borchardt
cbb42aae11
improve wording of permission notice
2013-10-20 23:46:01 +03:00
Jan-Christoph Borchardt
dbcfb1b830
beautify 'you dont have write permissions' notice, fix #2770
2013-10-20 23:15:58 +03:00
Jenkins for ownCloud
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
Arthur Schiwon
e61d961efb
LDAP: Fix base-comparison with multibyte characters, fixes #5081 . Thanks to @sfyang
2013-10-19 00:51:37 +02:00
Vincent Petry
7abfe2bd4f
Added direct link in public share page
...
Fixes #1167
2013-10-18 17:40:41 +02:00
Frank Karlitschek
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
Björn Schießle
c954b04973
Merge pull request #5412 from owncloud/fix_5141
...
give getSelectedFilesTrash() a unique name for the trash.js
2013-10-18 03:51:54 -07:00
Morris Jobke
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
Bjoern Schiessle
1c611a3dfb
give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js
2013-10-18 10:57:10 +02:00
Vincent Petry
33cf4708d5
Merge pull request #5411 from owncloud/ocs_share_api_cleanup
...
filter duplicates directly in the sql query
2013-10-18 01:41:15 -07:00
Bjoern Schiessle
48cd9d9444
filter duplicates directly in the sql query
2013-10-18 10:23:34 +02:00
Vincent Petry
41c6c44221
Disable versions app JS in public mode
...
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
2013-10-17 21:04:18 +02:00
Arthur Schiwon
17010e8f58
Don't set Base User and Base Group when Base DN was detected, would case problems but does not provide any benefit. also make sure that empty string is saved instead of false for multiline values
2013-10-17 20:58:43 +02:00
Arthur Schiwon
183dd813d3
Fix Spinner issues with Base DN field
2013-10-17 20:57:19 +02:00
Björn Schießle
76be7cd1ac
Merge pull request #5382 from owncloud/sharing_api_include_reshares
...
add reshare option for the OCS Share API
2013-10-17 11:07:47 -07:00
Jenkins for ownCloud
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
Arthur Schiwon
6acd01d9f2
resolve merge conflicts from rebase
2013-10-17 19:40:59 +02:00
Arthur Schiwon
0b90cc0b4b
Ldap Wizard: also disable tabs, if the first step is not complete
2013-10-17 19:13:29 +02:00
Arthur Schiwon
6b160d8507
LDAP Wizard: make Back and Continue work
2013-10-17 19:13:29 +02:00
Arthur Schiwon
63e9c56d48
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection
2013-10-17 19:13:29 +02:00
Arthur Schiwon
f64ae75107
LDAP Wizard: fix couple more or less nasty bugs aka polishing
2013-10-17 19:13:28 +02:00
Arthur Schiwon
7ad8319488
do not instantiate LDAP Proxy if there are no active configurations
2013-10-17 19:13:28 +02:00
Arthur Schiwon
109ddde944
Wizard: autodetection of group-member-assoc attribute
2013-10-17 19:13:28 +02:00
Arthur Schiwon
5606b60f36
LDAP: set displayname as default attribute for user display name
2013-10-17 19:13:28 +02:00
Arthur Schiwon
c975021a67
clean up
2013-10-17 19:13:28 +02:00
Arthur Schiwon
3ae696f843
Wizard does not need data-defaults here
2013-10-17 19:13:28 +02:00
Arthur Schiwon
f6b60c6586
LDAP Wizard: add forgotten templates
2013-10-17 19:13:28 +02:00
Arthur Schiwon
def834b0a1
LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanced settings, too. This is all done via Wizard, now.
2013-10-17 19:13:28 +02:00
Arthur Schiwon
b2ccb712e2
Ldap Wizard: Group Filter configuration
2013-10-17 19:13:28 +02:00
Arthur Schiwon
7c6a9c2256
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter
2013-10-17 19:13:28 +02:00
Arthur Schiwon
e903db7887
LDAP Wizard: create user list filter, show number of user that will have access to OC
2013-10-17 19:13:28 +02:00
Arthur Schiwon
5c99645f7d
Cleanup code, sort results
2013-10-17 19:13:27 +02:00
Arthur Schiwon
162bfb231a
Ldap Wizard: find out whether server supports memberOf in LDAP Filter and disable group chooser if not
2013-10-17 19:13:27 +02:00
Arthur Schiwon
e87b091536
cleanup and coding style
2013-10-17 19:13:27 +02:00
Arthur Schiwon
87bd5a2bbb
cleanup, doc and todo
2013-10-17 19:13:27 +02:00
Arthur Schiwon
3cafcc2d47
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes
2013-10-17 19:13:27 +02:00
Arthur Schiwon
5425511259
Remove debug output
2013-10-17 19:13:27 +02:00
Arthur Schiwon
ee1b597345
css cleanup
2013-10-17 19:13:27 +02:00
Arthur Schiwon
3b1822cf91
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
2013-10-17 19:13:27 +02:00
Arthur Schiwon
8290929aa6
LDAP Wizard: autodetect base DN
2013-10-17 19:13:14 +02:00
Arthur Schiwon
7c60384f20
ignore autodetect-attribute on public save method
2013-10-17 19:13:14 +02:00
Arthur Schiwon
3fe400a3ca
Simplify WizardResult
2013-10-17 19:13:14 +02:00
Arthur Schiwon
53db1fe5ac
First stage of new Wizard, neither feature complete nor ready
2013-10-17 19:13:14 +02:00
Arthur Schiwon
652caa1c88
LDAP: move Configuration out of Connection into class of its own. The new wizard requires it.
2013-10-17 19:13:14 +02:00
Arthur Schiwon
02f292d0fd
Doc fix
2013-10-17 19:01:08 +02:00
Morris Jobke
d8f22160a4
Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero
...
Fixed zip download button for unlimited filesize in public mode
2013-10-17 08:23:20 -07:00
Bjoern Schiessle
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
Vincent Petry
b4bffad99a
Fixed zip download button for unlimited filesize in public mode
...
Added missing condition to check whenever allowed zip size is unlimited.
Fixes #3717
2013-10-17 15:30:08 +02:00
Vincent Petry
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
Morris Jobke
ea4f6e2431
Merge pull request #5378 from owncloud/files-permissionsafteruploadfix
...
Fixed upload permissions distinction between public and logged in upload
2013-10-17 03:50:26 -07:00
Bjoern Schiessle
99738ae0bc
add test for the reshare option
2013-10-17 12:23:37 +02:00
Bjoern Schiessle
ab6ee79e11
adjust tests
2013-10-17 11:23:07 +02:00
Bjoern Schiessle
abf10ac9bd
new option to add reshares to the result
2013-10-17 11:10:31 +02:00
Vincent Petry
9cfb438ff7
Fixed upload permissions distinction between public and logged in upload
...
Fixes #5370
2013-10-17 10:46:55 +02:00
Frank Karlitschek
d70a6c3f98
Merge pull request #4935 from owncloud/webdav-depth-fix-master
...
WebDAV depth infinity support - the dirty way
2013-10-17 01:37:38 -07:00
Morris Jobke
a132144eca
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
...
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
Morris Jobke
db31541fe1
Merge pull request #5353 from owncloud/files-dndtodirbroken
...
Fixed drag and drop to subfolder and breadcrumb
2013-10-16 04:52:35 -07:00
Björn Schießle
9f8d52ee44
Merge pull request #5329 from owncloud/enc_fix_unencrypted_size
...
try to fix unencrypted file size if it doesn't look plausible
2013-10-16 02:25:28 -07:00
Bjoern Schiessle
6bfd8bdf63
revert last changes
2013-10-16 11:24:56 +02:00
Morris Jobke
97905775b0
Merge pull request #5354 from owncloud/enc_tests
...
added simple test for getFileSize proxy
2013-10-16 02:14:35 -07:00
Jenkins for ownCloud
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
Bjoern Schiessle
0811d2e304
added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong
2013-10-15 17:52:06 +02:00
Bjoern Schiessle
beaed2195d
fix comment
2013-10-15 17:36:52 +02:00
Bjoern Schiessle
0d4117f6d5
added simple test for getFileSize proxy
2013-10-15 17:33:31 +02:00
Morris Jobke
04ea419f50
Merge pull request #5334 from owncloud/files-sharing-actionsafterupload
...
Files sharing actions + navigation fixes
2013-10-15 08:11:17 -07:00
Vincent Petry
c6f14001bb
Fixed drag and drop upload to breadcrumb
2013-10-15 16:14:23 +02:00
Vincent Petry
92e646413a
Fixed drag and drop onto folders
...
Fixes #5351
2013-10-15 15:59:45 +02:00
Morris Jobke
52501d6ba3
Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files
...
check if we are writing to user/files, otherwise skip encryption
2013-10-15 02:44:14 -07:00
Björn Schießle
a6d9319328
Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
...
ocs share api: add "received_from" and "received_from_displayname" field
2013-10-15 02:17:23 -07:00
Vincent Petry
4ae1d08241
Merge pull request #5330 from owncloud/files-removedfileactionsbkg
...
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 09:23:06 -07:00
Vincent Petry
fab4102c51
Disabled ajax mode for public files view
...
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +02:00
Vincent Petry
09b084dfed
Fixed file permissions after public upload
...
Fixes #5328
2013-10-14 17:28:53 +02:00
Bjoern Schiessle
d3af7a9aa4
check if we are writing to user/files, otherwise skip encryption
2013-10-14 17:13:14 +02:00
Vincent Petry
e79d853867
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 17:05:24 +02:00
Bjoern Schiessle
58196304b8
fix array key
2013-10-14 16:43:18 +02:00
Bjoern Schiessle
4151fd3ed9
try to fix unencrypted file size if it doesn't look plausible
2013-10-14 16:34:14 +02:00
Vincent Petry
b8285ca316
Added missing "grid" class on external storage's table
2013-10-14 14:02:39 +02:00
Jenkins for ownCloud
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Morris Jobke
a021a12b3b
Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
...
Fixed external storage status indicator in admin page
2013-10-13 13:03:02 -07:00
kondou
f828b51ede
Hide files list header, when theres no files to see
2013-10-12 17:28:20 +02:00
Thomas Müller
bff6ca212a
Merge pull request #5301 from owncloud/versioning_preview_shared
...
versioning preview also for shared files
2013-10-12 01:32:25 -07:00
Morris Jobke
22bb9762fd
Merge pull request #5304 from owncloud/files-deleteiconpositionfix
...
Fixed position of "delete" icon in files app
2013-10-11 12:39:33 -07:00
Thomas Müller
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Vincent Petry
a4a52733f9
Fixed position of "delete" icon in files app
...
There was an issue where only Chrome allows setting position: relative
on a td element.
This fix now works in IE8, Firefox and Chrome.
Fixes #5056
2013-10-11 18:01:15 +02:00
Vincent Petry
067475a907
Merge pull request #5302 from owncloud/files-missingfileactionsafteradd
...
File actions are now updated after create/upload file
2013-10-11 08:45:42 -07:00
Vincent Petry
b2986e1994
Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
...
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
Vincent Petry
e98ea06890
File actions are now updated after create/upload file
...
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.
Fixes #4971 and #4993
2013-10-11 17:07:48 +02:00
Bjoern Schiessle
9baedb4102
remove debug output
2013-10-11 17:06:43 +02:00
Bjoern Schiessle
c32c5979d8
Merge branch 'master' into versioning_preview_shared
2013-10-11 17:00:21 +02:00
Björn Schießle
5c664704a3
Merge pull request #5261 from owncloud/versioning_no_glob
...
versioning: don't use glob() and getLocalFile()
2013-10-11 07:57:14 -07:00
Björn Schießle
9a15aa8ee9
Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
...
fix setting dialog headlines for the encryption app
2013-10-11 07:15:58 -07:00
Bjoern Schiessle
57beef1e36
fix setting dialog headlines for the encryption app
2013-10-11 15:56:08 +02:00
Björn Schießle
034968c612
Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
...
encryption: block file access if share keys are missing
2013-10-11 06:37:53 -07:00
Bjoern Schiessle
3ee7711284
fix another typo
2013-10-11 15:26:30 +02:00
Bjoern Schiessle
2d79a79202
change error code to 403
2013-10-11 15:24:49 +02:00
Bjoern Schiessle
83c78bc7a8
fix typo in error message and change error code to 403
2013-10-11 15:23:12 +02:00
Vincent Petry
2b2a548610
Fixed IE8 misaligned date
...
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent
This works in IE8 and other browsers.
Fixes #5288
2013-10-11 14:23:37 +02:00
Bjoern Schiessle
39d710e737
block file access if share keys are missing
2013-10-11 14:20:46 +02:00
Vincent Petry
39b150921d
Moved IE8 inline styles in files.css
2013-10-11 14:10:00 +02:00
Vincent Petry
bced346c3b
Now using smaller spinner image for status indicator
...
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
2013-10-11 12:36:30 +02:00
Björn Schießle
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Bjoern Schiessle
a0de5dd325
some small fixes
2013-10-11 10:34:34 +02:00
Bjoern Schiessle
7a1705d28e
fix api tests
2013-10-11 10:28:01 +02:00
Jenkins for ownCloud
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
Vincent Petry
75629a1f00
Fixed delete icon alignment in IE8
...
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056 )
2013-10-11 00:16:41 +02:00
Bjoern Schiessle
f4e86045de
make files versions root a class constant
2013-10-10 20:09:38 +02:00
Bjoern Schiessle
87cccb2e32
some small changes/fixes
2013-10-10 20:06:42 +02:00
Bjoern Schiessle
3dd313dca2
add "received_from" and "received_from_displayname" field in case of a reshared file to the output
2013-10-10 19:46:45 +02:00
Bjoern Schiessle
4c2e3919de
make previews work for shared files in the versions drop-down
2013-10-10 17:23:27 +02:00
Bjoern Schiessle
92009c5d8e
fix getVersions() for sub directories
2013-10-10 16:58:11 +02:00
Vincent Petry
e2a4417079
Fixed conflict dialog in IE8
...
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
Bjoern Schiessle
909af2b62e
don't cache if the encryption is enabled, this can lead to problems during unit testing
2013-10-10 15:02:52 +02:00
Bjoern Schiessle
bb3b38947d
add missing preview link
2013-10-10 14:57:25 +02:00
Bjoern Schiessle
e56947255e
don't use glob() and getLocalFile(), this can lead to problems on windows servers
2013-10-10 14:43:40 +02:00
Morris Jobke
e276ffedd3
Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
...
Fixed files view regular file actions in IE8
2013-10-10 05:14:09 -07:00
Morris Jobke
cf554fd804
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
...
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
blizzz
666e52a46b
Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
...
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
Vincent Petry
bf00ccd1d6
Fixed files view regular file actions in IE8
...
Fixes #5256
A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
2013-10-10 12:21:02 +02:00
Vincent Petry
e88b493136
Fixed external storage status indicator in admin page
...
- Fixes #5241
- Fixed indicator to appear, its selector was wrong
- Added spinner while saving an entry's settings
- Removed ajax "async: false" that blocked the browser while saving
2013-10-10 11:12:21 +02:00
VicDeo
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Bjoern Schiessle
a1719deabe
make sure that we are logged in ad user1 while performing the tests
2013-10-10 10:47:35 +02:00
Vincent Petry
3a3819b303
Merge pull request #5134 from owncloud/trashbin-homeiconbroken
...
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 -07:00
Björn Schießle
223adc3167
Merge pull request #5230 from owncloud/trashbin_fixes
...
Trashbin fixes
2013-10-09 08:27:54 -07:00
Bjoern Schiessle
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
Bjoern Schiessle
38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +02:00
Bjoern Schiessle
46bce8e540
fix checkbox
2013-10-09 13:15:53 +02:00
Bjoern Schiessle
51cfdb32b1
fix indention
2013-10-09 12:43:56 +02:00
Bjoern Schiessle
31a91ef892
fix group delete/restore
2013-10-09 12:35:15 +02:00
Thomas Müller
9637ca3ae8
Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
...
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Bjoern Schiessle
9e3d28871e
fix delete/restore individual files
2013-10-09 12:01:25 +02:00
Bjoern Schiessle
4404963918
fix trashbin layout
2013-10-09 11:11:55 +02:00
Thomas Müller
8a06f2e128
php 5.3 compatibility for Test_Files_Sharing_Api
2013-10-08 23:05:19 +02:00
ringmaster
c737b521ab
Don't double-slash filenames at the root.
...
Replace either the end of the dir string that isn't preceded by a slash or the slash at the end of the dir string with a slash and the filename.
This prevents the root directory from ending up as two slashes, which breaks files_versions on Windows servers. See #4079 for an explanation.
2013-10-08 12:48:59 -04:00
Vincent Petry
cddb85c588
Added filesApp flag as input field for files app detection
...
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Morris Jobke
6284ab31de
fix escaping
2013-10-08 16:00:26 +02:00
Bjoern Schiessle
68e1dd1f23
make sure that we only remove file/folder shares
2013-10-08 16:00:18 +02:00
Thomas Müller
7c6ed6ab33
catch exceptions while uploading and pass on the error message
2013-10-08 15:03:24 +02:00
Jenkins for ownCloud
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
VicDeo
372a73d43a
Merge pull request #5184 from owncloud/fix-trash-bin-button
...
Fix trash bin button
2013-10-07 10:58:47 -07:00
Jenkins for ownCloud
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
Morris Jobke
980fc9cc7e
Fix trash bin button
2013-10-07 18:15:23 +02:00
Morris Jobke
4af220d09e
Fix password screen for public shares
...
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
* Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Vincent Petry
a3d0e29aa5
Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
...
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
VicDeo
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Vincent Petry
6a36d7fa86
Added isPublic flag in files_sharing template
...
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.
This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
Morris Jobke
193e815133
Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
...
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
Jörn Friedrich Dreyer
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer
0683372200
canceling individual uploads is currently impossible because there is no placeholder
2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
3be8e3f8d3
remove obsolete comment
2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
8899543b7f
use !== comparison
2013-10-07 11:14:10 +02:00
Vincent Petry
6a4563f203
Fix breadcrumb to reinit dnd after ajax nav #5064
...
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
Björn Schießle
981608cf6b
Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
...
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
Bjoern Schiessle
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
Bjoern Schiessle
0346167bb2
clean up oc_share table from files which are no longer exists
2013-10-07 10:59:09 +02:00
Frank Karlitschek
46fdb449a4
Merge pull request #4662 from owncloud/fix-4129
...
Fix 4129
2013-10-06 23:42:44 -07:00