17820fbef6
LDAP: make buttons on Expert page work again, fixes #5585
2013-11-04 16:48:40 +01:00
26ecf2062c
Merge pull request #5656 from owncloud/fix-wizard-typo
...
Fix typo in LDAP wizard
* owncloud/fix-wizard-typo:
Excpetion->Exception
2013-11-04 09:39:19 +01:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
4e9a23dffe
Excpetion->Exception
2013-11-01 12:19:44 +03:00
be07e828ef
Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode
...
Corretly hide "no permissions" message in controls in viewer mode
2013-10-31 08:08:04 -07:00
adb5de4a88
prefer closest over parent
...
closest will search up the tree
2013-10-31 15:56:02 +01:00
35dd568f8f
Added missing comma to make the next diff cleaner
2013-10-31 15:12:26 +01:00
a4be1ebeb8
use data-file to retrieve filename
...
forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163
trust me, I know what I'm doing
2013-10-31 14:31:57 +01:00
1be1c57bc8
Corretly hide "no permissions" message in controls in viewer mode
...
Fixes #5622
2013-10-31 12:34:15 +01:00
257084444b
Merge pull request #5628 from owncloud/files-fixsummary
...
Fixed summary visibility check
2013-10-30 12:11:01 -07:00
cdb3c74632
Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick
...
Prevent closing the create dropdown when right clicking in Firefox
2013-10-30 10:38:03 -07:00
19eeb618ff
Prevent closing the create dropdown when right clicking in Firefox
...
Firefox sends a click event on the document when right clicking which
makes pasting with right click into the field impossible.
Fixes #5498
2013-10-30 17:55:41 +01:00
fdaac99526
Merge pull request #5626 from owncloud/fix_search_in_shared_files
...
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 09:02:39 -07:00
aeac3186ee
Fixed summary visibility check
...
Now using the integer values to check whether to show the summary parts
instead of trying to parse the html code.
2013-10-30 16:14:08 +01:00
d21a5b45f3
Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmissing
...
Fixed encryption migration when entry is missing in DB
2013-10-30 07:49:49 -07:00
68e88b6e40
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 15:48:38 +01:00
abbacbacb4
remove unused variable
2013-10-30 11:39:30 +01:00
6e77fa46f2
if the database doesn't contain any information about the recovery mode than we assume that it is disabled
2013-10-30 11:28:36 +01:00
4c7ef85252
Merge pull request #5616 from owncloud/fixing-l10n-master
...
Fixing l10n master
2013-10-30 02:44:54 -07:00
de342a5ac7
Merge pull request #5603 from owncloud/fix_file_cache_updater_master
...
Fix file cache updater (backport to master of #5513 )
2013-10-30 02:31:08 -07:00
54ae799cd9
[tx-robot] updated from transifex
2013-10-30 03:33:25 -04:00
ffb0e14d7b
replacing ownCloud by theme-able name or avoid it's usage
2013-10-29 23:29:16 +01:00
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
2534c3bc78
Merge pull request #5606 from owncloud/files-uploaderrorparsingfix
...
Added fix to correctly parse non-array error messages
2013-10-29 09:23:19 -07:00
404e9c0053
fix style of public share page
2013-10-29 16:08:11 +01:00
71cf83b314
Added fix to correctly parse non-array error messages
...
Some apps like the antivirus app return messages in a non-array format.
2013-10-29 16:00:34 +01:00
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
a90cefcea2
avoid usage of brand name 'ownCloud'
2013-10-28 21:42:48 +01:00
e41ea20ce4
Fixed clicking on the "Home" breadcrumb in the trash app
...
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
2013-10-28 20:24:06 +01:00
ffc3bc1914
Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift
...
Reworking \OC\Files\Storage\Swift
2013-10-29 13:49:24 -07:00
70276ca520
settings tags for optional parameters
2013-10-29 10:21:50 +01:00
235bf5269d
extended parameter descriptions for Swift
2013-10-29 09:19:43 +01:00
efbd79198b
Fixed preview URL + size while dragging an existing file
2013-10-28 15:41:52 +01:00
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
eb2d66d1a0
Fix double not in newfile/newfolder language.
2013-10-27 11:53:14 +01:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
e246e2b669
Fixed encryption migration when entry is missing in DB
...
When resetting the DB and some users still have encrypted files, the
migration state isn't read properly becaue the migration entries are
missing. This causes the wrong file size to be returned.
This fix inserts the missing migration entry when this condition is met.
Fixes #5541
2013-10-25 15:38:35 +02:00
81dbe7dab7
Port PR #5457 to master
2013-10-25 14:15:05 +02:00
f91a4c89ca
adding storage_mtime handling to SharedCache
2013-10-25 12:39:21 +02:00
3fc232370e
make sure the shared ldap connection is rebound to the configured user after being used for password checking.
2013-10-25 11:12:18 +02:00
5fd1f552a3
Merge pull request #5532 from owncloud/ldap_fixes
...
Ldap fixes
2013-10-24 23:24:39 -07:00
c48157e3b8
LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518
2013-10-24 20:26:05 +02:00
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
7fa418c81a
LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520
2013-10-24 18:21:02 +02:00
dd82481f59
add configuration parameter to manually set the timeout of HTTP requests
2013-10-24 16:19:17 +02:00
20f46602bd
LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521
2013-10-24 14:27:33 +02:00
6284e95e2b
typo, fixes #5517
2013-10-24 14:16:58 +02:00
535bc7b664
Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename
...
prevent user from creating or renaming sth. to an existing filename
2013-10-23 13:45:27 -07:00
e95ad29d90
Merge pull request #5435 from owncloud/share-improvements
...
Share improvements
2013-10-23 09:56:24 -07:00
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
4991a7bd06
fix translations
2013-10-23 17:02:41 +02:00
2221aa9ca4
run first getUsersItemShared() with the owner
2013-10-23 16:34:26 +02:00
60e219da43
update etags for user we haven't checked yet
2013-10-23 16:34:03 +02:00
6ae761d946
keep a list of users we already checked to avoid loops
2013-10-23 16:33:44 +02:00
dd972f65a8
fix infinite loop while updating etags, fix for #4365
2013-10-23 16:33:28 +02:00
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
Arthur Schiwon
Andreas Fischer
Jenkins for ownCloud
VicDeo
Morris Jobke
Jörn Friedrich Dreyer
Vincent Petry
VicDeo
Bjoern Schiessle
Christian Berendt
Donald Buczek
Markus Goetz
Björn Schießle
Christopher Schäpers
Jan-Christoph Borchardt
Frank Karlitschek