Commit Graph

7005 Commits

Author SHA1 Message Date
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
hkjolhede 3e2d4c1bc1 Fixed error-checking error in sftp.php 2013-11-15 21:10:09 +01:00
Vincent Petry 68f278025c Merge pull request #5894 from owncloud/readd_sharing_token
readd sharing token to public template
2013-11-15 09:25:46 -08:00
blizzz cb968c77d1 Merge pull request #5772 from owncloud/fix5741
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
Björn Schießle 3ad546002f Merge pull request #5833 from owncloud/encryption_fixes
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
Vincent Petry 6355af162c Merge pull request #5880 from owncloud/replace_etmp_files
write encryption tmp files to the cache folder
2013-11-15 07:53:23 -08:00
Bjoern Schiessle f36ee69855 tests added 2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer 11425d142d readd sharing token to public template
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Vincent Petry f9a64d2b27 Fix for smb4php fseek
The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.

This patch fixes stream_fseek of smb4php to also respect this
convention.

Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
2013-11-15 14:23:24 +01:00
Thomas Müller 1e863cd959 Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
Thomas Müller 2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
2013-11-14 11:40:21 -08:00
Arthur Schiwon 98c9334175 LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency 2013-11-14 18:29:18 +01:00
Bjoern Schiessle faa08da944 instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list 2013-11-14 17:32:21 +01:00
Frank Karlitschek 29e9f2833d Merge pull request #5214 from owncloud/no_extra_slashes
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
Vincent Petry 008c3b80d6 Files app backend now normalizes paths before rendering templates
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"

Fixes #5848
2013-11-14 13:24:05 +01:00
Bjoern Schiessle 2624a6cb32 remove debug output 2013-11-14 12:13:22 +01:00
Bjoern Schiessle 2df3763675 test encryptAll() and decryptAll() to make sure that mtime and etag stay the same 2013-11-14 12:11:21 +01:00
Frank Karlitschek 58ff8a8673 Merge pull request #5805 from owncloud/shared-storage-copy-folder
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-13 10:17:37 -08:00
Arthur Schiwon 84a882c651 LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness 2013-11-13 19:07:28 +01:00
Arthur Schiwon 7a61dcadd2 LDAP Wizard: move status indicator in one line with back and continue buttons 2013-11-13 19:07:28 +01:00
Arthur Schiwon 4ee296051b LDAP Wizard: introduce configuration status indicator, fixes #5741 2013-11-13 19:07:28 +01:00
Frank Karlitschek 15c4e4ed09 Merge pull request #5806 from owncloud/styles-fix-external_storage
Fix spacing issue for checkboxes, vertically center checkboxes on person...
2013-11-13 07:43:59 -08:00
Morris Jobke 5aae550b11 Merge pull request #5809 from owncloud/fix5753
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
Morris Jobke ac0e87b1cc Merge pull request #5831 from owncloud/files-charatissue
Fixed total dirs/files message hiding condition
2013-11-13 05:22:48 -08:00
Bjoern Schiessle 222fa88eec Merge branch 'master' into encryption_fixes 2013-11-13 12:11:12 +01:00
Vincent Petry 3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Vincent Petry 5bdfccfc47 Fixed total dirs/files message hiding condition
Fixes #5829
2013-11-13 10:53:16 +01:00
Bjoern Schiessle dd0ebcede2 fixPartialFilePath() is now stripPartialFileExtension() 2013-11-12 18:48:31 +01:00
Bjoern Schiessle 77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Bjoern Schiessle e2fb8d7128 only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry 2013-11-12 15:55:59 +01:00
Bjoern Schiessle 894856ce01 make sure that we keep the correct timestamp and etag after encryoption/decryption 2013-11-12 15:51:51 +01:00
Georg Ehrke 238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Georg Ehrke 90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Bjoern Schiessle fcbb5d6cb3 missed some replacements... now tests should work 2013-11-12 11:17:34 +01:00
Bjoern Schiessle 9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01:00
Arthur Schiwon 550f2d0089 LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN 2013-11-11 19:27:38 +01:00
Arthur Schiwon 082357a670 LDAP Wizard: remove ugly whitespace where it should not be 2013-11-11 19:25:20 +01:00
Morris Jobke 913cde816f Fix spacing issue for checkboxes, vertically center checkboxes on personal page 2013-11-11 18:03:57 +01:00
Vincent Petry 80c8666d3a Deleting all files in trash now only sends a single flag
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.

