Commit Graph

7144 Commits

Author SHA1 Message Date
Arthur Schiwon 9bb409d881 fix syntax error after merge 2012-06-25 17:34:28 +02:00
Thomas Tanghus ef93bf223a Try to conserve some memory. Should fix oc-1106 for master. 2012-06-25 17:26:44 +02:00
Thomas Tanghus ad5aa5ac15 Try to conserve some memory. Should fix oc-1106 for stable4. 2012-06-25 17:16:34 +02:00
Thomas Tanghus 42a5cd21b9 Missing requesttoken. 2012-06-25 17:15:33 +02:00
Thomas Tanghus ddf321d534 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-25 16:22:19 +02:00
Thomas Tanghus 56ed8ba70b Select which address book to add a contact to. Fixes oc-1071. 2012-06-25 16:21:29 +02:00
Brice Maron 09a9f5400e Trim url and path of appsroot to have and standart type of path fix oc-1107 2012-06-25 15:50:27 +02:00
Arthur Schiwon 594e19bddc LDAP: always sanitize DN and DN-containing attributes 2012-06-25 13:22:49 +02:00
Arthur Schiwon 3f6a7859c9 LDAP: cheaper userExists() implementation, fixes oc-1012 2012-06-25 13:22:00 +02:00
Arthur Schiwon d64a7716f1 LDAP: always sanitize DN and DN-containing attributes 2012-06-25 13:22:00 +02:00
Bjoern Schiessle a09a01a49f sanitizeHTML() has to be called later to keep the path unchanged 2012-06-25 12:44:54 +02:00
Bjoern Schiessle 85ac75b4f4 xss vulnerability fixed 2012-06-25 12:38:11 +02:00
Frank Karlitschek a4c47c674d write sql errors into the error log for better debugging 2012-06-25 11:55:51 +02:00
Bjoern Schiessle 9ee528bc74 Only delete existing thumbnails (bug #1100) 2012-06-25 10:15:20 +02:00
Bjoern Schiessle 0083dbb3ce Only delete existing thumbnails (bug #1100) 2012-06-25 10:11:06 +02:00
Thomas Tanghus 5ac4830e75 XSS fix. 2012-06-25 05:03:30 +02:00
Thomas Tanghus c3130919c2 Allow direct link to app. 2012-06-25 05:02:01 +02:00
Thomas Tanghus 052bd8efbb Drag'n'Drop contacts between addressbook. Still needs some css magic. 2012-06-25 03:42:27 +02:00
Brice Maron 51d33768b8 Prevent errors and mini enhancement of saved window in bookmarks 2012-06-24 21:30:14 +00:00
Brice Maron 0fb9d0bf29 Correct bookmark app : add through interface and remove missing css 2012-06-24 21:24:43 +00:00
Brice Maron 564cd82599 Fix the fix about filecache and postgres 2012-06-24 20:49:48 +00:00
Thomas Tanghus e845e56749 Remove excessive debugging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus 3afbc3d2dc Add some DRYness to logging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus f10c51193b Fixed function name. 2012-06-24 22:25:32 +02:00
Thomas Tanghus df1eca4fa2 Also load categories from VJOURNAL. 2012-06-24 22:25:32 +02:00
Brice Maron 2a6a155e23 Correct File cache error with postgresql 2012-06-24 19:52:30 +00:00
Brice Maron 61adae1e49 Use intervals for sessions deletion with postgres fix oc-492 2012-06-24 19:41:23 +00:00
Brice Maron f56b3df0bc Resolve scanning issue case comparison of songs 2012-06-24 16:03:25 +00:00
Brice Maron c53a8fa541 Correct seq name in media songs fix oc-589 2012-06-24 16:02:41 +00:00
Brice Maron 6da926f1c3 Resolve scanning issue case comparison of songs 2012-06-24 15:58:51 +00:00
Brice Maron 5b908209de Correct seq name in media songs fix oc-589 2012-06-24 15:12:05 +00:00
Thomas Tanghus 0f9b9fa111 Remove unneeded parameter. 2012-06-24 16:07:18 +02:00
Thomas Tanghus 5393c0cfed Click to select which address book to add to. 2012-06-24 16:03:10 +02:00
Thomas Tanghus b182e6c86a Trim trailing whitespace from version. 2012-06-24 15:07:44 +02:00
Thomas Tanghus 9e6d2f2f82 Improve prev/next selection on delete. 2012-06-24 15:07:44 +02:00
Frank Karlitschek ac358ed1b3 4.0.3a
Two important fixes after 4.0.3
2012-06-24 11:38:54 +02:00
Brice Maron 0ab6e2ee3d Try to fix the remote pbm. fix oc-1090 2012-06-24 08:06:42 +00:00
Georg Ehrke a12557ca4d another fix for oc-1044 2012-06-24 09:42:14 +02:00
Georg Ehrke ca5de26bac another fix for oc-1044 2012-06-24 09:41:37 +02:00
Georg Ehrke a113ee9e9f add x-webkit-speech to searchbox 2012-06-24 00:42:16 +02:00
Robin Appelman 44e36ecf49 fix 'files' entries showing up in Files before the users files are scanned properly 2012-06-23 23:42:54 +02:00
Robin Appelman f1e4c845ce fix duplicates showing up in the filecache 2012-06-23 23:32:44 +02:00
Georg Ehrke 51c5e7035e Merge branch 'master' into oc_error 2012-06-23 19:54:20 +02:00
Georg Ehrke 17e289aef2 Merge branch 'master' into calendar_export 2012-06-23 19:54:12 +02:00
Florian Hülsmann 7109c7ea1c Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-23 17:01:28 +02:00
Florian Hülsmann d450560b39 remove trailing slash in %appswebroot% placeholder 2012-06-23 16:59:55 +02:00
Tom Needham 1c0e72cd5a Text editor: Waste less space for line numbers 2012-06-23 14:43:52 +00:00
Tom Needham 6e5573acb5 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-23 14:42:54 +00:00
Tom Needham 5323983fc7 Text editor: Waste less space for line numbers 2012-06-23 14:42:37 +00:00
Frank Karlitschek 2c1c1ba88c close only if exist 2012-06-23 16:21:47 +02:00