046ede8e46
Merge pull request #1558 from schiesbn/trashbin_sizelimit
...
Trashbin sizelimit
2013-02-10 09:02:05 -08:00
f58ed7a509
no need to implement createUser in web dav auth
2013-02-10 17:31:12 +01:00
980c197fbf
Merge pull request #1594 from hkjolhede/master
...
Corrected namespace path for files_external SFTP backend
2013-02-10 06:47:22 -08:00
72a33e01e6
Merge pull request #1585 from owncloud/fix_breadcrumb_resizing
...
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 06:38:19 -08:00
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
421bacc33a
Final changes from icewind1991
2013-02-10 13:11:29 +01:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
1df8a5a774
Updated phpseclib from git + requested style changes
2013-02-10 12:35:49 +01:00
1c56539c01
Merge pull request #1551 from owncloud/fix_files_multiselect
...
Fix filelist shifting up one row on (multi)select
2013-02-10 02:54:12 -08:00
b44c18d164
Don't run external storage tests on default
2013-02-10 11:39:32 +01:00
b7b50f8082
remove hascontrols from trash bin file list table
2013-02-10 11:14:03 +01:00
76a6209c8e
Merge pull request #1564 from schiesbn/trash_bin_breadcrumbs
...
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
2013-02-10 01:56:11 -08:00
c6985d6cd4
Merge branch 'master' into fix-shared-links
2013-02-10 00:54:20 -05:00
71affd528c
Fix public links
2013-02-10 00:53:58 -05:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
c6622301e5
Security bug
2013-02-09 23:49:21 +01:00
bcf98879cb
Just a little cleaner in touch
2013-02-09 23:33:01 +01:00
9e42a36fd8
Update to touch
2013-02-09 23:29:58 +01:00
674955d1b6
Spelling mistake
2013-02-09 20:35:48 +01:00
71d3903cfd
Added unittest
2013-02-09 20:34:21 +01:00
96cfe37587
Update to conform to API changes
2013-02-09 19:08:39 +01:00
2a650bcbe9
Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir
...
extract common code
2013-02-09 09:57:23 -08:00
9bf1f22d5f
Merge pull request #1383 from owncloud/files_encryption-style-fixes
...
first style fixes - @samtuke: I added some TODO regarding undefined vari...
2013-02-09 09:04:47 -08:00
7f58e27495
cleanup - more to come after
2013-02-09 18:01:38 +01:00
419eced65c
Remove hascontrols - use original positioning.
...
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
3b029d551c
corrected namespace
2013-02-09 15:57:33 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
81a281a140
Modified to new class structure
2013-02-09 14:12:17 +01:00
2b4823d62d
Deleted phpseclib/tests
2013-02-09 14:07:18 +01:00
41fa65e7be
Merge branch 'master' of https://github.com/owncloud/core
...
Conflicts:
apps/files_external/appinfo/app.php
2013-02-09 14:05:33 +01:00
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
b95bc663af
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
d5dc8ae726
initialize breadcrumbs array
2013-02-09 12:41:47 +01:00
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
7507b1ddd3
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
2013-02-09 12:32:08 +01:00
ab4ae2b952
Merge pull request #1560 from owncloud/fix_replacing
...
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
c5fd9cc0c2
Merge pull request #1562 from schiesbn/fix_naming
...
rename trash to trash bin
2013-02-09 03:21:30 -08:00
ca243f3fac
Merge pull request #1521 from schiesbn/label_fixed
...
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
60cc7d0ba2
debug output removed
2013-02-09 11:11:07 +01:00
b24e3f1d32
comment added
2013-02-09 11:07:47 +01:00
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
764409117a
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
...
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
1c94ec71ef
LDAP: fix database cleanup in update script
2013-02-09 13:10:53 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
a93282ab16
Merge pull request #1507 from tripflex/master
...
remove float left from actions div class
fixes #1504
2013-02-07 12:49:14 -08:00
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
808de17aeb
use never more that 50% of available disc space for the trash bin
2013-02-07 17:37:46 +01:00
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
18a288a3c3
l10n support enhanced in files_trashbin
2013-02-07 16:31:04 +01:00
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
6cff5418a7
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting
...
LDAP: don't try to put TLS on top of already secure connection (will fail).
2013-02-07 07:06:35 -08:00
15e383fd01
Typo
2013-02-07 16:05:45 +01:00
ca43e09276
keep track of trash bin size
2013-02-07 15:16:29 +01:00
6299704dfd
Merge pull request #1518 from schiesbn/trash_layout_fix
...
add class hascontrols to trash bin file table
2013-02-07 04:40:51 -08:00
ce293b8efc
remove debug output
2013-02-07 13:16:15 +01:00
7e874af2c8
rename OCA_Trash to OCA\Files_Trashbin
2013-02-07 13:14:45 +01:00
c81d7b0b90
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 12:45:27 +01:00
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
17384994d6
add class hascontrols to trash bin file table
2013-02-07 10:13:09 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
93b1597395
Merge pull request #1506 from owncloud/files_encryption
...
Files encryption
2013-02-06 11:47:55 -08:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
faf6cb0868
Merge branch 'master' into files_encryption
2013-02-06 18:26:44 +00:00
954a627483
Added comment
2013-02-06 18:24:35 +00:00
cc19df22a1
Remove old OC4 link compatibility
2013-02-06 13:09:04 -05:00
2b07afc8ab
Removed debugging code
2013-02-06 17:59:47 +00:00
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
fd171a4f34
copy&paste bug, no fetchAll() needed here
2013-02-06 16:50:16 +01:00
8cc7bab0e5
delete debug code
2013-02-06 16:25:10 +01:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
a3289d3991
Merge branch 'master' into files_encryption
2013-02-06 15:08:53 +00:00
6870add18f
Development snapshot
2013-02-06 15:08:36 +00:00
58a3a6a573
Merge pull request #1487 from owncloud/fix-1420-master
...
Replace OC_FileCache usage in files_versions
2013-02-06 06:45:01 -08:00
16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
781d247b39
LDAP: better detect timeouts. do not try to reconnect. do not try to bind when connection failed. makes ownCloud more responsive, esp. with multiple server connections configured
2013-02-06 14:32:00 +01:00
e122fdbcb6
LDAP: when ldaps and tls are configured, disable the latter one - they do not work together. ldaps already creates a secure connection.
2013-02-06 14:30:17 +01:00
33ec26f6d6
LDAP: info string improved
2013-02-06 14:24:00 +01:00
af2acadc66
LDAP: fix settings handling of homeFolderNamingRule option
2013-02-06 13:04:35 +01:00
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
993831b6df
LDAP: version bump -> clean up database
2013-02-06 02:29:55 +01:00
c6aa370604
code style
2013-02-06 02:29:03 +01:00
3cef8f1216
LDAP: do not store user home as it destroys configurability. always fetch it. use of cache is save however, it is cleared when settings are saved
2013-02-06 02:28:09 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
3b9e2f1bab
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
a528f96b84
Merge branch 'master' into files_encryption-style-fixes
2013-02-05 18:23:03 +00:00
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
4ba0ab7f65
Added missing translation wrapping
2013-02-05 17:22:59 +00:00
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
221b69dd0e
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
2013-02-05 16:09:01 +00:00
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
68fe6d0077
Merge pull request #1432 from owncloud/add_requesttoken
...
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
23166aa016
Merge pull request #1415 from owncloud/ldap_fix_settings
...
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
2013-02-01 16:35:55 -08:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
10ad5f923a
remove ugly whitespace
2013-02-01 23:52:41 +01:00
a7d82ad0ee
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
2013-02-01 23:48:22 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
fb0a5f3224
undelete -> restore
2013-02-01 00:43:52 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
c1072d0c09
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-31 23:26:40 +01:00
2af6d74bc1
Merge branch 'master' into fixing-js-errors-public-link-master
...
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
fc585623a5
spell check
...
👍
2013-01-31 22:49:07 +01:00
a1dc24c9da
LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support)
2013-01-31 21:19:24 +01:00
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +00:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
c6b3bdd5a0
Fixed compatibility with filecache rewrite merge
2013-01-31 17:51:46 +00:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
411e8e5218
Merge pull request #1365 from owncloud/ldap_multiple_server
...
LDAP: support for multiple LDAP/AD servers
2013-01-31 09:24:45 -08:00
afacaf8bc2
string fragment was added by accident and does not belong here
2013-01-31 18:00:07 +01:00
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
19714151e2
spell check
2013-01-31 17:53:01 +01:00
5862f3d140
spell check
2013-01-31 17:51:59 +01:00
2183f77527
Fixed incompatibilities with filecache rewrite merge
2013-01-31 16:49:07 +00:00
7f2d7cdbe1
spell check
2013-01-31 17:44:25 +01:00
a17a7f5cdb
adding l10n support to user_ldap
2013-01-31 17:43:24 +01:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
4162ba4d41
adding l10n support to files_trashbin
2013-01-31 16:48:41 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
8dd9dedee8
Merge pull request #1266 from schiesbn/trash_bin
...
Trash bin
2013-01-31 06:18:22 -08:00
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
c8a4878b77
is_writable() is now isUpdatable() with the new filesystem
2013-01-31 14:55:14 +01:00
dff5148f6d
debug output removed
2013-01-31 14:48:57 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
9c83b307f6
keep mtime
2013-01-31 10:50:02 +01:00
2ddd40ed41
rename 'undelete' to 'restore'
2013-01-31 10:06:02 +01:00
2f11d7fe12
LDAP: adjust settings interface for custom search attributes
2013-01-31 02:10:13 +01:00
1a854454d6
LDAP: avoid attempts to save null as configvalue
2013-01-31 02:00:29 +01:00
0b98dc30b2
LDAP: remove unnecessary placeholders, fixes PHP warnings
2013-01-31 01:56:16 +01:00
b5ed8b2751
LDAP: fix wrong index
2013-01-31 01:46:54 +01:00
b3b0544e17
LDAP: make it possible to define attributes that should be considered on searches
2013-01-31 01:46:34 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
c7b1bdf00e
Fixed handling of keyfile subdir creation
...
Improved keyfile subdir deletion (1 bug remains here)
2013-01-30 18:52:02 +00:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
95352fbc15
Files: Dont get maxUploadSize if the filecache needs to be upgraded
2013-01-30 19:19:19 +01:00
61b23ce6cc
Working on support for deleting directories (removing all keyfiles)
2013-01-30 17:25:17 +00:00
8ded07dd5c
first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
2013-01-30 17:49:05 +01:00
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
c62a38fcb1
add spinner for undelete operation for visualisation
2013-01-30 15:35:24 +01:00
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
8f388d9df4
LDAP: update link to online documentation
2013-01-30 13:48:59 +01:00
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
e6f1544f51
fix OC_Log::ERROR call
2013-01-30 13:04:32 +01:00
a6e5f4b85c
some minor improvements
2013-01-30 13:01:53 +01:00
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
5761bd771f
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
...
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 -08:00
d6adab6734
improved message if trash bin is empty
2013-01-30 10:07:29 +01:00
8fd263ef63
LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278
2013-01-30 03:57:46 +01:00
e8db1e884e
LDAP: some inline documentation
2013-01-30 03:44:11 +01:00
14bc6f8c6c
LDAP: working visual feedback on save. Save button will be highlighted green or red.
2013-01-30 03:34:51 +01:00
19867b1d08
LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix
2013-01-30 02:39:44 +01:00
a557522037
LDAP: send back error message properly
2013-01-30 02:39:11 +01:00
Björn Schießle
Thomas Mueller
Lukas Reschke
hkjolhede
Björn Schießle
Jörn Friedrich Dreyer
Robin Appelman
Bernhard Posselt
Michael Gapczynski
Sam Tuke
Thomas Tanghus
Sam Tuke
Georg Ehrke
Frank Karlitschek
Arthur Schiwon
Bart Visscher
Myles McNamara
TheSFReader
Jan-Christoph Borchardt
Stefan Herbrechtsmeier