Also fixes some "empty trash" message issues.
2013-11-11 17:58:33 +01:00
Robin Appelman a2015ee065 Use View::copy and View::rename when copying or renaming files in the shared storage 2013-11-11 17:58:20 +01:00
Bjoern Schiessle 802213f7ec let encryption app detect transfer id in path and handle it correctly 2013-11-11 17:47:59 +01:00
Morris Jobke 808634ac00 Merge pull request #5804 from owncloud/files-selectionsummary
Selection summary is now displayed properly
2013-11-11 08:41:53 -08:00
Vincent Petry e285e84e18 Selection summary is now displayed properly
Fixes #5775
2013-11-11 17:14:40 +01:00
Morris Jobke 43230f11f6 Merge pull request #5769 from owncloud/files-changedirjsevent
Added JS event for when the user changes the directory
2013-11-11 06:22:44 -08:00
Arthur Schiwon da61c6ef72 LDAP Wizard: determine port without credentials. don't hide the port input field 2013-11-11 15:16:54 +01:00
Morris Jobke 55331479cd Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Arthur Schiwon ea9f392f4e LDAP Wizard: improve check for Agent DN and Credentials 2013-11-11 13:36:28 +01:00
Jenkins for ownCloud e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud 3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Arthur Schiwon 58aad1096f LDAP Wizard: keep Base DN always visible 2013-11-08 17:48:29 +01:00
Vincent Petry 4998faf343 Added JS event for when the user changes the directory
This enables apps to detect directory changes which might be caused by
the user using the browser back button.
2013-11-08 13:16:28 +01:00
Vincent Petry c16fbbf386 Increased upload error delay to 10 seconds
Fixes #5662

Also made it use OC.Notification instead of directly access the
notification HTML element.
2013-11-08 11:22:08 +01:00
Morris Jobke 3e916a9f1d Merge pull request #5737 from owncloud/files-totaldirsnotfoundfix
Fixed totalDirs JS error
2013-11-07 05:02:43 -08:00
blizzz 0b1749e581 Merge pull request #5682 from owncloud/fix5585
LDAP: make buttons on Expert page work again, fixes #5585
2013-11-07 03:34:49 -08:00
Vincent Petry bdc75e497b Fixed totalDirs JS error 2013-11-07 10:11:18 +01:00
Jenkins for ownCloud 263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Morris Jobke a0ee6aef29 Merge pull request #5399 from frisco82/fixDownloadOverQuota
Do not count the size of shared folder on total
2013-11-06 13:59:27 -08:00
Arthur Schiwon 95a5ff63b8 LDAP: resolve namespace harakiri, fixes background job 2013-11-06 16:25:31 +01:00
Morris Jobke 1fa1cf46bd Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations
Fixes for "max upload size" value showed in the UI
2013-11-06 06:49:42 -08:00
Vincent Petry 5d698b72fc Fixed folder icon for home storage
Fixes #5713
2013-11-06 15:11:14 +01:00
Ramiro Aparicio b49530f80b Do not count the size of shared folder on total
Changed all array access to dot notation

Split comment in a second line
2013-11-06 13:47:03 +01:00
Arthur Schiwon 8b3da23368 LDAP Wizard: l10ned Save button 2013-11-06 12:40:07 +01:00
Vincent Petry 31181e4348 Fixed storage stats to be based on current directory
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.

This fix adds a "dir" argument to getstoragestats.php.
2013-11-06 10:55:19 +01:00
Vincent Petry 5d9ab6e7ac Update quota value in client after scan and upload
After uploading, the quota value wasn't refreshed.
This fix refreshes the quota value after files have been scanned or
uploaded.
2013-11-06 10:15:05 +01:00
Vincent Petry da126f1692 Fixed unit tests for files sharing watcher 2013-11-06 09:39:52 +01:00
VicDeo 3e5a5567eb Merge pull request #5692 from miicha/patch-2
allow empty user-dn and password
2013-11-05 12:19:27 -08:00
Vincent Petry 9f4fd0161e Added unit tests for shared files watcher
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
  propagation
