Commit Graph

5639 Commits

Author SHA1 Message Date
Michael Gapczynski 7077678f7f Sanitize toaddress for emailing private links 2012-07-11 15:26:22 -04:00
Lukas Reschke c3fea30811 Sanitizing file names 2012-07-11 19:14:04 +02:00
Bjoern Schiessle 07efd39d8a prevent script execution during slideshow 2012-07-11 15:44:39 +02:00
Bjoern Schiessle e248412ca9 use getStorage() to get versions location
update routine implemented
version number of files_versions increased

Conflicts:

	apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
Georg Ehrke 0cb9f5e159 fix merge conflicts 2012-07-11 10:50:18 +02:00
Georg Ehrke 5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Jörn Friedrich Dreyer 0f0aa1827f Merge branch 'master' of gitorious.org:/owncloud/owncloud 2012-07-11 02:34:28 +02:00
Jörn Friedrich Dreyer ca8028bd73 small fixes in merge request 104, use OCP\Files::getStorage 2012-07-11 02:33:11 +02:00
Michael Gapczynski 0b14b4e3e8 Call exit() to prevent further code execution if directory does not exist 2012-07-11 02:33:11 +02:00
BlackEagle ef1924dbbb gallery :: display big picture according to exif
- fixes oc-314
- caching of the 'big' images in subfolder view
  next to the tumbnails
- now choosen to use max 1200px for viewing
  this helps speeding up the viewing process

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-07-11 02:33:10 +02:00
Michael Gapczynski ca04c1a0f8 Call exit() to prevent further code execution if directory does not exist 2012-07-10 19:15:08 -04:00
Bjoern Schiessle e7a0c4f0bb use readfile() instead iof fopen() for file download over webdav.
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-10 19:22:06 +02:00
Bjoern Schiessle bf09bcc854 add OCP\Files to access files 2012-07-10 19:22:06 +02:00
Jörn Friedrich Dreyer 9be6432aac shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height 2012-07-10 16:58:37 +02:00
Jörn Friedrich Dreyer acb9612332 fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT 2012-07-10 16:58:37 +02:00
Johannes Willnecker 02c9b03b8e Missing dir added. 2012-07-10 16:58:37 +02:00
Johannes Willnecker 570ea787f1 fixed typo 2012-07-10 16:58:37 +02:00
Johannes Willnecker 3e53bf4a86 Fix for oc-972, oc-1144 and oc-1191 2012-07-10 16:58:37 +02:00
Sam Tuke 91da4b05b7 fixed typos 2012-07-10 15:51:57 +01:00
Jörn Friedrich Dreyer 528567ae4e gitignore phpStorm .idea metadata folder 2012-07-10 12:27:12 +02:00
Thomas Tanghus 9d2cbc88f0 Revert reversion of f5c329af98 :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus 34ac2ea1ba Don't escape assigned values. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 861c379255 Make sure the proper DOM is loaded and the right address book gets expanded. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 0744e5a172 Look for the right field :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus 7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 50462903d6 Revert "Delay fetching of carddata and set ETag and size instead."
This reverts commit f5c329af98.
2012-07-10 01:24:40 +02:00
Thomas Mueller b97eb3a48f fixing oc-1198 2012-07-09 23:50:26 +02:00
Georg Ehrke d0b625352c some work on subadmins 2012-07-09 21:51:19 +02:00
Bjoern Schiessle 43f00a2dc8 create uploads directory for ssl certificates if it didn't exists 2012-07-09 18:11:29 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
jfd b67199bb45 add css id attribute, minor fixes 2012-07-09 16:04:46 +02:00
Jörn Friedrich Dreyer 6f408c3651 add supersized slideshow 2012-07-09 15:13:23 +02:00
Bjoern Schiessle 77f07c672e remove hard coded path 2012-07-09 12:49:04 +02:00
Bjoern Schiessle 6bf1473f0e replace urlencoded slash 2012-07-09 11:58:16 +02:00
Bjoern Schiessle 82a57f0ce3 revert performance improvements in userExists() because it breaks new user creation 2012-07-09 10:31:50 +02:00
Bjoern Schiessle 32b476d6ec remove comments around code block 2012-07-09 10:19:19 +02:00
Bjoern Schiessle 7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus f5c329af98 Delay fetching of carddata and set ETag and size instead. 2012-07-09 01:48:42 +02:00
Thomas Tanghus 47aaca49a1 Rescan categories in small batches to reduce memory usage. 2012-07-09 00:16:14 +02:00
Thomas Tanghus d1cf787197 Move code to OC_Contacts_App::scanCategories(). 2012-07-09 00:15:37 +02:00
Thomas Tanghus 6116dc6b65 Added default parameter $reset to allow for incremental rescan. 2012-07-09 00:14:42 +02:00
Thomas Tanghus 6d123e90f3 Remove deleted address book from list. 2012-07-08 23:38:03 +02:00
Thomas Tanghus 0b6cd8d203 Simplify VCF generation. 2012-07-08 23:36:52 +02:00
Bart Visscher e8010209bb Custom chunking support 2012-07-08 22:11:36 +02:00
Thomas Tanghus dc8193fccb Make it possible to import files using CR as eol. 2012-07-08 18:28:55 +02:00
Thomas Tanghus 334257d2b6 Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus 3424785db0 Implemented Sabre iCalendar Export Plugin. 2012-07-08 16:58:17 +02:00
Thomas Tanghus f5c620006e Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:15:52 +02:00
Thomas Tanghus 97106f198f Set the loading class on the property being changed, not on its container. 2012-07-08 16:11:45 +02:00
Thomas Tanghus e6a60198e4 Return error messages in correct format. 2012-07-08 14:11:48 +02:00