Commit graph

11092 commits

Author SHA1 Message Date
raghunayyar
5dd1f7d764 Using max-width instead of width for filename. 2013-03-30 00:13:47 +05:30
Sam Tuke
3cbfacb439 Merge branch 'master' into files_encryption 2013-03-29 15:59:54 +01:00
Bernhard Posselt
86ac30c596 Merge pull request #2516 from kabum/master
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Bernhard Posselt
66d7cc4c74 Merge pull request #2584 from mrtorrent/fix_instanceid_format
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
Bernhard Posselt
8ed9be5408 Merge pull request #2597 from kabum/lesslog
Make it possible to show less log entries again
2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups
User list: Keep array of available groups. Should fix #873
2013-03-29 07:19:09 -07:00
Thomas Tanghus
a56abd3f9b Typehint and check $ids parameter. 2013-03-29 14:54:08 +01:00
Bart Visscher
ec980a8a25 Merge pull request #2585 from mrtorrent/fix_install_app_version_check
Fix install app version check
2013-03-29 05:38:58 -07:00
raghunayyar
024b60decc Adds a fixed width to the filename to prevent horizontal scroll. 2013-03-29 16:26:03 +05:30
Thomas Tanghus
d838a3b33f Allow purging multiple objects from category index table. 2013-03-29 05:51:41 +01:00
Jörn Friedrich Dreyer
7ecbaef16c use css browser switch instead of deprecated jquery browser detection 2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Sam Tuke
ff6f52d5ec Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Sam Tuke
9ecfd07f23 Added ajax scripts for setting pwd recovery preferences 2013-03-28 18:29:18 +01:00
Jörn Friedrich Dreyer
e31d74037a use local variable to walk DOM only once 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
868d7b956d use === to compare empty string '' 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
831b7ca803 don't update progress bar in ie < 10 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
c1a944a655 return created table row, use as context in fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
4dd4167f80 refactor files.js, make proper use of fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
0968eb0a65 return original filename to fileupload 2013-03-28 18:03:52 +01:00
Jörn Friedrich Dreyer
df31ee5a90 Merge pull request #2575 from owncloud/fixing-1461-master
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
Morris Jobke
866ca51d83 fix typo and remove animation 2013-03-28 16:11:46 +01:00
Morris Jobke
f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +01:00
Morris Jobke
df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Jörn Friedrich Dreyer
aa103bd5b3 supress write hook for .part files 2013-03-28 12:15:27 +01:00
Jörn Friedrich Dreyer
4a70315ad1 ignore files in scanFile instead of scan to catch all occurences. 2013-03-28 12:15:27 +01:00
Jenkins for ownCloud
7098bcd4b7 [tx-robot] updated from transifex 2013-03-28 00:03:44 +01:00
Arthur Schiwon
c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
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
Jan-Christoph Borchardt
994a8797e4 remove extra type selector qualification for ID and class names 2013-03-27 17:39:09 +01:00
Jan-Christoph Borchardt
0b1dc7b0cc also use SVG for settings cog 2013-03-27 17:33:25 +01:00
Jan-Christoph Borchardt
5aa1ca5882 use SVG for folder image 2013-03-27 17:32:37 +01:00
Jan-Christoph Borchardt
bcf1b6f9f8 soften highlight for navigation entries 2013-03-27 17:11:40 +01:00
Morris Jobke
7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00