Commit Graph

5482 Commits

Author SHA1 Message Date
Lukas Reschke 04a0755fd3 CSRF checks 2012-07-07 16:03:21 +02:00
Lukas Reschke b7c510a61a CSRF checks 2012-07-07 16:02:33 +02:00
Lukas Reschke 0abcf0a421 CSRF checks 2012-07-07 15:58:11 +02:00
Lukas Reschke c63db28eaf CSRF check 2012-07-07 15:54:52 +02:00
Lukas Reschke b46d3019ca Uninitialized variable 2012-07-07 15:52:49 +02:00
Lukas Reschke 777eb1d8b1 CSRF check in the settings 2012-07-07 15:27:04 +02:00
Lukas Reschke ec7bb86b28 Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out. 2012-07-07 15:00:02 +02:00
Michael Gapczynski f955e5e9b2 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-06 17:29:45 -04:00
Michael Gapczynski 90e4af312a Fix time formatting for minutes, prepend 0 if minutes is less than 10 2012-07-06 16:38:54 -04:00
Michael Gapczynski 466d7c0d99 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-06 15:51:01 -04:00
Frank Karlitschek b967530795 increase the time limit again to a sensible granularity of 1 min.
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
Bjoern Schiessle ca26bcc581 close file after write process 2012-07-06 17:09:20 +02:00
Bjoern Schiessle e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Thomas Tanghus 75d01b065d Make export batch size configurable. 2012-07-06 13:49:04 +02:00
Thomas Tanghus cafbd02337 Fix endless loop when no addressbooks. 2012-07-06 13:24:56 +02:00
Thomas Tanghus a1872412bf Correct hack ;) 2012-07-06 12:59:07 +02:00
Thomas Tanghus ab1b4f1f03 Fugly fixed include. 2012-07-06 12:59:07 +02:00
Bjoern Schiessle 963faf6458 CURLOPT_SSL_VERIFYPEER=false shouldn't be in master 2012-07-06 12:35:29 +02:00
Bjoern Schiessle ba8dee0520 introduce subclassed client.php and revert changes to 3rdparty 2012-07-06 12:26:54 +02:00
Bjoern Schiessle 8353517969 use OC_Connector_Sabre_Client 2012-07-06 12:24:03 +02:00
Georg Ehrke f875240b47 comment out some code 2012-07-06 11:23:20 +02:00
Georg Ehrke 9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Thomas Tanghus a5a1d929ca No need for being protected. 2012-07-06 03:22:42 +02:00
Thomas Tanghus 59b38e668d Missing requesttoken 2012-07-06 03:22:42 +02:00
Bart Visscher 5e0b80dc8d Contacts: Fix copy&paste error 2012-07-05 17:12:52 +02:00
Bjoern Schiessle 5bf050b13b moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems 2012-07-05 15:55:46 +02:00
Bjoern Schiessle bd494f562f fixed faulty commit 2012-07-05 15:03:14 +02:00
Bjoern Schiessle 51774cca6b use OC_Filesystem for rollback 2012-07-05 14:20:40 +02:00
Bjoern Schiessle 378fa2bc86 check if caview really exists 2012-07-05 12:17:33 +02:00
Bjoern Schiessle 55cde0e5aa moved remove and rename hook to libs/hooks.php 2012-07-05 11:35:08 +02:00
Bjoern Schiessle aa3b575ceb disabled user upload of root certificates until sabredav client can handle them 2012-07-05 11:31:30 +02:00
Georg Ehrke aa95cf2c98 Merge branch 'master' into calendar_import 2012-07-05 11:30:37 +02:00
Bjoern Schiessle f86ecb3bf7 send ca cert path to sabredav client 2012-07-05 11:28:32 +02:00
Thomas Tanghus 9d00f4d2fb Correct db default value. 2012-07-05 00:40:11 +02:00
Thomas Tanghus dac2c14ae9 Add missing CSRF check. 2012-07-05 00:37:08 +02:00
Thomas Tanghus 5d79444852 Missing update script. 2012-07-04 22:58:31 +02:00
Thomas Tanghus 706a13544b Remove ugly activation hack. 2012-07-04 22:13:36 +02:00
Georg Ehrke 7ec2d6ce85 Merge branch 'master' into calendar_import 2012-07-04 21:15:32 +02:00
Georg Ehrke a4c2893128 some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
Bart Visscher 280c59e914 More helpfull debug msg for redirectToDefaultPage 2012-07-04 17:51:07 +02:00
Bart Visscher 621b83df72 Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong 2012-07-04 17:51:07 +02:00
Bart Visscher 9ea34cae43 Simplified remote.php file loading 2012-07-04 17:51:07 +02:00
Georg Ehrke 5880bbee8f add miniColors 2012-07-04 17:37:47 +02:00
Bjoern Schiessle e258da5c3c certificate should be only visible for users 2012-07-04 17:22:04 +02:00
Bjoern Schiessle 5d61b85a1d allow users to upload ssl root certificates for the webdav client 2012-07-04 17:18:36 +02:00
Thomas Tanghus b2eac08ad3 Query contacts in batches of 20. Possible fix for oc-1126. 2012-07-04 16:54:00 +02:00
Sam Tuke 825d92d59c Added undo functionality to delete user procedure on user settings page 2012-07-04 14:30:42 +01:00
Thomas Tanghus 6d3afb3857 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:57:07 +02:00
Georg Ehrke 657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Brice Maron 3b09aa8578 Correct Postgresql connection with space in password. Work around php bug 2012-07-04 10:13:00 +00:00