Commit Graph

10641 Commits

Author SHA1 Message Date
Arthur Schiwon 3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
Arthur Schiwon 78c694b6ee Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy 2013-03-27 19:20:08 +01:00
Arthur Schiwon 3d29a82150 Cache: Do not overwrite ETag when file did not change 2013-03-27 19:19:40 +01:00
Arthur Schiwon 2a2d409733 Only prepare an SQL statement once. 2013-03-27 19:19:16 +01:00
Arthur Schiwon 1d676fb0e6 Add PHPDoc 2013-03-27 19:18:58 +01:00
Arthur Schiwon d9e07ca60a Adjust to Icewind's fix 2013-03-27 19:18:34 +01:00
Robin Appelman 1a874b9106 Cache: fix property path for getting legacy etag 2013-03-27 19:18:13 +01:00
Robin Appelman 19c7d9c3dc Port Icewind's fix I 2013-03-27 19:17:49 +01:00
Arthur Schiwon 588e1547cf Port OC_Property Table Index 2013-03-27 19:17:20 +01:00
Arthur Schiwon 5fc276602a Change LIMIT in DB query respectively remove where not necessary 2013-03-27 19:13:14 +01:00
Arthur Schiwon 18554059a4 Remove Debug output 2013-03-27 19:12:53 +01:00
Arthur Schiwon e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01:00
Arthur Schiwon 9d25058905 Performance: prepare queries only once 2013-03-27 19:12:04 +01:00
Arthur Schiwon 7839ec5093 Fix lost ETag on Cache Upgrade 2013-03-27 19:11:35 +01:00
Arthur Schiwon 599778b153 Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
blizzz e83f428c34 Merge pull request #2598 from ceri/master
Use displayName in the From field of outbound email about new shares.
2013-03-27 10:57:35 -07:00
Arthur Schiwon 942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +01:00
Morris Jobke 7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00
Ceri Davies fce15f8f61 Use displayName in the From field of outbound email about new shares.
This is important in the Active Directory case where users are
currently getting a GUID in the From field, making emails look quite a
lot like spam.
2013-03-27 15:43:56 +00:00
Morris Jobke 97d73d41a8 remove animation 2013-03-27 15:19:28 +01:00
Morris Jobke d3ca97dd2f Make it possible to show less log entries again - fix owncloud/core#1593
* show "less" button only if there are more than 3 entries
 * only "remove" logs till last 3 entries
2013-03-27 15:14:09 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 8dd7fa8507 Use isAppVersionCompatible in app installer 2013-03-27 10:16:05 +00:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 93a6ed3dab Ensure instanceid contains a letter
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
Thomas Müller 4158a417e7 Merge pull request #2578 from owncloud/fixing-2577-master
prevent to fire delete ajax a second time.
2013-03-26 14:49:04 -07:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 53fd122b89 Minor typo, coding style fixes for OC_Util::getInstanceId 2013-03-26 21:48:49 +00:00
Thomas Mueller 586a47b186 fixes #1463 - file size is now displayed correctly in IE8 2013-03-26 21:28:01 +01:00
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