Commit Graph

8610 Commits

Author SHA1 Message Date
Thomas Mueller 938254a1c0 load jquery-visibility 2013-01-11 16:45:32 +01:00
Thomas Mueller 362860c5b5 adding jquery-visibility
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
Lukas Reschke 1eb3c8ecf6 Correct link to the bugtracker in exception.php 2013-01-11 16:42:06 +01:00
Lukas Reschke ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +01:00
Björn Schießle 99a0ea44ee function description fixed 2013-01-11 14:24:00 +01:00
Björn Schießle 67d00bc6bb some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed 2013-01-11 14:23:28 +01:00
Lukas Reschke 466cdab680 Add security section to admin menu
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
Björn Schießle 6be9c0a974 some code clean-up 2013-01-11 11:12:32 +01:00
Thomas Mueller 23896a7290 Merge branch 'master' into fixing-784-master
Conflicts:
	apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Thomas Müller 60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Sean Comeau ba9c967435 Throw an exception when creating a MySQL user fails and display exception error text to user 2013-01-10 14:43:08 -08:00
Sam Tuke fed74eda1c Removed old and unnecessary comments 2013-01-10 18:48:40 +00:00
Sam Tuke 2e30641caa Removed misleading crypto gen comment 2013-01-10 18:19:37 +00:00
Sam Tuke 3e83023bf6 Removed unnecessary line 2013-01-10 18:16:56 +00:00
Sam Tuke 0579b52092 Removed phantom depreciated files 2013-01-10 18:14:15 +00:00
Sam Tuke 9ca9124dc1 Merge branch 'master' into files_encryption 2013-01-10 18:07:15 +00:00
Sam Tuke 61104d1441 Re-added 'checkAdminUser'
Improved code formatting
2013-01-10 18:04:52 +00:00
Björn Schießle dca0fda2ad keep track of the size of the versions directory 2013-01-10 18:04:30 +01:00
Thomas Müller 23dd7f1bea Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Björn Schießle 417498d519 add complete size of versions to array 2013-01-10 10:36:55 +01:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Lukas Reschke fda1ada4f0 Merge pull request #1131 from owncloud/more_translations
translate move and rename error messages
2013-01-09 12:07:39 -08:00
Lukas Reschke ca027f3749 Merge pull request #1124 from schiesbn/sabredav2
OC_Connector_Sabre_Client no longer needed
2013-01-09 12:06:25 -08:00
Björn Schießle d51fba7781 every 1000s run reduce the number of versions for all files, not only for the currently edited file 2013-01-09 17:11:46 +01:00
Jörn Friedrich Dreyer 780fb37758 allow default click behaviour 2013-01-09 15:21:55 +01:00
Jörn Friedrich Dreyer 42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Jörn Friedrich Dreyer a40c95242f more translations 2013-01-09 12:48:57 +01:00
Thomas Mueller ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Jenkins for ownCloud 533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Thomas Tanghus dae8f15f9f Merge pull request #938 from owncloud/fix_minor_files_annoyances
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Arthur Schiwon 4a8c25eef5 dechex not necessary, do not waste time with it 2013-01-08 19:25:19 +01:00
Arthur Schiwon 19fa78d1ee Code style 2013-01-08 19:00:49 +01:00
Björn Schießle 43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client.
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
Thomas Mueller 7b9e6d2f2c fixing string concatenation in javascript
refs ae54364d7c
2013-01-08 00:32:41 +01:00
Jenkins for ownCloud b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Bernhard Posselt 75dbe88664 added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method 2013-01-07 21:57:13 +01:00
Thomas Mueller e475c26f1a fixing <input> tag 2013-01-07 21:23:14 +01:00
Michael Gapczynski 2012603b74 Merge branch 'master' into fix-issue-1085 2013-01-07 14:16:32 -05:00
Michael Gapczynski d39655e126 Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
Frank Karlitschek 861f32a22b Update apps/user_webdavauth/user_webdavauth.php
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
2013-01-07 16:45:03 +01:00
Bernhard Posselt 5ccbfd9079 readded ocs routes 2013-01-07 15:48:45 +01:00
Bernhard Posselt f80bc4ed53 fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge 2013-01-07 15:34:42 +01:00
Björn Schießle a0b0a1d294 adjust timestamp of the file copied from the version history 2013-01-07 15:13:32 +01:00
Jörn Friedrich Dreyer 0dda8f5d1c ie8 ignores rgba, show button border in ie8 by adding second border css row 2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer 3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Björn Schießle 619c3ef56d use limits defined in issue https://github.com/owncloud/core/issues/860 2013-01-07 12:06:31 +01:00
Jörn Friedrich Dreyer da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Jörn Friedrich Dreyer 3dbb148567 Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields
remove css not selector - incompatible with ie8
2013-01-07 01:17:19 -08:00