Commit Graph

3814 Commits

Author SHA1 Message Date
Arthur Schiwon 00bb246a0d merge from master 2012-11-04 19:58:48 +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 80b9854710 Remove uneeded debug output 2012-11-04 14:26:45 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Jenkins for ownCloud 17d466b03b [tx-robot] updated from transifex 2012-11-04 00:01:42 +01:00
Jenkins for ownCloud 2f0fd84477 [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Arthur Schiwon df8c67721d code style 2012-11-02 09:42:10 +01:00
Lukas Reschke d9e9761099 Fix a typo 2012-11-02 00:16:40 +01:00
Lukas Reschke 0f02b7dea6 Add CSRF token 2012-11-02 00:09:28 +01:00
Jenkins for ownCloud 627509875e [tx-robot] updated from transifex 2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt e66482430e Files: change wording 'From url' to 'From link' 2012-11-01 18:09:16 +01:00
Arthur Schiwon 5252fc52ed LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194 2012-11-01 16:48:17 +01:00
Björn Schießle a9ce43de41 adapted comments to the code changes 2012-11-01 00:20:50 +01:00
Björn Schießle 3878950af4 load logging apps for webdav connections
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Jenkins for ownCloud a327087c8b [tx-robot] updated from transifex 2012-11-01 00:02:14 +01:00
Jörn Friedrich Dreyer b76306c144 Merge pull request #155 from owncloud/token-expired-IE
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
Thomas Müller f851738169 Merge pull request #152 from scambra/webdav-quota
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Lukas Reschke 116fa64294 Change IE8 to "older IE versions"
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke ee1e4a7602 Send the requesttoken as form value
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.

Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
scambra d9c14292a4 fix checking quota in webdav, adding a sabredav plugin 2012-10-30 10:32:30 +01:00
Jenkins for ownCloud 56cf7660bd [tx-robot] updated from transifex 2012-10-30 00:01:50 +01:00
Lukas Reschke 2e1199acb8 Merge pull request #133 from fmms/checkstyle02
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
blizzz 629d33967c Merge pull request #142 from denis-b/patch-2
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
denis-b 2aa5a185d4 Update apps/files/ajax/move.php
fix moving dirs containing "+"
2012-10-29 16:46:22 +01:00
denis-b b563935498 Update apps/files/index.php
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
Bart Visscher ccbf4e993c Use files remote webdav in compatibility files/webdav.php 2012-10-29 15:04:56 +01:00
Bart Visscher ab4ade0d24 Remove fixme, problem is solved already 2012-10-29 15:04:55 +01:00
Jenkins for ownCloud dbb4e74c79 [tx-robot] updated from transifex 2012-10-29 00:02:45 +01:00
Felix Moeller dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Robin Appelman 0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Georg Ehrke 4fd0514f0a don't move file into subdirectory if a file with the same name already exists (fixes #92) 2012-10-28 15:23:40 +01:00
Robin Appelman fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Robin Appelman d9ef6da2e4 code style 2012-10-28 12:47:42 +01:00
Jenkins for ownCloud 1a08ef6a06 [tx-robot] updated from transifex 2012-10-28 00:02:29 +02:00
Arthur Schiwon 58828d205f LDAP: usersInGroup now also does LDAP serverside search. 2012-10-27 19:43:07 +02:00
Arthur Schiwon 3f85432df9 LDAP: make filter in readAttribute configurable 2012-10-27 19:43:07 +02:00
Arthur Schiwon 1b2279c935 LDAP: getGroups to use paged searches 2012-10-27 17:46:01 +02:00
Arthur Schiwon 5b3c9518dc LDAP: improve slicing 2012-10-27 17:46:01 +02:00
Arthur Schiwon 33aa630af3 LDAP: add error handling for failed searches 2012-10-27 17:46:01 +02:00
Arthur Schiwon a053da58ce LDAP: be careful which limit is send to possible paged LDAP search 2012-10-27 17:46:01 +02:00
Arthur Schiwon 977c4d1844 LDAP: use the correct attribute in filter 2012-10-27 17:46:01 +02:00
Arthur Schiwon 246221a677 LDAP: fix again proper check if groups are enabled 2012-10-27 17:46:01 +02:00
Arthur Schiwon b942c1253e remove TODO comment, it's done 2012-10-27 17:46:01 +02:00
Bart Visscher d6953fa5ed Remove wrongly committed files 2012-10-27 17:45:15 +02:00
Björn Schießle f151376ad5 remove remaining line from merge conflict 2012-10-27 17:06:13 +02:00
Bart Visscher 894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
Conflicts:
	lib/base.php
2012-10-27 16:33:10 +02:00