Commit Graph

4765 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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