Commit Graph

759 Commits

Author SHA1 Message Date
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +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
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
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +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
Georg Ehrke 2137bbe330 remove code properly 2013-02-09 12:38:40 +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
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
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01: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
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 e2516a2b65 allow to delete single files from the trash bin permanently 2013-02-06 16:23:22 +01:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01: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 b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +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
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
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
TheSFReader d8f6595c5e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-01 23:28:20 +01:00
TheSFReader 469b1e8dd2 Correct it 2013-02-01 20:29:02 +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