Commit Graph

9035 Commits

Author SHA1 Message Date
Jenkins for ownCloud 0c87f666ad [tx-robot] updated from transifex 2012-12-16 00:12:10 +01:00
Robin Appelman b12abb2c94 use numeric ids for storages in the filecache 2012-12-15 23:35:07 +01:00
Michael Gapczynski 8951769cae Check sub storage isn't null or false 2012-12-15 17:16:26 -05:00
Thomas Mueller 03f4250ce6 Migration of build files from Jenkins 2012-12-15 21:03:32 +01:00
Frank Karlitschek 30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Tom Needham 39b5199775 API: PUT and DELETE variables are now accessed from the parameters array 2012-12-15 12:37:44 +00:00
Robin Appelman cf3665057c make sure folders that are not fully scanned are at least shallow scanned when we open them
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman 4be039e6cb Filecache Watcher: use scan or scanFile based on the current item, not the cached item 2012-12-15 03:10:56 +01:00
Robin Appelman bc52f12162 dont insert and entry in the filecache during upgrade if the id already exists in the filecache
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
Robin Appelman c6a5ce54a7 these functions should be static 2012-12-15 02:22:09 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher 6ff38624a7 Merge pull request #875 from owncloud/multiplefiles_json
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
Bart Visscher df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher 85bd28c508 Fix some of "Closing brace must be on a line by itself" 2012-12-15 00:43:46 +01:00
Bart Visscher f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher 8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
Jenkins for ownCloud 9f5868cf18 [tx-robot] updated from transifex 2012-12-15 00:12:10 +01:00
root f381d2e9ed call it "proxy" instead of "curlproxy"
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-15 00:09:39 +01:00
Frank Karlitschek 262fecbe39 proper escape the mountpoints. Fixes
https://github.com/owncloud/core/issues/557
2012-12-14 23:31:50 +01:00
Jan-Christoph Borchardt 74d41b8b96 dim Default Storage label color a bit 2012-12-14 23:24:51 +01:00
Jan-Christoph Borchardt 4ee9d39422 change storage space 'none' to 'Unlimited' and capitalize Default 2012-12-14 23:22:55 +01:00
Jan-Christoph Borchardt 4acb2f70e1 change technical expression 'Quota' to simpler 'Storage' 2012-12-14 23:02:22 +01:00
Frank Karlitschek 2a55beab74 make it more readable as deepdiver suggested 2012-12-14 22:54:21 +01:00
Frank Karlitschek b6b4c4c920 add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504
2012-12-14 18:52:16 +01:00
Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Tom Needham 4facd766e3 Remove 3rdparty repo from ocs_api branch 2012-12-14 14:58:31 +00:00
Tom Needham c7a665a1e4 API: Tidy up routes.php, remove redundant call registration 2012-12-14 14:55:02 +00:00
Thomas Mueller e7c288a719 fixing links docu/ ->doc/ 2012-12-14 15:25:52 +01:00
Frank Karlitschek cde74fe248 make it more readable 2012-12-14 14:41:09 +01:00
Frank Karlitschek 5689c78ee6 rename to doc 2012-12-14 14:39:05 +01:00
Frank Karlitschek 4b80e500a5 add pointer to the existing documentation. This will be replaced by the rel documentation during packaging 2012-12-14 14:38:22 +01:00
Arthur Schiwon f0893fb8fe Give also hint about possible conflicts in the user_webdavauth description 2012-12-14 12:03:46 +01:00
Arthur Schiwon 414b7e8e03 Also show a more prominent warning when php_ldap is not installed 2012-12-14 12:03:29 +01:00
Arthur Schiwon b54390f432 Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:21 +01:00
Arthur Schiwon 5cbe8d637b Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:15 +01:00
Frank Karlitschek a871e300e2 Merge pull request #850 from owncloud/icons-for-login
Icons for login
2012-12-14 00:12:41 -08:00
Arthur Schiwon 627da205b3 implement getCurrentUser in Sabre Auth Connector, fixes #508 2012-12-14 01:06:09 +01:00
Arthur Schiwon 4466e06e7d use username, not passed loginname, might differ 2012-12-14 01:06:00 +01:00
Jenkins for ownCloud 6d7ae463df [tx-robot] updated from transifex 2012-12-14 00:17:42 +01:00
icewind1991 b156150b34 Merge pull request #876 from owncloud/mimicon_fix
fix mimetype icons for new files
2012-12-13 14:41:22 -08:00
Robin Appelman 1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Robin Appelman fda7d932ef remove unneeded line 2012-12-13 22:12:27 +01:00
Jan-Christoph Borchardt e0ada2c24f bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 2012-12-13 19:44:55 +01:00
Frank Karlitschek 79b8d67627 remove PgeNavi. It's no longer used 2012-12-13 19:26:05 +01:00
Jan-Christoph Borchardt 0bc2dc24cd remove transitions for file rows and actions because it made everything seem sluggish 2012-12-13 19:12:09 +01:00
Jan-Christoph Borchardt 316a29f7ac fix new button popup looking blurry 2012-12-13 19:04:27 +01:00
Robin Appelman 6a2b41e5e8 use json encoding when deleting multiply files instead of using ; as delimiter 2012-12-13 18:11:00 +01:00
blizzz 77c16b2933 Merge pull request #855 from owncloud/ungreenify
ungreenify new & upload buttons
2012-12-13 04:19:38 -08:00