2013-11-05 19:30:52 +01:00
Vincent Petry eb6fc14f84 Removed unused method 2013-11-05 17:14:19 +01:00
Vincent Petry e3868ba118 Fixed watcher to also update the owner's folder sizes
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Thomas Müller a438abe2fe Merge pull request #5699 from owncloud/fixing-4606-master
calling getstoragestats.php only if a user is logged in because this cal...
2013-11-05 04:30:35 -08:00
Arthur Schiwon fc040755c1 LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed 2013-11-05 13:19:32 +01:00
Thomas Müller ad336c94dc Merge pull request #5695 from owncloud/fixing-dropbox-master
fixing dropbox require path
2013-11-05 04:15:20 -08:00
Thomas Müller b869fb2a09 calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in 2013-11-05 12:18:25 +01:00
miicha ef1183bf86 allows agent and password or neither agent nor password
this contribution is MIT licensed
2013-11-05 11:51:53 +01:00
Thomas Müller b75c724cc4 fixing dropbox require path 2013-11-05 10:33:21 +01:00
Thomas Müller 3488202f67 Merge pull request #5582 from owncloud/files-previewcaching
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master
Scanner enhancments master
2013-11-04 23:58:42 -08:00
miicha 5b9bdaadaa allow empty user-dn and password
help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...
2013-11-05 01:24:20 +01:00
Thomas Müller a7cb16aab1 use === 2013-11-04 21:23:10 +01:00
Arthur Schiwon 3d6030b2ae LDAP: improve design and placement of Save button 2013-11-04 16:54:48 +01:00
Arthur Schiwon 17820fbef6 LDAP: make buttons on Expert page work again, fixes #5585 2013-11-04 16:48:40 +01:00
Andreas Fischer 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
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud 07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
VicDeo 4e9a23dffe Excpetion->Exception 2013-11-01 12:19:44 +03:00
Morris Jobke 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
Jörn Friedrich Dreyer adb5de4a88 prefer closest over parent
closest will search up the tree
2013-10-31 15:56:02 +01:00
Vincent Petry 35dd568f8f Added missing comma to make the next diff cleaner 2013-10-31 15:12:26 +01:00
Jörn Friedrich Dreyer 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
Vincent Petry 1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode
Fixes #5622
2013-10-31 12:34:15 +01:00
VicDeo 257084444b Merge pull request #5628 from owncloud/files-fixsummary
Fixed summary visibility check
2013-10-30 12:11:01 -07:00
Vincent Petry 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
Vincent Petry 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
Jörn Friedrich Dreyer 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
Vincent Petry 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
Vincent Petry 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
Jörn Friedrich Dreyer 68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Bjoern Schiessle abbacbacb4 remove unused variable 2013-10-30 11:39:30 +01:00
Bjoern Schiessle 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
Vincent Petry 4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master
Fixing l10n master
2013-10-30 02:44:54 -07:00
Vincent Petry 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
Jenkins for ownCloud 54ae799cd9 [tx-robot] updated from transifex 2013-10-30 03:33:25 -04:00
Thomas Müller ffb0e14d7b replacing ownCloud by theme-able name or avoid it's usage 2013-10-29 23:29:16 +01:00
Bjoern Schiessle e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Thomas Müller 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
Morris Jobke 404e9c0053 fix style of public share page 2013-10-29 16:08:11 +01:00
Vincent Petry 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
Morris Jobke 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
Bjoern Schiessle fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Thomas Müller a90cefcea2 avoid usage of brand name 'ownCloud' 2013-10-28 21:42:48 +01:00
Vincent Petry 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
Thomas Müller 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
Christian Berendt 70276ca520 settings tags for optional parameters 2013-10-29 10:21:50 +01:00
Christian Berendt 235bf5269d extended parameter descriptions for Swift 2013-10-29 09:19:43 +01:00
Vincent Petry efbd79198b Fixed preview URL + size while dragging an existing file 2013-10-28 15:41:52 +01:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +01:00
Jenkins for ownCloud 8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Andreas Fischer eb2d66d1a0 Fix double not in newfile/newfolder language. 2013-10-27 11:53:14 +01:00
Jenkins for ownCloud 119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Vincent Petry 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
Arthur Schiwon 81dbe7dab7 Port PR #5457 to master 2013-10-25 14:15:05 +02:00
Thomas Müller f91a4c89ca adding storage_mtime handling to SharedCache 2013-10-25 12:39:21 +02:00
Donald Buczek 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
Thomas Müller 5fd1f552a3 Merge pull request #5532 from owncloud/ldap_fixes
Ldap fixes
2013-10-24 23:24:39 -07:00
Arthur Schiwon c48157e3b8 LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 2013-10-24 20:26:05 +02:00
Thomas Müller 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
Arthur Schiwon 7fa418c81a LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 2013-10-24 18:21:02 +02:00
Christian Berendt dd82481f59 add configuration parameter to manually set the timeout of HTTP requests 2013-10-24 16:19:17 +02:00
Arthur Schiwon 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
Arthur Schiwon 6284e95e2b typo, fixes #5517 2013-10-24 14:16:58 +02:00
Thomas Müller 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
Thomas Müller e95ad29d90 Merge pull request #5435 from owncloud/share-improvements
Share improvements
2013-10-23 09:56:24 -07:00
Thomas Müller 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
Jörn Friedrich Dreyer 4991a7bd06 fix translations 2013-10-23 17:02:41 +02:00
Bjoern Schiessle 2221aa9ca4 run first getUsersItemShared() with the owner 2013-10-23 16:34:26 +02:00
Bjoern Schiessle 60e219da43 update etags for user we haven't checked yet 2013-10-23 16:34:03 +02:00
Bjoern Schiessle 6ae761d946 keep a list of users we already checked to avoid loops 2013-10-23 16:33:44 +02:00
Bjoern Schiessle dd972f65a8 fix infinite loop while updating etags, fix for #4365 2013-10-23 16:33:28 +02:00
Markus Goetz 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
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