af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
30c0f5dee6
LDAP Wizard: proper strings and translations for user and group count text
2013-10-23 12:20:13 +02:00
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
d78a80a689
merge master with resolved conflicts
2013-10-23 12:01:45 +02:00
8ed73e5ced
use a more descriptive error message when the user tries to create '/Shared'
2013-10-23 11:08:30 +02:00
a9735c8a6f
cleanup array value assignment
2013-10-23 11:01:05 +02:00
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
bc0faa1c4e
use correct filename in error result json
2013-10-23 10:59:01 +02:00
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
128d3221cc
make Swift::testLocal workable by using a delimiter
2013-10-23 08:07:59 +02:00
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
b92061da5a
make Swift::testLocal workable by fixing the prefix used with the object listing in opendir
2013-10-23 07:57:41 +02:00
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
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
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
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
ca3771f8fd
fixing js syntax error
2013-10-22 22:39:28 +02:00
bf46e0c317
fixing undefined variable $newname
2013-10-22 22:38:48 +02:00
0283589a19
adding PHPDoc comments
2013-10-22 22:38:05 +02:00
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
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
3d1d443529
remove debug output
2013-10-22 16:21:04 +02:00
eb348b776c
set the init status to "NOT_INITIALIZED" if the encryption app gets enabled
2013-10-22 16:15:24 +02:00
506db6c63a
rewrite of OC\Files\Storage\Swift
2013-10-22 14:59:09 +02:00
452d0a20a6
renaming OC\Files\Storage\SWIFT to OC\Files\Storage\Swift
2013-10-22 14:22:03 +02:00
e23433f771
display the original file name - this will change in case of renames
2013-10-22 14:02:44 +02:00
e0bac3ec71
adapted existing test cases
2013-10-22 13:36:23 +02:00
f0d04f3ac6
adjustment of the configuration parameters
2013-10-22 13:34:24 +02:00
67779680a6
added stripped library php-opencloud (version 1.6.0)
2013-10-22 13:22:41 +02:00
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
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
76a195a0be
LDAP Wizard: l10n improvements
2013-10-21 23:15:21 +02:00
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
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
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
732e7db319
Fix mind-boggling emptycontent logic
2013-10-21 19:49:27 +02:00
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
7864a3bf07
Fix shared folder still showing fileheader
2013-10-21 17:59:51 +02:00
a1038c271c
Merge pull request #5424 from owncloud/sharing-directlink
...
Added direct link in public share page
2013-10-21 08:26:51 -07:00
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
5ac4ec3a84
unbold the 'Direct link' label
2013-10-21 00:12:38 +03:00
8a643ac5bc
reduce width of direct link input field
2013-10-21 00:09:45 +03:00
40cc57ab3e
Improve updateEmptyContent logic
2013-10-20 22:55:49 +02:00
60b25a2e97
Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion
2013-10-20 22:47:44 +02:00
cbb42aae11
improve wording of permission notice
2013-10-20 23:46:01 +03:00
dbcfb1b830
beautify 'you dont have write permissions' notice, fix #2770
2013-10-20 23:15:58 +03:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
e61d961efb
LDAP: Fix base-comparison with multibyte characters, fixes #5081 . Thanks to @sfyang
2013-10-19 00:51:37 +02:00
7abfe2bd4f
Added direct link in public share page
...
Fixes #1167
2013-10-18 17:40:41 +02:00
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
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
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
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
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
48cd9d9444
filter duplicates directly in the sql query
2013-10-18 10:23:34 +02:00
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
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
183dd813d3
Fix Spinner issues with Base DN field
2013-10-17 20:57:19 +02:00
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
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
6acd01d9f2
resolve merge conflicts from rebase
2013-10-17 19:40:59 +02:00
0b90cc0b4b
Ldap Wizard: also disable tabs, if the first step is not complete
2013-10-17 19:13:29 +02:00
6b160d8507
LDAP Wizard: make Back and Continue work
2013-10-17 19:13:29 +02:00
63e9c56d48
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection
2013-10-17 19:13:29 +02:00
f64ae75107
LDAP Wizard: fix couple more or less nasty bugs aka polishing
2013-10-17 19:13:28 +02:00
7ad8319488
do not instantiate LDAP Proxy if there are no active configurations
2013-10-17 19:13:28 +02:00
109ddde944
Wizard: autodetection of group-member-assoc attribute
2013-10-17 19:13:28 +02:00
5606b60f36
LDAP: set displayname as default attribute for user display name
2013-10-17 19:13:28 +02:00
c975021a67
clean up
2013-10-17 19:13:28 +02:00
3ae696f843
Wizard does not need data-defaults here
2013-10-17 19:13:28 +02:00
f6b60c6586
LDAP Wizard: add forgotten templates
2013-10-17 19:13:28 +02:00
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
b2ccb712e2
Ldap Wizard: Group Filter configuration
2013-10-17 19:13:28 +02:00
7c6a9c2256
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter
2013-10-17 19:13:28 +02:00
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
5c99645f7d
Cleanup code, sort results
2013-10-17 19:13:27 +02:00
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
e87b091536
cleanup and coding style
2013-10-17 19:13:27 +02:00
87bd5a2bbb
cleanup, doc and todo
2013-10-17 19:13:27 +02:00
3cafcc2d47
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes
2013-10-17 19:13:27 +02:00
5425511259
Remove debug output
2013-10-17 19:13:27 +02:00
ee1b597345
css cleanup
2013-10-17 19:13:27 +02:00
3b1822cf91
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
2013-10-17 19:13:27 +02:00
8290929aa6
LDAP Wizard: autodetect base DN
2013-10-17 19:13:14 +02:00
7c60384f20
ignore autodetect-attribute on public save method
2013-10-17 19:13:14 +02:00
3fe400a3ca
Simplify WizardResult
2013-10-17 19:13:14 +02:00
53db1fe5ac
First stage of new Wizard, neither feature complete nor ready
2013-10-17 19:13:14 +02:00
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
02f292d0fd
Doc fix
2013-10-17 19:01:08 +02:00
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
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
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
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
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
99738ae0bc
add test for the reshare option
2013-10-17 12:23:37 +02:00
ab6ee79e11
adjust tests
2013-10-17 11:23:07 +02:00
abf10ac9bd
new option to add reshares to the result
2013-10-17 11:10:31 +02:00
9cfb438ff7
Fixed upload permissions distinction between public and logged in upload
...
Fixes #5370
2013-10-17 10:46:55 +02:00
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
Markus Goetz
Thomas Müller
Arthur Schiwon
Jörn Friedrich Dreyer
Björn Schießle
Christian Berendt
Christopher Schäpers
Vincent Petry
Bjoern Schiessle
Jan-Christoph Borchardt
Frank Karlitschek
Morris Jobke