Commit Graph

7991 Commits

Author SHA1 Message Date
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jenkins for ownCloud 401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +01:00
Robin Appelman 702444b242 fail gracefully when no old filecache is present during upgrade 2012-12-01 00:59:49 +01:00
Jenkins for ownCloud c7c5e2a2e2 [tx-robot] updated from transifex 2012-12-01 00:03:27 +01:00
Bart Visscher a3f18d4b5a Merge pull request #603 from owncloud/store_plain_groupname
Group name doesn't need to be sanitized before storing it in the database
2012-11-30 04:13:36 -08:00
Bart Visscher 8aba5874db Merge pull request #644 from butonic/checkstyle_fixes
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
Bart Visscher f820596825 Merge pull request #605 from owncloud/fix_false_positive_share_2
Sharing: Fix false positived v. 2
2012-11-30 04:02:18 -08:00
Bart Visscher 4db53f9d8e Merge pull request #619 from samtuke/versions_cache
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Robin Appelman dbbb357f62 add upgrade path from old cache to preserve file id's 2012-11-30 01:41:30 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jenkins for ownCloud 16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Thomas Müller 9b709fa95d Merge pull request #635 from owncloud/ob_end
provide a safe way to end output buffering
2012-11-29 13:50:49 -08:00
Jörn Friedrich Dreyer 3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Robin Appelman bcb27c81d4 use new obEnd function instead of ob_end_clean 2012-11-29 18:01:21 +01:00
Robin Appelman 59d5aa2cb7 add function to safely end output buffering 2012-11-29 17:58:24 +01:00
Georg Ehrke c38a75e03f Merge pull request #620 from owncloud/fix_600
Fix #600
2012-11-29 05:39:45 -08:00
Georg Ehrke e5af24d084 use attr instead of data 2012-11-29 13:56:07 +01:00
Georg Ehrke 1d1ab2a911 Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit a5774229a1.
2012-11-29 13:37:37 +01:00
blizzz 77ad5dc92e Merge pull request #617 from samtuke/fix_docblocks
Cleaned up docblock comments
2012-11-29 01:53:07 -08:00
Jenkins for ownCloud 6c3f43b061 [tx-robot] updated from transifex 2012-11-29 00:04:57 +01:00
Thomas Müller 1ac6d885e6 Merge pull request #540 from Raydiation/master
More tests for lib/group.php
2012-11-28 14:29:23 -08:00
Georg Ehrke 4c83a4c918 add a client side check 2012-11-28 18:40:58 +01:00
Georg Ehrke a5774229a1 fix group and subadmin managing for 'ajax-loaded' users 2012-11-28 18:40:00 +01:00
Bernhard Posselt 37e524dc6d added more unittests for the group file 2012-11-28 18:30:47 +01:00
Georg Ehrke ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher 9717cdb42e Merge pull request #601 from butonic/add_drag_shadow_in_firefox
show drag shadow in firefox by using helper:'clone'
2012-11-28 09:00:12 -08:00
Sam Tuke 6975c5537b OC_FSV->copy now only caches files which are copied from data/user/files
Added contextual comments
2012-11-28 16:57:44 +00:00
Sam Tuke 60f4ea8ddc Cleaned up docblock comments 2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer eaa625c9bc Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jenkins for ownCloud 1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Thomas Tanghus 5c9faf396a Sharing: Fix false positived v. 2 2012-11-27 23:01:26 +01:00
Bart Visscher 80d1037e42 Group name does't need to be sanitized before storing it in the database
It should only be sanitized before display
2012-11-27 20:22:45 +01:00
Jörn Friedrich Dreyer 9a441d3e3a show drag shadow in firefox by using helper:'clone' 2012-11-27 17:38:21 +01:00
Jenkins for ownCloud d251f04b98 [tx-robot] updated from transifex 2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer 71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
2012-11-26 07:42:53 -08:00
Jörn Friedrich Dreyer 588bbd2c9f Merge pull request #573 from owncloud/more_indexes
more db indexes
2012-11-26 06:17:27 -08:00
Arthur Schiwon 74cf3b5dfb use normalizePath to have a proper target path 2012-11-26 14:35:13 +01:00
Arthur Schiwon 4c707d1b1f remove debug output 2012-11-26 14:35:02 +01:00
Arthur Schiwon e5ad774ab0 coding style 2012-11-26 14:34:51 +01:00
Arthur Schiwon 4764876192 check whether to join url with ? or & 2012-11-26 14:34:41 +01:00
Arthur Schiwon 776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Arthur Schiwon fdc7a8b204 make sure path starts with / 2012-11-26 14:34:09 +01:00
Jenkins for ownCloud 7892204077 [tx-robot] updated from transifex 2012-11-26 00:02:04 +01:00
Robin Appelman a609992a75 better check if we are passing a fileid to Cache::get 2012-11-25 16:30:57 +01:00
Robin Appelman 0cfef83ed9 sort output of getFolderContent by name 2012-11-25 16:08:35 +01:00
Robin Appelman 03fd43a239 Merge branch 'master' into filesystem 2012-11-25 15:38:17 +01:00
Thomas Müller f005254a91 Merge pull request #576 from owncloud/webdav_output_buffer
make sure the output buffer is closed when handeling webdav
2012-11-25 06:15:08 -08:00
Frank Karlitschek f712ca61df remove the index on the share table because of problems with the index size. Thanks to icewind for spotting this. 2012-11-25 15:09:07 +01:00
Robin Appelman eaf8399aaf make sure the output buffer is closed when handeling webdav 2012-11-25 14:45:13 +01:00
Robin Appelman ffd14dfd09 add sample configuration for user backends 2012-11-25 14:43:45 +01:00