Commit Graph

9476 Commits

Author SHA1 Message Date
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
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 Müller f42ac97045 Merge pull request #1547 from owncloud/navigation-color
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
Thomas Müller 84657cbdab Merge pull request #1548 from owncloud/installation-improvements
Installation improvements
2013-02-08 13:27:15 -08:00
Bart Visscher ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Jan-Christoph Borchardt bebdd113f5 use proper HTML for other security warning too 2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt c73f525050 brighter grey for the navigation bar, hopefully solves the weird similarity to the header 2013-02-08 19:33:22 +01:00
Thomas Müller 12bdc6ddb6 Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
quick fixing this require_once.
2013-02-08 10:18:49 -08: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 Mueller 4c3d4f7d36 quick fixing this require_once.
On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.

Best would be to rename the lib/archive/tar.php or put it into a different folder
2013-02-08 15:23:07 +01:00
Bart Visscher 96042f1e5b Merge pull request #1539 from owncloud/fixing-1508-master
missing comma in sql statement
2013-02-08 05:25:00 -08:00
Thomas Müller 1158447499 missing comma in sql statement 2013-02-08 13:49:26 +01:00
Jan-Christoph Borchardt a26e66b232 improve and shorten security warning, add link to docs, fix #1342 2013-02-08 13:38:50 +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
icewind1991 3bd33b69a1 Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing
simplyfy mimetype parsing of 'file' output
2013-02-07 14:47:10 -08:00
Lukas Reschke 217328e0e3 Merge pull request #1514 from owncloud/fix-setup
Fix setup
2013-02-07 13:48:44 -08:00
Thomas Müller 867650ee47 Merge pull request #1529 from owncloud/installation-login-fixes
Installation login fixes
2013-02-07 13:40:25 -08: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
Bart Visscher a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +01:00
blizzz fc7230349b Merge pull request #1530 from owncloud/fix-warning-displayname-layout
Fix warning with displayname in user layout template
2013-02-07 11:25:33 -08:00
blizzz 07f504812c Merge pull request #1531 from owncloud/cron_no_routes
Fix router warnings when running as CLI
2013-02-07 11:22:58 -08:00
Robin Appelman 73ed62976d Fix previous commit 2013-02-07 18:30:01 +01:00
Robin Appelman f3f55654ce Use dummy request method in CLI 2013-02-07 18:28:56 +01:00
Jan-Christoph Borchardt 8ca730f4c1 make show password toggle work for installation (once #1525 is fixed) 2013-02-07 18:07:38 +01:00
Bart Visscher 20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Robin Appelman afa1a6d2b3 Don't try to use routes when called from cli 2013-02-07 17:53:38 +01:00
Jörn Friedrich Dreyer 1ef3e4c5c6 simplyfy mimetype parsing of 'file' output 2013-02-07 17:46:16 +01:00
Jan-Christoph Borchardt 32e739f2ae make show password not specific to log in 2013-02-07 17:41:24 +01:00
Jan-Christoph Borchardt ee6884e336 remove duplicate show password toggle code, move current one to proper location 2013-02-07 17:04:03 +01:00
Jan-Christoph Borchardt ae7a80ede3 some comments for CSS documentation 2013-02-07 17:02:43 +01:00
Jan-Christoph Borchardt 867dc8e6dc fix database labels having left padding 2013-02-07 16:57:54 +01:00
Thomas Mueller 5f92d269dc l10n support enhanced in core 2013-02-07 16:49:36 +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
Thomas Müller 0efcf33e2f Merge pull request #1451 from eMerzh/fix_1065
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08: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 8e70763cec Merge pull request #1522 from schiesbn/trash_bin_fix
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 04:38:22 -08:00