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