Björn Schießle
686254ac11
move2trash() handles keyfiles
2013-02-19 18:45:46 +01:00
Björn Schießle
211e651d72
add timestamp to function call; fix trash.js to handle multiple delete operation at once
2013-02-19 12:38:00 +01:00
Björn Schießle
7bfbfe6562
initialize $result
2013-02-19 12:24:51 +01:00
Björn Schießle
f45b268b93
rebase to master
2013-02-19 12:16:54 +01:00
Björn Schießle
e6c39fc3e7
change $_REQUEST to $_POST; fix check if file was successfully deleted
2013-02-19 12:14:44 +01:00
Björn Schießle
95751874a1
Merge pull request #1740 from houqp/issue#1688
...
Bug fix for Issue#1688
2013-02-19 03:09:03 -08:00
Björn Schießle
ac1b2a74ef
add missing paramenter to post request
2013-02-19 11:50:29 +01:00
Björn Schießle
815e964362
use instead of
2013-02-19 11:49:41 +01:00
Lukas Reschke
3d7545269b
Merge pull request #1764 from owncloud/Undelete_directory_fix
...
Fix for Undelete directory action
2013-02-19 01:34:49 -08:00
Björn Schießle
51cef9d8f0
allow user to delete selected files from the trash bin permanently
2013-02-19 10:24:21 +01:00
Björn Schießle
9a93db9642
remove obsolete variables
2013-02-19 10:23:34 +01:00
Thomas Müller
c56542c58d
Merge pull request #1771 from owncloud/mountconfig
...
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
Thomas Mueller
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
Jenkins for ownCloud
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
Thomas Müller
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
Thomas Mueller
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
Victor Dubiniuk
e2f87e456f
Calculate size for existing directories only
2013-02-18 23:48:08 +03:00
Björn Schießle
37352bba96
close file handler after readdir()
2013-02-18 18:16:19 +01:00
Thomas Müller
0ab87204ec
Merge pull request #1759 from owncloud/redirect_fix_1737
...
fix redirect, use the new routing
2013-02-18 07:13:19 -08:00
Qingping Hou
c0ac98066e
check filename and timestamp in Trashbin's file_exists method
2013-02-18 09:49:50 -05:00
Robin Appelman
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
2013-02-18 15:13:25 +01:00
Robin Appelman
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
Björn Schießle
4a3374ecf8
fix redirect, use the new routing
2013-02-18 14:38:29 +01:00
VicDeo
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +03:00
Björn Schießle
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
Lukas Reschke
79284b8e57
Sanitize HTML
2013-02-18 08:11:59 +01:00
Jenkins for ownCloud
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
Thomas Müller
8e76a98d2f
Merge pull request #1709 from owncloud/style-cleanup-files_external
...
Style cleanup files_external
2013-02-17 11:53:51 -08:00
Bernhard Posselt
90939c8f12
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
...
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
Thomas Mueller
325746ae45
Merge branch 'master' into fix-googledrive
2013-02-17 09:41:37 +01:00
Thomas Müller
0f8058cb12
Merge pull request #1699 from owncloud/multiselect-bar-fix
...
fix multiselect bar offset on shared page, close #1339 finally
2013-02-17 00:39:16 -08:00
Thomas Müller
71472c21ed
Merge pull request #1730 from owncloud/ldap_fix_warnings
...
LDAP: check array with isset first to avoid warnings about undefined ind...
2013-02-17 00:25:40 -08:00
Jenkins for ownCloud
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
Qingping Hou
4b4b1f8692
Properly delete empty directories in Trashbin
...
Instead of checking delted file size, we do a real check.
this fixes #1688
2013-02-16 17:44:51 -05:00
Qingping Hou
50759607e4
add file_exists method to files_trashbin app
2013-02-16 17:42:06 -05:00
Frank Karlitschek
17d21a84b6
Merge pull request #1729 from owncloud/fix_1727
...
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
2013-02-16 05:48:18 -08:00
Lukas Reschke
4708d4549d
Add missing requesttoken
...
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
Jörn Friedrich Dreyer
cad65915a7
look where you are typing ...
2013-02-16 12:55:36 +01:00
Jörn Friedrich Dreyer
e1700c28fa
pretty print json
2013-02-16 12:10:54 +01:00
Robin Appelman
d96146a017
Give storage backends the option to define having no known free space
...
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
Arthur Schiwon
a28df74ee5
LDAP: check array with isset first to avoid warnings about undefined index
2013-02-16 02:33:19 +01:00
Arthur Schiwon
bef48bad8b
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727
2013-02-16 02:06:45 +01:00
Robin Appelman
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
Jenkins for ownCloud
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
Bart Visscher
6c197227d0
Join split translated strings
2013-02-15 15:58:52 +01:00
Bart Visscher
5616690506
Style cleanup files_external
2013-02-15 15:58:52 +01:00
Bart Visscher
925de78cec
Join split translated strings
2013-02-15 15:51:55 +01:00
Bart Visscher
92a36ca8b8
Join short comment lines
2013-02-15 15:45:34 +01:00
Jan-Christoph Borchardt
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
Björn Schießle
08b68aac6c
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
2013-02-15 12:29:52 +01:00
Jenkins for ownCloud
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
Bart Visscher
1ef2ecd6e8
Style cleanup user_ldap
2013-02-14 22:16:48 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Jan-Christoph Borchardt
d1dcb282cb
fix multiselect bar offset on shared page, close #1339 finally
2013-02-14 17:40:08 +01:00
Thomas Mueller
6a250c877f
fixing javascript errors IE8 in personal settings
2013-02-14 16:10:52 +01:00
Bart Visscher
f4c9d4c067
Merge pull request #1682 from owncloud/fix-ie8-master
...
Fix ie8 master
2013-02-14 06:10:00 -08:00
Björn Schießle
b05f05ec4a
make store function static
2013-02-14 14:26:49 +01:00
Björn Schießle
ae172ce7de
improved description of the trash bin app
2013-02-14 13:01:02 +01:00
Björn Schießle
bd22e948ca
call 'Trash bin' 'Deleted files'
2013-02-14 12:32:14 +01:00
Thomas Mueller
a03d70209f
fixing undefined originalEvent
2013-02-14 12:19:50 +01:00
Björn Schießle
87b98dab25
use new filesystem to mount users home
2013-02-14 11:56:41 +01:00
Jan-Christoph Borchardt
b8a6bca2d3
always show checkbox when selected, also in IE8, fix #1621
2013-02-14 10:40:23 +01:00
Bart Visscher
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
Thomas Müller
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
Arthur Schiwon
1e45453da2
LDAP: format dn before using it, not other way round. fixes #1605
2013-02-13 14:49:18 +01:00
Thomas Mueller
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
Thomas Mueller
037c3ee4ec
fixing issues with UTF8 characters in translatable strings
2013-02-13 00:23:37 +01:00
Jenkins for ownCloud
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
Thomas Mueller
010c4c2891
adding spinner while talking to the backend
2013-02-12 23:27:31 +01:00
Thomas Mueller
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
Thomas Mueller
318c0b3408
user name and password need to be encoded as well
...
fixes #1652
2013-02-12 15:56:31 +01:00
Jenkins for ownCloud
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
Thomas Mueller
14e3d77d64
https://github.com/owncloud/core/pull/1598#discussion_r2976684
2013-02-12 13:10:26 +01:00
blizzz
b6ee118841
Merge pull request #1604 from owncloud/fix_ldap_internalname_generation
...
Improve generation of interal user names resp. group display names
2013-02-12 03:37:40 -08:00
Lukas Reschke
a9c77ebaf8
Check requesttoken
2013-02-12 11:35:16 +01:00
Thomas Mueller
6b594c1eb8
fixing namespace
2013-02-12 11:05:12 +01:00
Thomas Mueller
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
Thomas Mueller
646d60ee83
fixing namespace
2013-02-12 11:00:38 +01:00
Frank Karlitschek
2507e0da1d
Merge pull request #1636 from owncloud/fixing-smb-master
...
Fixing smb master
2013-02-11 23:38:03 -08:00
Michael Gapczynski
ad6e133ca6
Replace another mount point placeholder
2013-02-11 20:35:40 -05:00
Michael Gapczynski
6eba790a75
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
2013-02-11 20:27:05 -05:00
Jenkins for ownCloud
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
Michael Gapczynski
6f08b1f829
Change wordings
2013-02-11 18:04:54 -05:00
Michael Gapczynski
808a13922c
Remove the leading slash from the filename for opendir
2013-02-11 17:55:44 -05:00
Thomas Mueller
5731a1b01c
introduce new virtual method hasUserListings() to determine if a user backend can list it's users.
2013-02-11 22:01:52 +01:00
Thomas Mueller
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
Thomas Mueller
0c1174770d
use urlencode not rawurlencode
2013-02-11 21:25:29 +01:00
Thomas Müller
2cb2644254
Merge pull request #1613 from owncloud/multiselect-row-width
...
Files: fix width of table header when files are selected
2013-02-11 11:49:08 -08:00
Thomas Mueller
392be78162
the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still .....
2013-02-11 20:32:44 +01:00
Jan-Christoph Borchardt
ca99ff31dc
Merge pull request #1627 from owncloud/home-svg
...
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 08:02:14 -08:00
Jan-Christoph Borchardt
130f1006c1
Merge pull request #1626 from owncloud/share-indicator-position
...
Files: always show share action at the right
2013-02-11 07:43:04 -08:00
Jan-Christoph Borchardt
9c8f5de6c6
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 16:19:22 +01:00
Robin Appelman
37ea784294
Files: always show share action at the right
...
Fixes #1619
2013-02-11 16:09:04 +01:00
Thomas Mueller
7776d047b2
[files_external] fix config gui for all users
...
backport of 9e05781ec2
2013-02-11 15:49:49 +01:00
Thomas Mueller
f512dea3be
[files_external] fixing some undefined index
2013-02-11 15:45:10 +01:00
Thomas Mueller
89bc26210a
[files_external] removing function as it's the same in the base class - THX Robin
...
Conflicts:
apps/files_external/lib/smb.php
2013-02-11 15:44:35 +01:00
Jenkins for ownCloud
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
Lukas Reschke
eed48c8159
Merge pull request #1608 from owncloud/fix-shared-links
...
Fix shared links
2013-02-11 05:17:24 -08:00
Robin Appelman
d0d6d973a9
Share: fix table head color for public shared folders
2013-02-11 12:35:39 +01:00
Robin Appelman
25b5b39e7a
Files: fix width of table header when files are selected
2013-02-11 12:23:53 +01:00
Robin Appelman
a1db280a46
Share: fix downloading selected files from public shared folder
2013-02-11 11:54:44 +01:00
Robin Appelman
7fa9181a26
Share: fix sorting of files in public shared folder
2013-02-11 11:50:41 +01:00
Robin Appelman
bbf672f453
Share: fix nested subfolders in public shared folders
2013-02-11 11:48:49 +01:00
Robin Appelman
7842b416d1
Share: fix breadcrumbs for public shared folder
2013-02-11 11:44:18 +01:00
Robin Appelman
762688762f
Share: fix downloading files from a public shared folder
2013-02-11 11:38:52 +01:00
Robin Appelman
d0a005ea97
Sharing: fix position of file list in public link view of folder
2013-02-11 11:20:51 +01:00
Robin Appelman
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
Björn Schießle
d7d9e2a15a
fix positioning of password label, add autofocus to password field
2013-02-11 10:20:31 +01:00
Michael Gapczynski
a6bd086867
Set permissions to read only
2013-02-10 20:01:25 -05:00
Michael Gapczynski
56df48b40f
Remove additional old compatibility code
2013-02-10 19:14:20 -05:00
Michael Gapczynski
0d3c58d6b6
Replace filename key with fileTarget in template
2013-02-10 19:13:13 -05:00
Michael Gapczynski
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
Michael Gapczynski
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
Jenkins for ownCloud
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
Arthur Schiwon
afc9fe419a
adjust copyright
2013-02-10 21:53:27 +01:00
Arthur Schiwon
dbb4be903c
LDAP: change generation of internal names. Use UUID for users. Change to sequential numbers for groups as they are still used as display names
2013-02-10 21:52:57 +01:00
Björn Schießle
046ede8e46
Merge pull request #1558 from schiesbn/trashbin_sizelimit
...
Trashbin sizelimit
2013-02-10 09:02:05 -08:00
Thomas Mueller
f58ed7a509
no need to implement createUser in web dav auth
2013-02-10 17:31:12 +01:00
Lukas Reschke
980c197fbf
Merge pull request #1594 from hkjolhede/master
...
Corrected namespace path for files_external SFTP backend
2013-02-10 06:47:22 -08:00
Lukas Reschke
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
hkjolhede
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
Tom Needham
f141f8b523
Add further capabilities to /cloud/capabilitites api call
2013-02-10 14:42:23 +01:00
Björn Schießle
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
Lukas Reschke
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
Henrik Kjölhede
421bacc33a
Final changes from icewind1991
2013-02-10 13:11:29 +01:00
Tom Needham
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
Jörn Friedrich Dreyer
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
Henrik Kjölhede
1df8a5a774
Updated phpseclib from git + requested style changes
2013-02-10 12:35:49 +01:00
Tom Needham
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
Jörn Friedrich Dreyer
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
Robin Appelman
b44c18d164
Don't run external storage tests on default
2013-02-10 11:39:32 +01:00
Björn Schießle
b7b50f8082
remove hascontrols from trash bin file list table
2013-02-10 11:14:03 +01:00
Bernhard Posselt
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
Michael Gapczynski
c6985d6cd4
Merge branch 'master' into fix-shared-links
2013-02-10 00:54:20 -05:00
Michael Gapczynski
71affd528c
Fix public links
2013-02-10 00:53:58 -05:00
Jenkins for ownCloud
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
Henrik Kjölhede
c6622301e5
Security bug
2013-02-09 23:49:21 +01:00
Henrik Kjölhede
bcf98879cb
Just a little cleaner in touch
2013-02-09 23:33:01 +01:00
Henrik Kjölhede
9e42a36fd8
Update to touch
2013-02-09 23:29:58 +01:00
Henrik Kjölhede
674955d1b6
Spelling mistake
2013-02-09 20:35:48 +01:00
Henrik Kjölhede
71d3903cfd
Added unittest
2013-02-09 20:34:21 +01:00
Henrik Kjölhede
96cfe37587
Update to conform to API changes
2013-02-09 19:08:39 +01:00
Thomas Müller
2a650bcbe9
Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir
...
extract common code
2013-02-09 09:57:23 -08:00
Sam Tuke
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
Thomas Müller
7f58e27495
cleanup - more to come after
2013-02-09 18:01:38 +01:00
Thomas Tanghus
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
Henrik Kjölhede
3b029d551c
corrected namespace
2013-02-09 15:57:33 +01:00
Jörn Friedrich Dreyer
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
Henrik Kjölhede
81a281a140
Modified to new class structure
2013-02-09 14:12:17 +01:00
Henrik Kjölhede
2b4823d62d
Deleted phpseclib/tests
2013-02-09 14:07:18 +01:00
Henrik Kjölhede
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
Thomas Tanghus
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
Tom Needham
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
Tom Needham
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
Jörn Friedrich Dreyer
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
Tom Needham
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
Sam Tuke
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
Björn Schießle
d5dc8ae726
initialize breadcrumbs array
2013-02-09 12:41:47 +01:00
Georg Ehrke
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
Björn Schießle
7507b1ddd3
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
2013-02-09 12:32:08 +01:00
Bernhard Posselt
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
Bernhard Posselt
c5fd9cc0c2
Merge pull request #1562 from schiesbn/fix_naming
...
rename trash to trash bin
2013-02-09 03:21:30 -08:00
Björn Schießle
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
Björn Schießle
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
Georg Ehrke
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
Björn Schießle
60cc7d0ba2
debug output removed
2013-02-09 11:11:07 +01:00
Björn Schießle
b24e3f1d32
comment added
2013-02-09 11:07:47 +01:00
Jörn Friedrich Dreyer
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
Jörn Friedrich Dreyer
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
Frank Karlitschek
764409117a
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
...
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
Arthur Schiwon
1c94ec71ef
LDAP: fix database cleanup in update script
2013-02-09 13:10:53 +01:00
Jenkins for ownCloud
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
Thomas Tanghus
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
Bart Visscher
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
Thomas Müller
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
Thomas Müller
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
Thomas Müller
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
Robin Appelman
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
Jenkins for ownCloud
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
Robin Appelman
f93f9dd50c
merge master into trash_fileactions
2013-02-08 00:11:54 +01:00
Robin Appelman
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
Robin Appelman
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
Bart Visscher
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
Lukas Reschke
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
Björn Schießle
808de17aeb
use never more that 50% of available disc space for the trash bin
2013-02-07 17:37:46 +01:00
Thomas Mueller
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
Thomas Mueller
18a288a3c3
l10n support enhanced in files_trashbin
2013-02-07 16:31:04 +01:00
Thomas Mueller
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
blizzz
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
Arthur Schiwon
15e383fd01
Typo
2013-02-07 16:05:45 +01:00
Björn Schießle
ca43e09276
keep track of trash bin size
2013-02-07 15:16:29 +01:00
blizzz
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
Björn Schießle
ce293b8efc
remove debug output
2013-02-07 13:16:15 +01:00
Björn Schießle
7e874af2c8
rename OCA_Trash to OCA\Files_Trashbin
2013-02-07 13:14:45 +01:00
Björn Schießle
c81d7b0b90
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 12:45:27 +01:00
Björn Schießle
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
Björn Schießle
17384994d6
add class hascontrols to trash bin file table
2013-02-07 10:13:09 +01:00
Jenkins for ownCloud
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
Lukas Reschke
93b1597395
Merge pull request #1506 from owncloud/files_encryption
...
Files encryption
2013-02-06 11:47:55 -08:00
Lukas Reschke
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
Myles McNamara
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
Sam Tuke
faf6cb0868
Merge branch 'master' into files_encryption
2013-02-06 18:26:44 +00:00
Sam Tuke
954a627483
Added comment
2013-02-06 18:24:35 +00:00
Michael Gapczynski
cc19df22a1
Remove old OC4 link compatibility
2013-02-06 13:09:04 -05:00
Sam Tuke
2b07afc8ab
Removed debugging code
2013-02-06 17:59:47 +00:00
Thomas Müller
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
Thomas Tanghus
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
Björn Schießle
fd171a4f34
copy&paste bug, no fetchAll() needed here
2013-02-06 16:50:16 +01:00
Björn Schießle
8cc7bab0e5
delete debug code
2013-02-06 16:25:10 +01:00
Björn Schießle
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
Sam Tuke
a3289d3991
Merge branch 'master' into files_encryption
2013-02-06 15:08:53 +00:00
Sam Tuke
6870add18f
Development snapshot
2013-02-06 15:08:36 +00:00
Thomas Müller
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
Sam Tuke
16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
Arthur Schiwon
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
Arthur Schiwon
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
Arthur Schiwon
33ec26f6d6
LDAP: info string improved
2013-02-06 14:24:00 +01:00
Arthur Schiwon
af2acadc66
LDAP: fix settings handling of homeFolderNamingRule option
2013-02-06 13:04:35 +01:00
Bart Visscher
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
Arthur Schiwon
993831b6df
LDAP: version bump -> clean up database
2013-02-06 02:29:55 +01:00
Arthur Schiwon
c6aa370604
code style
2013-02-06 02:29:03 +01:00
Arthur Schiwon
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
Jenkins for ownCloud
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
Sam Tuke
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
Sam Tuke
a528f96b84
Merge branch 'master' into files_encryption-style-fixes
2013-02-05 18:23:03 +00:00
Lukas Reschke
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
Sam Tuke
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
Sam Tuke
4ba0ab7f65
Added missing translation wrapping
2013-02-05 17:22:59 +00:00
Sam Tuke
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
Bart Visscher
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
Bart Visscher
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
Sam Tuke
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
Sam Tuke
221b69dd0e
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
2013-02-05 16:09:01 +00:00
Sam Tuke
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
Sam Tuke
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
Sam Tuke
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
Sam Tuke
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
Michael Gapczynski
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Thomas Tanghus
68fe6d0077
Merge pull request #1432 from owncloud/add_requesttoken
...
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
Thomas Tanghus
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
Björn Schießle
fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
Lukas Reschke
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
Thomas Müller
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
Thomas Müller
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
Robin Appelman
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Lukas Reschke
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
Lukas Reschke
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
Thomas Tanghus
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
Thomas Müller
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
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
TheSFReader
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
Lukas Reschke
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
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Arthur Schiwon
10ad5f923a
remove ugly whitespace
2013-02-01 23:52:41 +01:00
Arthur Schiwon
a7d82ad0ee
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
2013-02-01 23:48:22 +01:00
TheSFReader
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
Sam Tuke
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
TheSFReader
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
Thomas Mueller
fb0a5f3224
undelete -> restore
2013-02-01 00:43:52 +01:00
Jenkins for ownCloud
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
Michael Gapczynski
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Thomas Mueller
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
Thomas Mueller
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
Thomas Müller
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
Thomas Mueller
fc585623a5
spell check
...
👍
2013-01-31 22:49:07 +01:00
Arthur Schiwon
a1dc24c9da
LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support)
2013-01-31 21:19:24 +01:00
Sam Tuke
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +00:00
Robin Appelman
697536cf6a
Trash: use the same sorting algoritm as files
2013-01-31 19:36:59 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Robin Appelman
9d74ce4595
Trash: fix opening folders
2013-01-31 19:20:22 +01:00
Sam Tuke
c6b3bdd5a0
Fixed compatibility with filecache rewrite merge
2013-01-31 17:51:46 +00:00
Stefan Herbrechtsmeier
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
blizzz
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
Robin Appelman
3756f235ce
Trash: enable fileactions while viewing trash
2013-01-31 18:14:22 +01:00
Robin Appelman
73cd116968
Trash: don't use depricated filesystem api classes
2013-01-31 18:04:00 +01:00
Arthur Schiwon
afacaf8bc2
string fragment was added by accident and does not belong here
2013-01-31 18:00:07 +01:00
Robin Appelman
4d3d8ed296
Trash: highlight Files navigation entry while in trash
2013-01-31 17:59:01 +01:00
Robin Appelman
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
Thomas Mueller
19714151e2
spell check
2013-01-31 17:53:01 +01:00
Thomas Mueller
5862f3d140
spell check
2013-01-31 17:51:59 +01:00
Sam Tuke
2183f77527
Fixed incompatibilities with filecache rewrite merge
2013-01-31 16:49:07 +00:00
Thomas Mueller
7f2d7cdbe1
spell check
2013-01-31 17:44:25 +01:00
Thomas Mueller
a17a7f5cdb
adding l10n support to user_ldap
2013-01-31 17:43:24 +01:00
Sam Tuke
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Thomas Mueller
4162ba4d41
adding l10n support to files_trashbin
2013-01-31 16:48:41 +01:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Björn Schießle
8dd9dedee8
Merge pull request #1266 from schiesbn/trash_bin
...
Trash bin
2013-01-31 06:18:22 -08:00
Robin Appelman
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
Björn Schießle
c8a4878b77
is_writable() is now isUpdatable() with the new filesystem
2013-01-31 14:55:14 +01:00
Björn Schießle
dff5148f6d
debug output removed
2013-01-31 14:48:57 +01:00
Björn Schießle
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
Björn Schießle
9c83b307f6
keep mtime
2013-01-31 10:50:02 +01:00