mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,541 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

4661 Commits

Author SHA1 Message Date
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
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +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
Jörn Friedrich Dreyer 676f89bbdb extract common code 2013-02-09 14:42:03 +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
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
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
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
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