Commit Graph

10614 Commits

Author SHA1 Message Date
Thomas Tanghus 74852243e2 Merge pull request #2567 from owncloud/fix_insertIfNotExist
Properly prepare insertIfNotExist queries.
2013-03-26 08:59:10 -07:00
Björn Schießle e717f7150e check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete 2013-03-26 16:52:58 +01:00
Thomas Mueller cf50e67e1b prevent to fire delete ajax a second time.
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
Björn Schießle 73157133e8 reuse function provided in util.php 2013-03-26 16:22:26 +01:00
Björn Schießle 6beeb2466f also delete share keys if a different user than the owner deletes a shared file 2013-03-26 16:17:26 +01:00
Björn Schießle b1d620300e delete share keys if file gets deleted 2013-03-26 14:22:18 +01:00
Thomas Mueller e0e5cb73bf fixes #1461 2013-03-26 14:14:30 +01:00
Björn Schießle 5f233ee814 get the correct paths and owner to access shared files 2013-03-26 12:40:31 +01:00
Björn Schießle a65d741a3f move getUidAndFilename() tu util.php 2013-03-26 12:39:55 +01:00
Björn Schießle 890f0142a2 get shared keys from new location 2013-03-26 12:24:04 +01:00
Björn Schießle 5995b6996b always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later 2013-03-26 12:23:28 +01:00
Björn Schießle f10be4ea17 new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir) 2013-03-26 11:58:54 +01:00
Bernhard Posselt d49e8ffb5e Merge pull request #2568 from itheiss/master
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
itheiss f0733b2cb5 fix missing ',' after "mail_domain" parameter 2013-03-26 10:37:07 +01:00
Björn Schießle d121180d46 Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
itheiss 02d53deecc Update to reflect new parameter mail_domain
see #2568
2013-03-26 09:49:51 +01:00
Björn Schießle d16dd1ad2a listen to touch hook to update the mtime after sync 2013-03-26 09:42:55 +01:00
itheiss 410b991221 Move testcase to own test function
Move testcase for getDefaultEmailAddress with mail_domain set in config.php to own test function.
2013-03-26 09:40:27 +01:00
Thomas Tanghus 5b66b317b1 And removing an irrelevant comment ;) 2013-03-26 01:01:38 +01:00
Thomas Tanghus 5f53145eb0 Double quotes to backticks 2013-03-26 01:00:15 +01:00
Thomas Tanghus 9d618005b6 Missing backticks. Thx @Raydiation :) 2013-03-26 00:24:08 +01:00
Thomas Tanghus 5e81016392 D'oh, why concatenate static strings. 2013-03-26 00:21:57 +01:00
Thomas Tanghus 07236800a7 Quote key for SQLite. 2013-03-26 00:19:23 +01:00
Thomas Tanghus 1c3f5ba6ef Properly prepare insertIfNotExist queries. 2013-03-25 23:59:34 +01:00
Björn Schießle c2a49b5c1f the old path no longer exists after rename, update the parent folder instead 2013-03-25 14:21:06 +01:00
Arthur Schiwon 8b3dd87846 LDAP: fix wrong return value 2013-03-25 12:33:10 +01:00
Björn Schießle abd48496d2 fix indention 2013-03-25 12:33:03 +01:00
Björn Schießle 102120f105 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-25 12:32:56 +01:00
Björn Schießle 5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Robin Appelman 0e55b61169 Improve phpdoc for the filecache 2013-03-24 02:06:50 +01:00
Brice Maron 24d471af29 Improve detection of installations errors 2013-03-23 13:47:42 +01:00
Bernhard Posselt bbeb657c03 Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
Fixing file mapper ext master
2013-03-23 05:34:25 -07:00
Bernhard Posselt 3d2acb5389 Merge pull request #2446 from owncloud/fixing-safe-mode-check-master
more accurate safe_mode check - refs #2258
2013-03-23 05:33:32 -07:00
Robin Appelman 6326a3a9f7 Some improvements for the Storage phpdoc 2013-03-23 00:10:30 +01:00
Jenkins for ownCloud 4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
itheiss d00b2f610e Extend test case for getDefaultEmailAddress()
see #2499
2013-03-22 10:08:53 +01:00
itheiss 568c256aff Fix #2499
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.

e.g. 'mail_domain' => 'example.com'
2013-03-22 10:07:06 +01:00
Morris Jobke 79d99b9c96 use simple markup to highlight groups in share autocomplete 2013-03-22 10:00:43 +01:00
Jenkins for ownCloud a035ed0c19 [tx-robot] updated from transifex 2013-03-22 00:04:46 +01:00
Morris Jobke 8871629db5 replace hardcoded css style with css class - ref owncloud/core#173 2013-03-21 23:19:59 +01:00
Morris Jobke a1a6ef9409 share autocomplete - improve group appearance
highlight groups with markup (bold font) instead of "(group)" postfix

ref owncloud/core#173
2013-03-21 22:45:36 +01:00
Jan-Christoph Borchardt 5fbfe977aa Merge pull request #2515 from yannickoo/master
No Scrolling for more than approximately 10 Applications
2013-03-21 12:14:10 -07:00
yannickoo 43b928aca6 Fixed typo 2013-03-21 18:46:59 +01:00
yannickoo 55fc03fda4 No Scrolling for more than approximately 10 Applications 2013-03-21 18:37:23 +01:00
Robin Appelman e5f8acf4c0 Add phpdoc documentation to the Storage interface 2013-03-21 13:11:52 +01:00
Lukas Reschke ad2d222466 Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
Jenkins for ownCloud 3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Sam Tuke fd4e59b748 Added method for setting user keyfile recovery preference
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
2013-03-20 19:26:59 +01:00
Lukas Reschke ef6c6e77b1 Add link to issue creation
We're directly linking users to this in ownCloud when they click "report a bug" - this often confused people because they don't know where to report the issue exactly.
2013-03-20 18:20:15 +01:00
VicDeo 3e9ea6d13b Remove space before parethesis 2013-03-20 16:54:06 +04:00