Commit graph

7868 commits

Author SHA1 Message Date
Thomas Müller
bb40d14efa Merge pull request #281 from butonic/fix_human_filesize_column_header
fix human filesize column header
2012-11-06 02:22:09 -08:00
Jörn Friedrich Dreyer
c2d6ac53b2 fix human filesize column header 2012-11-06 11:08:02 +01:00
Thomas Müller
8f0269f121 Merge pull request #265 from owncloud/fix-button-img-cursor
make images in buttons also show click-hand on hover
2012-11-05 15:15:56 -08:00
Thomas Tanghus
73d59bd397 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-06 00:10:45 +01:00
Jenkins for ownCloud
4d052c1eee [tx-robot] updated from transifex 2012-11-06 00:01:40 +01:00
Michael Gapczynski
3d13c9db70 Return empty array if file does not exist inside Shared folder, fixes issue #91 2012-11-05 17:54:23 -05:00
Thomas Müller
b7e9d8d00e Merge pull request #267 from owncloud/improve_files_update
Improve performance of files update (on larger setups)
2012-11-05 14:06:07 -08:00
Thomas Müller
f2d5450e14 Merge pull request #269 from owncloud/fix_fe_mkdir_warning
Fix mkdir and opendir warnings when path does not exist
2012-11-05 13:48:17 -08:00
Thomas Mueller
415ec58422 fixes #329: query the database in chunks of 200 2012-11-05 22:42:03 +01:00
Lukas Reschke
3a4fc7c5b6 Merge pull request #268 from owncloud/fixing_template_test
Fixing failing template unit test
2012-11-05 12:46:25 -08:00
Arthur Schiwon
8b3ae4309b Fix mkdir and opendir warnings when path does not exist 2012-11-05 21:37:59 +01:00
Thomas Mueller
f9226f170e fixes #266 2012-11-05 21:26:59 +01:00
Arthur Schiwon
85d6a08ae9 prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups 2012-11-05 20:47:26 +01:00
Jan-Christoph Borchardt
1aec5378b8 make images in buttons also show click-hand on hover 2012-11-05 19:54:48 +01:00
Georg Ehrke
bb0164c9fc fix file delete in opera - fixes #188 2012-11-05 18:42:44 +01:00
Lorenzo M. Catucci
ca24f4767b Return an empty array on succesful existence check 2012-11-05 17:35:09 +01:00
Thomas Tanghus
c63f6c74ed Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-05 16:40:35 +01:00
Robin Appelman
972243d564 support string values ('true' and 'false') for configuring the secure parameter on external storage backends
fixes #78
2012-11-05 16:39:03 +01:00
Thomas Tanghus
be77d81152 VCategories: Closing brace must be on a line by itself. 2012-11-05 16:38:23 +01:00
Thomas Tanghus
8c492a86fc VCategories: Line too long. 2012-11-05 16:35:25 +01:00
Thomas Tanghus
3c59bc41d7 VCategories: Line too long. 2012-11-05 16:32:20 +01:00
Thomas Tanghus
831c2cac1e Remove unused variable. 2012-11-05 16:29:44 +01:00
Thomas Tanghus
a50f98606d Check DB result. 2012-11-05 16:24:16 +01:00
Thomas Tanghus
7a29137e2b Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-05 16:17:57 +01:00
Lorenzo M. Catucci
510191db68 Return true or false from readAttribute if $attr is empty
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
Thomas Müller
5c72d28ffd Merge pull request #245 from owncloud/fileactions
some more reuse for fileactions
2012-11-05 05:52:52 -08:00
Frank Karlitschek
59381b90a0 Merge pull request #252 from owncloud/fix_user_webdavauth
Fix user webdavauth
2012-11-05 05:38:06 -08:00
Frank Karlitschek
6fba4ba87d fix the webdavauth app 2012-11-05 14:22:16 +01:00
Robin Appelman
34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00
Thomas Tanghus
1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Frank Karlitschek
01b0e9b133 fix the webdav user backend. still not completel working but a frist step 2012-11-05 10:46:28 +01:00
Thomas Müller
135680e50b Merge pull request #242 from fmms/checkstyle05
Checkstyle fixes
2012-11-05 01:34:11 -08:00
Jenkins for ownCloud
f0be09a23c [tx-robot] updated from transifex 2012-11-05 00:03:41 +01:00
Frank Karlitschek
d9d6dc892c add a link to the contribution guidelines to make it easier for new people 2012-11-04 23:40:37 +01:00
Felix Moeller
02ec677e3c Style: The last two spaces 2012-11-04 22:57:40 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Robin Appelman
4f32f49fb1 this line shouldn't be here 2012-11-04 21:00:36 +01:00
Robin Appelman
f187aa6c93 some more code reuse for fileactions
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Lukas Reschke
555dd5c261 Merge pull request #200 from owncloud/ldap
LDAP: clear the cache not only when TTL changes, but with every settings...
2012-11-04 11:03:18 -08:00
Arthur Schiwon
00bb246a0d merge from master 2012-11-04 19:58:48 +01:00
Felix Moeller
1e33ad9cbc Style: Different line endings in one file are bad for sure
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?
2012-11-04 19:11:53 +01:00
Felix Moeller
9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Felix Moeller
27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Felix Moeller
bc4382c5c5 Checkstyle: fix the last NoSpaceAfterEquals 2012-11-04 18:31:44 +01:00
Felix Moeller
0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller
1205749f8c Checkstyle: Fix the last two SpaceBeforeOpenBrace 2012-11-04 18:18:03 +01:00
Thomas Müller
8ac3849a95 Merge pull request #238 from fmms/checkstyle04
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Lukas Reschke
80b9854710 Remove uneeded debug output 2012-11-04 14:26:45 +01:00