wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7094 commits 157 branches 562 tags 714 MiB
Commit graph

3677 commits

Author SHA1 Message Date
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
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
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
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
Thomas Tanghus
197086a952 Make it possible to import files using CR as eol. 2012-07-08 18:34:00 +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
747b7fbbfe Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:17:10 +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
d730d3edd4 Set the loading class on the property being changed, not on its container. 2012-07-08 16:10:12 +02:00
Thomas Tanghus
25b95a9ec7 Improve checking for active addressbooks and creating default addressbook. 2012-07-08 15:41:38 +02:00
Thomas Tanghus
554cb2d3ab Add missing requesttoken. 2012-07-08 14:48:49 +02:00
Thomas Tanghus
47f96e2d5e Missing semi-colon. 2012-07-08 14:42:33 +02:00
Thomas Tanghus
746eef0d5c Format error response correctly. 2012-07-08 14:31:40 +02:00
Thomas Tanghus
e6a60198e4 Return error messages in correct format. 2012-07-08 14:11:48 +02:00
Thomas Tanghus
2b22f0db0a Add missing requesttoken. 2012-07-08 13:28:12 +02:00
Lukas Reschke
ea70ca3ce3 CSRF checks 2012-07-07 16:12:21 +02:00
Lukas Reschke
2c318f45f4 CSRF checks 2012-07-07 16:08:27 +02:00
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
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
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
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
b11b6afbb9 Hopefully fix for drag'n'drop import in oc-813. 2012-07-05 00:25:38 +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
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
Thomas Tanghus
5fb9b3e965 Disable expires header on thumbnail and photo. 2012-07-04 15:32:41 +02:00
Thomas Tanghus
6d3afb3857 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:57:07 +02:00
Thomas Tanghus
f72a11f852 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:49:39 +02:00
Georg Ehrke
657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Georg Ehrke
393eefa5d2 replace some direct links with OC.imagePath 2012-07-03 23:44:47 +02:00
Georg Ehrke
f98bd1ad66 Merge branch 'master' into calendar_import 2012-07-03 22:35:46 +02:00
Georg Ehrke
c036700c54 some more work on calendar import 2012-07-03 22:33:24 +02:00
Michael Gapczynski
5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Sam Tuke
b1c9785eb3 Merge branch 'master' of gitorious.org:owncloud/owncloud 
Conflicts:
	apps/files_versions/lib/versions.php
 2012-07-03 18:17:32 +01:00
Sam Tuke
a775deaf22 Moved hooks and versions.php into new lib directory 
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
 2012-07-03 17:42:51 +01:00
Bjoern Schiessle
aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Michael Gapczynski
1e36e1f2cb Use formatted shared addressbook in all cases, addressbooks out of order now 2012-07-03 11:36:57 -04:00
Michael Gapczynski
4185bd6292 Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app 2012-07-03 11:11:01 -04:00
Georg Ehrke
b6cff93254 fix spelling fail in code 2012-07-03 16:47:46 +02:00
Georg Ehrke
0b3ed2b048 Merge branch 'master' into calendar_import 2012-07-03 16:39:09 +02:00
Georg Ehrke
ca2b1f7863 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-03 13:55:48 +02:00
Georg Ehrke
cfcfdd674e Merge branch 'master' into calendar_import 2012-07-03 13:43:52 +02:00
Georg Ehrke
29a9559fa9 some work on calendar import dialog 2012-07-03 13:43:18 +02:00
Michael Gapczynski
77b582e4e6 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00
Tom Needham
88cbbc86b8 Text editor: Always use UTF-8 to keep Ace happy. 2012-07-02 19:06:40 +00:00
Arthur Schiwon
0a6f7b33c3 LDAP: make it UTF-8 save 2012-07-02 20:31:19 +02:00
Bjoern Schiessle
ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02:00
Arthur Schiwon
515adceace LDAP: reset resource on failed bind 
check for resource
 2012-07-02 14:03:29 +02:00
Georg Ehrke
e89a0949c4 remove some whitespace 2012-07-01 23:32:21 +02:00
Georg Ehrke
803f2c2517 some work on calendar import 2012-07-01 21:36:09 +02:00
Michael Gapczynski
eca2e073f8 Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -04:00
Michael Gapczynski
bf93dd4661 Don't reload the page after sending private link to email address 2012-07-01 11:53:29 -04:00
Michael Gapczynski
0b9b1757fe Add share action to addressbooks! 2012-06-30 21:06:49 -04:00
Michael Gapczynski
47f46890c8 Fix generateTarget() for contacts backend 2012-06-30 21:03:36 -04:00
Georg Ehrke
6a060ecd23 use light grey instead of white 2012-07-01 01:02:54 +02:00
Tom Needham
c7a4075aaa Updates contacts migration provider 2012-06-30 22:56:47 +00:00
Georg Ehrke
be11f71d27 fix doc for OC_Calendar_Calendar::generateTextColor() 2012-07-01 00:31:05 +02:00
Georg Ehrke
601237a0c3 add algorithm to generate the calendar's text color 2012-07-01 00:09:33 +02:00
Michael Gapczynski
2418d9a1a9 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Georg Ehrke
ce331bd1d3 improvements for dropoimport 2012-06-30 23:18:41 +02:00
Georg Ehrke
a705b19cd5 little fix for import 2012-06-30 22:45:12 +02:00
Georg Ehrke
f15941a967 improve dropimport 2012-06-30 22:26:29 +02:00
Georg Ehrke
4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Georg Ehrke
376431fa0d import works now for dropimport 2012-06-30 22:08:30 +02:00
Georg Ehrke
fa5b31ac9c fix documentation style 2012-06-30 17:09:20 +02:00
Georg Ehrke
8e0addebc3 fix some doc 2012-06-30 15:39:20 +02:00
Georg Ehrke
34b2486d53 some improvements for calendar export 2012-06-30 15:23:21 +02:00
Georg Ehrke
390f5cc89f some work on (drop)import) 2012-06-30 15:17:29 +02:00
Tom Needham
51173163ce Contacts: align the bottom control buttons 2012-06-30 11:22:09 +00:00
Tom Needham
704a1c655e Contacts: fix add contact icon path 2012-06-30 11:07:54 +00:00
Georg Ehrke
433d15d309 Merge branch 'master' into calendar_import 2012-06-30 12:50:26 +02:00
Georg Ehrke
6e6f90a8a2 fix merge conflicts 2012-06-30 12:44:51 +02:00
Georg Ehrke
34d4eb8edd some more work on calendar import class 2012-06-30 12:42:36 +02:00
Michael Gapczynski
edc6a648d1 Fix placeholder value for optional fields in external storage UI 2012-06-29 19:35:57 -04:00
Robin Appelman
252453cd34 fix encryption test cases when not logged in 2012-06-30 01:05:18 +02:00
Thomas Tanghus
a4614f83ff Don't add duplicate contacts in the list when en-/disable an address book. 2012-06-29 23:18:47 +02:00
Georg Ehrke
246894243a Merge branch 'master' into calendar_import 2012-06-29 21:46:09 +02:00
Michael Gapczynski
719c7f7f6e Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160 2012-06-29 13:01:00 -04:00
Bart Visscher
3ed7738d5e Increment user_openid version to load new app type 2012-06-29 18:38:04 +02:00
Bart Visscher
f61793aa14 Coding style fixes 2012-06-29 18:38:04 +02:00
Bart Visscher
2b4ecbaba0 Whitespace fixes 2012-06-29 18:38:04 +02:00
Georg Ehrke
652a874fa6 fix displaying of events 2012-06-29 18:13:52 +02:00
Georg Ehrke
3bcf176a53 add some hooks to fix calendar sharing 2012-06-29 17:27:29 +02:00
Michael Gapczynski
7e9455c382 Allow multiple Google Drive and Dropbox external storages to be configured 2012-06-29 11:22:54 -04:00
Michael Gapczynski
2d49a491fb Clear the mount point value for the new mount point row 2012-06-29 11:10:51 -04:00
Michael Gapczynski
f311c2a2ff Hide the delete button on new mount point row 2012-06-29 11:10:51 -04:00
Georg Ehrke
bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Bjoern Schiessle
b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name) 
- don't allow renaming if a file/directory with the name already exists
 2012-06-29 15:23:04 +02:00
Georg Ehrke
08e707d258 some work on OC_Calendar_Import 2012-06-29 14:32:07 +02:00
Bjoern Schiessle
60ec46f706 - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI 
- if secure is set to true add 's' to http
 2012-06-29 12:01:23 +02:00
Robin Appelman
75af5778a4 pass progresskey the correct way during calender import 2012-06-29 00:49:37 +02:00
Michael Gapczynski
31bba86e87 Fix external storage UI for Admin page 2012-06-28 17:55:22 -04:00
Bart Visscher
02e4e0e08f Gallery: Get all the image information for a directory at once 2012-06-28 22:11:04 +02:00
Georg Ehrke
91d92aed02 fix for previous commit 2012-06-28 19:13:43 +02:00
Georg Ehrke
4b3af1f73b use OC_Calendar_Export for publicly shared calendars 2012-06-28 19:12:50 +02:00
Georg Ehrke
930bbeabd4 Calendar Export: replace spaces with dashes in the name of the calendar / event 2012-06-28 19:04:14 +02:00
Georg Ehrke
9dd7ca2667 some changes and more doc for OC_Calendar_Export class 2012-06-28 18:54:13 +02:00
Georg Ehrke
9a4709e68d fix calendar export for Apple iCal - i hate bloody line ends 2012-06-28 16:41:00 +02:00
Georg Ehrke
c4f5639cb4 Merge branch 'master' into calendar_export 2012-06-28 15:24:30 +02:00
Bjoern Schiessle
bdd1baeb85 use public API 2012-06-28 14:18:57 +02:00
Bjoern Schiessle
e5792cc064 adjust the name and/or location of the stored versions if the actual file gets moved or renamed 2012-06-28 14:06:20 +02:00
Bjoern Schiessle
f22f49671b move hook to erase versions from deleted files to the right place 2012-06-28 12:42:47 +02:00
Bjoern Schiessle
52f99a7570 delete file versions if the user deletes a file 2012-06-28 11:48:57 +02:00
Bjoern Schiessle
dac539b619 handover the correct timestamp 2012-06-28 11:46:17 +02:00
Georg Ehrke
3cea1b062e Merge branch 'master' into calendar_export 2012-06-28 09:27:54 +02:00
Thomas Tanghus
e04a605b9b No need for this anymore. 2012-06-28 01:51:42 +02:00
Thomas Tanghus
a48aba316e Smoother profile picture loading - hopefully. 2012-06-28 01:46:33 +02:00
Michael Gapczynski
db6139fd41 Don't overwrite fake directory stream for Amazon S3 storage 2012-06-27 19:44:52 -04:00
Tom Needham
426193cf6c Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Thomas Tanghus
77b7f214d2 Load contactlist progressivly. 2012-06-27 22:44:28 +02:00
Georg Ehrke
e029e8cb14 Merge branch 'master' into calendar_export 2012-06-27 22:27:55 +02:00
Georg Ehrke
8712754f8c fix style of some doc 2012-06-27 22:27:48 +02:00
Georg Ehrke
1f738d8c9f Merge branch 'master' into calendar_export 2012-06-27 22:24:12 +02:00
Michael Gapczynski
9b605969f1 Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend 2012-06-27 15:23:49 -04:00
Georg Ehrke
77c66e8cc4 move some documentation to the right place 2012-06-27 21:05:46 +02:00
Georg Ehrke
25a50f00bd add merge calendar function and add some documentation to OC_Calendar_Calendar 2012-06-27 20:56:58 +02:00
Michael Gapczynski
b7f86cf282 Add Samba Share parameter to external storage UI 2012-06-27 12:24:21 -04:00
Michael Gapczynski
895d5707ee Don't overwrite fake directory stream for Shared storage 2012-06-27 12:09:11 -04:00
Michael Gapczynski
2c773d549d Don't overwrite fake directory stream for Shared storage 2012-06-27 12:07:42 -04:00
Michael Gapczynski
19f94774fb Don't overwrite fake directory stream for Dropbox and Google Drive 2012-06-27 12:04:33 -04:00
Bjoern Schiessle
c0e86489c9 no reason to strip tags at this point 2012-06-27 17:56:00 +02:00
Bjoern Schiessle
c67ae2e7f1 no reason to strip tags at this point 2012-06-27 15:56:14 +02:00
Bart Visscher
235515e84b Something like this should do it for sharing contacts 2012-06-27 15:44:42 +02:00
Bjoern Schiessle
d5237c42bc Util::formatDate() expect $timestamp as double 2012-06-27 15:05:40 +02:00
Georg Ehrke
90b5cf680f Merge branch 'master' into calendar_export 2012-06-27 14:05:11 +02:00
Bjoern Schiessle
060a297260 enable highlighting of address in OSM. 2012-06-27 11:46:42 +02:00
Bjoern Schiessle
7af76e36e1 enable highlighting of address in OSM. 2012-06-27 11:41:52 +02:00
Michael Gapczynski
79da782892 Improve error handling of Dropbox storage backend 2012-06-26 20:37:50 -04:00
Thomas Tanghus
3edc40a68a Load default categories if there are none, 2012-06-27 02:12:53 +02:00
Thomas Tanghus
823bef3a09 Ensure event handlers are being set when adding first contact. 2012-06-27 02:12:53 +02:00
Thomas Tanghus
afd9705283 Add check for return value. 2012-06-27 02:12:53 +02:00
Bart Visscher
b9e1033563 Basic framework for contacts sharing 2012-06-27 01:05:36 +02:00
Michael Gapczynski
32f9901bcd Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend() 2012-06-27 01:05:36 +02:00
Michael Gapczynski
28b7793d5b Fixes and change database table from sharing to share 2012-06-27 01:05:36 +02:00
Michael Gapczynski
bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski
8198114615 Some more changes to getItems() and fixes in shared storage 2012-06-27 01:05:36 +02:00
Michael Gapczynski
71350bc618 I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api. 2012-06-27 01:05:36 +02:00
Michael Gapczynski
945565f420 Move ajax and js files to core 2012-06-27 01:05:36 +02:00
Michael Gapczynski
f55f13eebc Don't call getLocalFile() until you know it actually is music 2012-06-26 14:51:31 -04:00
Thomas Tanghus
cad282b73f Added some error checking. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
1b2d09f9ca Added missing requesttoken. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
d8b181cd84 Added error checking on all db queries. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
db115429f7 Added createUser hook. 2012-06-26 18:15:24 +02:00
Bjoern Schiessle
de4a540ce6 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-26 16:30:34 +02:00
Thomas Tanghus
46e93168cd Fix variable name. 2012-06-26 16:06:52 +02:00
Bjoern Schiessle
7dc72a48cc Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-26 15:48:21 +02:00
Georg Ehrke
ae00f40b97 add OC_Calendar_Object::createUID() 2012-06-26 15:21:41 +02:00
Georg Ehrke
b9ce4e1f40 add OC_Calendar_Object::createUID() 2012-06-26 15:20:29 +02:00
Bjoern Schiessle
9cb01bd093 xss fix 2012-06-26 14:27:50 +02:00
Georg Ehrke
c7de74c471 Merge branch 'master' into calendar_export 2012-06-26 14:15:07 +02:00
Thomas Tanghus
bf756293c6 Added signals. 2012-06-26 05:26:50 +02:00
Thomas Tanghus
8df59852a4 Adjust pic width a bit. 2012-06-26 04:09:45 +02:00
Thomas Tanghus
b384d79bf8 Remove x-scrollbar from contacts list. 2012-06-25 23:32:03 +02:00
Bart Visscher
103ae6faa4 Media: Change includes in app.php to use the autoloader 2012-06-25 21:05:10 +02:00
Arthur Schiwon
a72eddeef7 LDAP: compare base trees case insensitively 2012-06-25 20:54:21 +02:00
Arthur Schiwon
fb53708d10 LDAP: compare base trees case insensitively 2012-06-25 20:53:45 +02:00
Thomas Tanghus
2250fb1159 Emit Completed. 2012-06-25 20:30:21 +02:00
Thomas Tanghus
2ad93849ab Idiot proof dialog ;-) 2012-06-25 19:33:51 +02:00
Thomas Tanghus
dc4b891327 Better visual feedback and prevent drop on self. 2012-06-25 18:24:15 +02:00
Thomas Tanghus
b8d6ad0431 Improve styling on draggables. 2012-06-25 18:24:15 +02:00
Sam Tuke
380f41136c Added placeholder msg to share with menu to clarify user list restricted to security context 2012-06-25 16:57:41 +01:00
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
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
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
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
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
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
9e6d2f2f82 Improve prev/next selection on delete. 2012-06-24 15:07:44 +02: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
17e289aef2 Merge branch 'master' into calendar_export 2012-06-23 19:54:12 +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
Brice Maron
d39d7fb9ff Remove references to /apps/ and correct inclusion of settings 2012-06-22 22:05:39 +00:00
Brice Maron
b5e3e150eb Correction of path looking for apps and css 2012-06-22 20:58:52 +00:00
Bart Visscher
ded9ea5ad3 Spelling fixes 2012-06-22 22:57:35 +02:00
Bart Visscher
ea3a6d9fcf Merge resource error-suppressing fix 2012-06-22 22:54:25 +02:00
Bart Visscher
2e6e154475 Gallery: Fix opening folders with a ' in the name 2012-06-22 22:46:12 +02:00
Georg Ehrke
0939b1b0ab Merge branch 'master' into calendar_export 2012-06-22 21:36:51 +02:00
Michael Gapczynski
618a3c1d94 Fix removing personal mounts 2012-06-22 12:22:42 -04:00
Michael Gapczynski
b650f46698 Fix variable checks for mounting Google Drive 2012-06-22 12:22:42 -04:00
Tom Needham
b591c83008 Text Editor: fix editor positioning 2012-06-22 16:20:09 +00:00
Tom Needham
41cfd55f55 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-22 16:17:23 +00:00
Bart Visscher
96ec7a66bb More session_write_close 2012-06-22 17:21:56 +02:00
Tom Needham
0aafc717ec Text Editor: fix editor positioning 2012-06-22 15:02:03 +00:00
Thomas Mueller
aade44471d pdf viewer no longer 'eats' keyboard input 2012-06-22 16:10:25 +02:00
Thomas Tanghus
1f06cdf81f Small js fix. 2012-06-22 14:27:46 +02:00
Thomas Tanghus
07124ee38d Cast translation to string. 2012-06-22 14:27:46 +02:00
Bjoern Schiessle
e1fa9c282b xss vulnerabilities fixed 2012-06-22 14:11:57 +02:00
Bjoern Schiessle
b6c862b32f use sanitizeHTML() function 
Conflicts:

	apps/gallery/lib/tiles.php
 2012-06-22 14:03:05 +02:00
Bjoern Schiessle
5b46734a40 xss vulnerability fixed 2012-06-22 13:58:15 +02:00
Brice Maron
8c2803a7c1 Correct image path and apps path replacement 2012-06-22 13:12:03 +02:00
Arthur Schiwon
e5171da300 remove unnecessary closing PHP tag 2012-06-22 12:50:49 +02:00
Arthur Schiwon
19931e2008 remove unnecessary closing PHP tag 2012-06-22 12:49:56 +02:00
Arthur Schiwon
0d9534eb4b LDAP: cheaper userExists() implementation 2012-06-22 12:43:09 +02:00
Arthur Schiwon
bef9b671ee LDAP: cheaper userExists() implementation 2012-06-22 12:42:07 +02:00
Bjoern Schiessle
65c14e21ce date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:32:57 +02:00
Bjoern Schiessle
8c28aec664 date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:30:40 +02:00
Bart Visscher
82f39d3292 Contacts: Fix name and carddav-url encoding 2012-06-21 23:30:04 +02:00
Bart Visscher
fd23c286ef Calendar: Fix caldav url encoding 2012-06-21 23:30:04 +02:00
Bart Visscher
4a22f4ca78 Calendar: convert choosecalendar.rowfields template from plain php to html+php 2012-06-21 23:30:04 +02:00
Bart Visscher
1d07b9e291 Calendar: Missing userid in allCalendars call 2012-06-21 23:30:04 +02:00
Bart Visscher
c047fdafdb Calendar: Fix missing template parameter 'shared' for new and update calendar 2012-06-21 23:30:04 +02:00
Brice Maron
95b5202893 Correct usage of approot 2012-06-21 21:13:12 +00:00
Thomas Tanghus
d72b85684f Only search for VEVENTs. 2012-06-21 20:53:50 +02:00
Bart Visscher
9045557258 Tasks: Add delete action 2012-06-21 20:18:12 +02:00
Bart Visscher
d75b5cfdd2 Tasks: Use list label for ordering by list 2012-06-21 20:18:08 +02:00
Bart Visscher
dda56c5e3d Tasks: Fix position of the summary input 2012-06-21 20:17:49 +02:00
Robin Appelman
46ad51cbe2 dont change the encryption key during the test case 2012-06-21 18:53:52 +02:00
Robin Appelman
bd8b921de4 only use 1 fsview when initializing encryption 2012-06-21 18:36:16 +02:00
Michael Gapczynski
bf6abdde2d Add missing ')' 2012-06-21 12:26:06 -04:00
Brice Maron
a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus
37d12144c2 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus
ad7154b344 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Thomas Tanghus
b17bf59ced Only search for VEVENTs. 2012-06-21 20:51:23 +02:00
Bart Visscher
b17e682609 Tasks: Add delete action 2012-06-21 19:49:28 +02:00
Bart Visscher
10351550cd Tasks: Use list label for ordering by list 2012-06-21 19:49:28 +02:00
Bart Visscher
b9e3b0ddf9 Tasks: Fix position of the summary input 2012-06-21 19:49:28 +02:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Sam Tuke
a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic) 
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
 2012-06-21 18:15:22 +01:00
Robin Appelman
49033ff8e0 dont change the encryption key during the test case 2012-06-21 18:53:10 +02:00
Robin Appelman
6707e4187e only use 1 fsview when initializing encryption 2012-06-21 18:35:12 +02:00
Robin Appelman
56de98ed8c fix saved file size for uploaded files 2012-06-21 18:22:18 +02:00
Robin Appelman
da9107fe69 fix saved file size for uploaded files 2012-06-21 18:07:56 +02:00
Robin Appelman
7b4cb44af8 truncate decrypted files based on size 2012-06-21 17:51:54 +02:00
Robin Appelman
d0455c5819 truncate decrypted files based on filelength 2012-06-21 17:38:00 +02:00
Bjoern Schiessle
1338279ca0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 16:42:16 +02:00
Georg Ehrke
49d9eb7acf fix calendar 2012-06-21 16:24:05 +02:00
Georg Ehrke
096f5598b4 fix calendar 2012-06-21 16:23:13 +02:00
Sam Tuke
7c3f6f61db Fixed missing jQuery event object - expire interface now works with Firefox 2012-06-21 14:54:24 +01:00
Georg Ehrke
288c5e7581 fix a PHP Notice 2012-06-21 15:20:53 +02:00
Georg Ehrke
f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Bjoern Schiessle
34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Bjoern Schiessle
3b4d2a971a check if user is allowed to edit bookmarks 2012-06-21 12:29:50 +02:00
Bjoern Schiessle
09d2f76727 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 11:51:50 +02:00
Bjoern Schiessle
2f9763d216 check if user is allowed to edit bookmarks 2012-06-21 11:50:51 +02:00
Georg Ehrke
37ed3b5bd2 make edit event form work with DateTime Property UTC 2012-06-21 11:35:58 +02:00
Georg Ehrke
1db2539223 make edit event form work with DateTime Property UTC 2012-06-21 11:35:20 +02:00
Bjoern Schiessle
cd005e6c62 use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
Bjoern Schiessle
f8ec280b6e correct presentation of HTML encoded characters 2012-06-21 09:44:20 +02:00
Georg Ehrke
82e8cb23fe Merge branch 'master' into calendar_export 2012-06-21 09:08:26 +02:00
Bart Visscher
fedfa4c98e DateTime objects are directly comparable 2012-06-20 21:38:56 +02:00
Bart Visscher
a6dc7345d0 Gallery: Move code/js/css from main template to the right place 2012-06-20 21:28:37 +02:00
Thomas Tanghus
10a0d5a46c More changes for updating the contacts list. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
dc8c188ffe Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
426ed27be2 Make sure address books are shown even if empty. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
0f1fe0b505 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Robin Appelman
e43d02fadb fix encrypted flags not being saved correctly 2012-06-20 20:18:42 +02:00
Robin Appelman
9ba467d629 fix encryption for binary files 2012-06-20 20:18:42 +02:00
Robin Appelman
0f2600e9ea add binary test case for encryption 2012-06-20 20:18:41 +02:00
Robin Appelman
e3f1507374 use absolute path for file proxies 2012-06-20 20:18:41 +02:00
Georg Ehrke
40e7b56783 Merge branch 'master' into calendar_export 2012-06-20 20:15:07 +02:00
Georg Ehrke
0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Georg Ehrke
c1d205cbf5 Merge branch 'master' into calendar_export 2012-06-20 20:14:03 +02:00
Arthur Schiwon
d0dbc8beab make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:04:41 +02:00
Arthur Schiwon
f255ac8b3a make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:03:25 +02:00
Arthur Schiwon
4b231c15d5 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 19:43:02 +02:00
Sam Tuke
72215a818d added new user settings interface for deleting old file versions 
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
 2012-06-20 18:25:12 +01:00
Sam Tuke
d6bf62ea4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
Sam Tuke
c244daac89 removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
Bart Visscher
6308ca6b8a Merge branch 'shared_log' 2012-06-20 17:20:46 +02:00
Bart Visscher
0086639891 Merge branch 'audit' 2012-06-20 17:20:39 +02:00
Bart Visscher
6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Bart Visscher
cd934d5d89 Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible 2012-06-20 17:10:49 +02:00
Bjoern Schiessle
5cc75ad818 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-06-20 17:08:48 +02:00
Bjoern Schiessle
8e427d80d3 use sanitizeHTML() function 2012-06-20 17:00:55 +02:00
Bjoern Schiessle
0e61b5457b use new sanitizeHTML() function 2012-06-20 17:00:33 +02:00
Arthur Schiwon
a7f0811829 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 16:31:22 +02:00
Bjoern Schiessle
5a2c93ec2d use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke
572dd9fbad Merge branch 'master' into calendar_repeat 2012-06-20 13:29:12 +02:00
Georg Ehrke
27c995230c Merge branch 'master' into calendar_export 2012-06-20 13:28:30 +02:00
Bjoern Schiessle
1ecbf459c9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 13:01:55 +02:00
Arthur Schiwon
5b02217906 forgotten $, incorrect subtract 2012-06-20 12:47:31 +02:00
Arthur Schiwon
7c6b8475eb LDAP: only map users within the User Base Tree 2012-06-20 12:47:24 +02:00
Arthur Schiwon
0289f442a8 forgotten $, incorrect subtract 2012-06-20 12:41:30 +02:00
Bjoern Schiessle
8d89bba07c use new sanitizeHTML() function 2012-06-20 12:23:26 +02:00
Bart Visscher
311c2bc0d3 Calendar: Write-close session to enable parallel events.php requests 2012-06-19 23:18:26 +02:00
Bart Visscher
c260db0e9a Tasks: Fix resizing of the content part 2012-06-19 23:17:14 +02:00
Bart Visscher
0d43d6402d Tasks: Use POST for ajax calls that change data 2012-06-19 23:17:00 +02:00
Bart Visscher
cff1b6e699 Don't use substr to get first char of string 2012-06-19 23:16:17 +02:00
Sam Tuke
28a72e0e3c Fixed deleteAll function for deleting all old versions of files (expireAll) 
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
 2012-06-19 19:42:40 +01:00
Thomas Tanghus
0b9a48b4b6 Re-add missing loadhandlers() call. 2012-06-19 14:56:21 +02:00
Thomas Tanghus
33aec973df Loading of contacts was placed outside of $(document).ready() function. 2012-06-19 14:55:14 +02:00
Georg Ehrke
5ce0097b6f Calendar: only run ->expand if the event is repeating 2012-06-19 13:30:45 +02:00
Georg Ehrke
2b2da6fe35 Calendar: js fix 2012-06-19 13:26:55 +02:00
Georg Ehrke
c8c105df33 Calendar: fix modifying of end DateTime object 2012-06-19 13:04:11 +02:00
Georg Ehrke
a38463d41a Merge branch 'master' into calendar_repeat 2012-06-19 11:30:12 +02:00
Arthur Schiwon
244920aeb0 LDAP: only map users within the User Base Tree 2012-06-19 01:15:58 +02:00
Georg Ehrke
8c8a0cca75 Merge branch 'master' into calendar_export 2012-06-18 23:10:01 +02:00
Thomas Mueller
a1364c9726 fixes oc-1026 2012-06-18 22:48:52 +02:00
Robin Appelman
debd9c8dfb fix problem with encryption flag not being saved correctly in the filecache 2012-06-18 18:18:10 +02:00
Georg Ehrke
16560fe5c1 Merge branch 'master' into calendar_repeat 2012-06-18 15:59:26 +02:00
Georg Ehrke
6e405513ab Merge branch 'master' into calendar_export 2012-06-18 15:59:21 +02:00
Georg Ehrke
13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Bart Visscher
79f9d61ec8 Allow apps to load before login, needed for user_openid 2012-06-18 15:40:48 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +02:00
Georg Ehrke
6b6d3d68d4 Merge branch 'master' into calendar_repeat 2012-06-18 14:34:43 +02:00
Georg Ehrke
c2b7d05188 Merge branch 'master' into calendar_export 2012-06-18 14:34:38 +02:00
Thomas Tanghus
e5feb4e1aa Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus
73fd4c979a Update js after contactlist change. 2012-06-18 02:21:29 +02:00
Thomas Tanghus
d8048414aa Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:39:38 +02:00
Thomas Tanghus
a4f53922c2 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus
cab4a634df Save addressbook id to be able to rearrange contacts properly. 2012-06-17 23:14:02 +02:00
Thomas Tanghus
3efec3fde9 Make contact list fit in viewport. 2012-06-17 23:12:48 +02:00
Thomas Tanghus
ea4d8ccf70 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus
8337b30e43 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus
7d84c4741c Use uasort instead of usort. 2012-06-17 21:50:49 +02:00
Thomas Tanghus
46a771d2e6 Sort addressbooks. 2012-06-17 21:47:15 +02:00
Thomas Tanghus
fb700de4a4 Add effect on addressbook show/hide. 2012-06-17 21:37:13 +02:00
Thomas Tanghus
9e4a41e9cb Add effect on addressbook show/hide. 2012-06-17 21:34:56 +02:00
Thomas Tanghus
5a8f4b8783 Adjustments for inview handler etc. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b6b6d69158 Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
2875901fc7 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
91f5a1de39 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b1cfc99f63 Styled address book entries. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
56d25d4d1b Make the parsing in the controller, not in the template. Assign only relevant entries to the template. 2012-06-17 20:25:32 +02:00
Stephan Bergemann
92e35bd843 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann
7f485d1b20 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Georg Ehrke
b8daae30b6 Merge branch 'master' into calendar_repeat 2012-06-17 16:41:49 +02:00
Georg Ehrke
4b872d10fc Merge branch 'master' into calendar_export 2012-06-17 16:41:44 +02:00
Tom Needham
8d67ca09b5 user_migrate: remove old code 2012-06-17 12:07:16 +00:00
Tom Needham
b064fc6968 user_migrate: remove old code 2012-06-17 12:06:40 +00:00
Georg Ehrke
229587a31e Merge branch 'master' into calendar_repeat 2012-06-17 08:36:26 +02:00
Georg Ehrke
a8da950819 Merge branch 'master' into calendar_export 2012-06-17 08:36:20 +02:00
Robin Appelman
ad4f066bac suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29 improve caching smb results a bit 2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c improve filecache support for smb 2012-06-17 02:54:23 +02:00
Thomas Tanghus
33ab91710f PDF Viewer: Double encode link. 2012-06-16 19:49:57 +02:00
Thomas Tanghus
9c6d82d00d PDF Viewer: Double encode link. 2012-06-16 19:48:33 +02:00
Georg Ehrke
7f1e0287a9 Merge branch 'master' into calendar_repeat 2012-06-16 19:04:50 +02:00
Georg Ehrke
56f8fc0f70 Merge branch 'master' into calendar_export 2012-06-16 19:04:45 +02:00
Thomas Tanghus
707660b35f files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:57:51 +02:00
Thomas Tanghus
1118498050 files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:54:55 +02:00
Thomas Tanghus
4cbdd59859 Fix char encoding. 2012-06-16 18:38:20 +02:00
Thomas Tanghus
6642ef6a50 Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Georg Ehrke
fd9a4f8d51 Merge branch 'master' into calendar_repeat 2012-06-16 09:48:43 +02:00
Georg Ehrke
be4820bbca Merge branch 'master' into calendar_export 2012-06-16 09:48:32 +02:00
Georg Ehrke
fc632b5795 fix merge conflicts 2012-06-16 09:48:07 +02:00
Georg Ehrke
31ec93bd00 remove a lot of closing php tags and empty lines at a file's end in calendar app 2012-06-16 09:45:17 +02:00
Georg Ehrke
05c1afd0d1 Merge branch 'master' into calendar_repeat 2012-06-16 09:41:31 +02:00
Georg Ehrke
4d392801cc Merge branch 'master' into calendar_export 2012-06-16 09:41:24 +02:00
Georg Ehrke
cbe5449f47 remove a closing php tag in calendar 2012-06-16 09:40:32 +02:00
Georg Ehrke
b6375e7a8c remove a closing php tag in calendar 2012-06-16 09:40:03 +02:00
Georg Ehrke
a6531d0311 Merge branch 'master' into calendar_repeat 2012-06-16 09:35:53 +02:00
Georg Ehrke
81e8ffc4ba Merge branch 'master' into calendar_export 2012-06-16 09:35:48 +02:00
Robin Appelman
bf2062b09d write_close the session when scanning files or music 2012-06-16 01:35:39 +02:00
Michael Gapczynski
ec3033a5dd Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-15 19:34:25 -04:00
Robin Appelman
195c37f88a fix for encryption binary files 2012-06-16 01:31:03 +02:00
Tom Needham
c1744d2eb6 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:17:31 +00:00
Tom Needham
8484e16516 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-15 23:14:48 +00:00
Tom Needham
e37ef6dd47 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:14:40 +00:00
Bart Visscher
4268fe61ba Calendar: Write-close session to enable parallel events.php requests 2012-06-16 00:44:23 +02:00
Bart Visscher
6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Robin Appelman
03951ccc6b fix encryption proxy for updated filecache 2012-06-15 23:11:55 +02:00
Robin Appelman
19bfe21401 add binary test case for encryption 2012-06-15 23:11:33 +02:00
Georg Ehrke
fbd45a939f Merge branch 'master' into calendar_repeat 2012-06-15 20:48:32 +02:00
Georg Ehrke
4d2894f390 Merge branch 'master' into calendar_export 2012-06-15 20:48:26 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman
449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Thomas Tanghus
5c6a7172ca Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:58:10 +02:00
Thomas Tanghus
8f6121ffa8 Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:57:04 +02:00
Georg Ehrke
aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00
Georg Ehrke
4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke
22a33b509f use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod 2012-06-15 11:39:19 +02:00
Georg Ehrke
e4529301ff change some function names in OC_Calendar_Repeat 2012-06-15 11:34:21 +02:00
Georg Ehrke
5c10683432 use easier parseable date to init datetime 2012-06-15 11:29:16 +02:00
Georg Ehrke
6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Georg Ehrke
b6a8de8530 don't clean and cache calendar on every update 2012-06-15 11:24:40 +02:00
Bjoern Schiessle
f9c34942e1 applied merge request #128: fixed some sorting and display issues with gallery app. 
This also fix bug #872 for the new gallery
 2012-06-15 10:46:29 +02:00
Georg Ehrke
0dd4ea5a4f Merge branch 'master' into calendar_export 2012-06-15 10:41:06 +02:00
Bjoern Schiessle
4b7bdd5ace Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128 
Conflicts:
	apps/gallery/templates/index.php
 2012-06-15 09:51:04 +02:00
Thomas Tanghus
effb6f1309 Update stylesheet for type=url. 2012-06-15 04:32:01 +02:00
Thomas Tanghus
8a68d09b0f Use type=url for URL field. 2012-06-15 04:32:01 +02:00
Michael Gapczynski
92083aa20c Fix upload for Google Drive; Google Documents List API documentation was misleading 2012-06-14 20:57:08 -04:00
Thomas Tanghus
f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus
3c75ac5f62 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Thomas Tanghus
ad8c4ab182 Only create new calendar when there are none. Fix oc-1007. 2012-06-15 01:55:02 +02:00
Thomas Tanghus
ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus
6d43e6565e Revert "Agree on argument type." 
This reverts commit 0f6b1be0e6.
 2012-06-15 00:53:13 +02:00
Thomas Tanghus
0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Thomas Tanghus
31db583f03 Make events show again. 2012-06-15 00:26:34 +02:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Thomas Tanghus
96a3e28c2e Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
27ab6daeb0 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Michael Gapczynski
f3b30e4658 Forgot $ sign for variable 2012-06-14 15:14:01 -04:00
Michael Gapczynski
f7e686d4f1 Revert "Fix a counting mistake" 
This reverts commit c20abfef38.
 2012-06-14 15:05:20 -04:00
Thomas Mueller
ec69377ade first load compatibility.js 2012-06-14 21:00:19 +02:00
Thomas Mueller
4cc9bf09be fix javascript error 2012-06-14 20:55:36 +02:00
Stephan Bergemann
4eb0c270aa fixed handling of fallback_images 2012-06-14 19:38:43 +02:00
Arthur Schiwon
b025ff8de3 reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:33:00 +02:00
Arthur Schiwon
12bfc551fb reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:31:38 +02:00
Michael Gapczynski
6e15b231b0 Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-14 12:27:30 -04:00
Thomas Tanghus
47c03a0eff Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus
3b58c7a407 Remove debug statements. 2012-06-14 18:03:50 +02:00
Stephan Bergemann
a3afd51b94 fixed one issue with last directory in structure having a lot of 
subdirectories and finally some pictures
 2012-06-14 18:02:07 +02:00
Thomas Tanghus
b6ee4c458b Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-14 18:00:45 +02:00
Thomas Tanghus
5b1a14f9ea Contacts: Implement CSRF prevention. 2012-06-14 18:00:13 +02:00
Bart Visscher
4510571aa1 Add app for logging access to shared files 2012-06-14 17:44:41 +02:00
Bjoern Schiessle
fa67927eb5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 
Conflicts:
	apps/gallery/templates/index.php
 2012-06-14 17:08:52 +02:00
Bjoern Schiessle
60bd2562d8 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 2012-06-14 15:16:13 +02:00
Bjoern Schiessle
6468e0a1d5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 2012-06-14 15:14:36 +02:00
Bjoern Schiessle
df4737f52a prevent xss attacks also if some javascript ends up in the alt-tag 2012-06-14 14:19:12 +02:00
Bjoern Schiessle
d28a4f0638 prevent xss attacks also if some javascript ends up in the alt-tag 2012-06-14 14:17:30 +02:00
Bjoern Schiessle
cd759aee00 fixed xss vulnerability in un-packed version of jquery.fancybox and repack it 2012-06-14 13:45:33 +02:00
Bjoern Schiessle
87855f2506 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-14 13:44:42 +02:00
Bjoern Schiessle
211a546600 fixed xss vulnerability in un-packed version of jquery.fancybox and repack it 2012-06-14 13:41:39 +02:00
Thomas Tanghus
756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Bjoern Schiessle
544f97f034 debugging output removed 2012-06-14 13:19:11 +02:00
Bjoern Schiessle
4a47fa255d xss vulnerability fixed for fancybox image viewer 2012-06-14 13:18:59 +02:00
Bjoern Schiessle
b0ecef02e9 debugging output removed 2012-06-14 13:17:06 +02:00
Bjoern Schiessle
e7b93b1807 xss vulnerability fixed for fancybox image viewer 2012-06-14 13:13:17 +02:00
Stephan Bergemann
bc6884b176 we don't neede the functions for empty stacks any more 2012-06-14 12:51:27 +02:00
Stephan Bergemann
b32afd1331 we don't have empty previewstacks any more - code cleaned up 2012-06-14 12:39:18 +02:00
Stephan Bergemann
56d2e99239 deleted some debugging output 2012-06-14 01:29:41 +02:00
Stephan Bergemann
22cd610a79 use images from deeper directories for preview if the actual directory doesn't contain any 2012-06-14 01:29:25 +02:00
Stephan Bergemann
9f59cc5eb0 improved look of directories not containing images directly 2012-06-14 01:29:17 +02:00
Stephan Bergemann
e99a95a756 now also working for directories only containing one image 2012-06-14 01:27:34 +02:00
Stephan Bergemann
4711c2bb41 fixed second_level_images issue 2012-06-14 01:27:26 +02:00
Stephan Bergemann
e4278574a8 fixed sorting errors and missbehaviours - now sorting like file browser 2012-06-14 01:27:01 +02:00
Georg Ehrke
f9af0ef703 fix another ui bug of calendar 2012-06-13 22:21:23 +02:00
Georg Ehrke
e154806838 fix another ui bug of calendar 2012-06-13 22:20:43 +02:00
Georg Ehrke
92a11011b1 another ui fix 2012-06-13 22:15:12 +02:00
Georg Ehrke
2e44ffaf02 another ui fix 2012-06-13 22:14:40 +02:00
Georg Ehrke
4ff11308a3 fix a ui bug for calendar sharing 2012-06-13 22:13:24 +02:00
Georg Ehrke
b1139e977a fix a ui bug for calendar sharing 2012-06-13 22:12:54 +02:00
Georg Ehrke
e543ec6eb6 show username of the body who shares in the summary 2012-06-13 22:07:30 +02:00
Georg Ehrke
6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke
7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher
61b044e00e Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts 2012-06-13 21:39:12 +02:00
Bart Visscher
7a8e7f18db Calendar: Clicking #datecontrol_date gives datepicker to jump to date 2012-06-13 21:39:12 +02:00
Bart Visscher
4da6b3a391 Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Georg Ehrke
c24752dc1d Merge branch 'master' into calendar_export 2012-06-13 21:38:33 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Michael Gapczynski
bd01e93469 Add support for mounting Google Drive in external storage UI 2012-06-13 13:54:50 -04:00
Thomas Tanghus
3e339f3d66 Remove check for encryption. 2012-06-13 19:04:47 +02:00
Thomas Tanghus
613a122437 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus
d33d599b1b Remove debug statements. 2012-06-13 18:57:12 +02:00
Thomas Tanghus
bc1e8cb0a2 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Georg Ehrke
3a8b280c06 Merge branch 'master' into calendar_export 2012-06-13 15:29:47 +02:00
Georg Ehrke
9bdad6fdbf fix merge conflicts 2012-06-13 11:40:00 +02:00
Michael Gapczynski
7868b25dcc Fix incorrect creation of filesystem for user@group in data folder during shares 2012-06-12 21:34:35 -04:00
Michael Gapczynski
6f55a52858 Fix incorrect creation of filesystem for user@group in data folder during shares 2012-06-12 21:33:05 -04:00
Georg Ehrke
48116cf9ab increase version of calendar app to force db upgrade 2012-06-12 19:54:07 +02:00
Georg Ehrke
d54fc6dfd4 increase possible size of uri in database - fix oc-140 2012-06-12 19:54:07 +02:00
Georg Ehrke
deb2f87556 increase version of calendar app to force db upgrade 2012-06-12 19:53:26 +02:00
Georg Ehrke
dc0adbad02 increase possible size of uri in database - fix oc-140 2012-06-12 19:52:25 +02:00
Georg Ehrke
f7727a322d Merge branch 'master' into calendar_repeat 2012-06-12 19:26:52 +02:00
Michael Gapczynski
5f80be7664 Add support for mounting Dropbox in external storage UI 2012-06-12 11:36:43 -04:00
Bjoern Schiessle
635a2f8ec9 Label the delete operation "unshare" for files in the "Shared" folder to reduce 
confusion about the operation.
 2012-06-12 16:32:00 +02:00
Bjoern Schiessle
8626f04f5d Label the delete operation "unshare" for files in the "Shared" folder to reduce 
confusion about the operation.
 2012-06-12 16:27:24 +02:00
Georg Ehrke
71573f7934 Merge branch 'master' into calendar_repeat 2012-06-12 15:58:01 +02:00
Georg Ehrke
c9d408ff8c automatic cache repeating events after an update 2012-06-12 15:56:51 +02:00
Bjoern Schiessle
ef6b6ac230 block slashes only for new files and new folders but not for file upload from url (bug #964) 2012-06-12 14:16:09 +02:00
Bjoern Schiessle
f6e7c633a0 block slashes only for new files and new folders but not for file upload from url (bug #964) 2012-06-12 14:11:28 +02:00
Thomas Tanghus
cee9d400c0 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:33:37 +02:00
Thomas Tanghus
c44591e27a Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Arthur Schiwon
b70226b493 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-12 11:57:36 +02:00
Bjoern Schiessle
4501407283 committed patch (bug #967) to add missing translations for file actions 2012-06-12 11:41:13 +02:00
Bjoern Schiessle
b38ce8adfd committed patch (bug #967) to add missing translations for file actions 2012-06-12 11:39:03 +02:00
Thomas Mueller
5e37a10334 PDF.JS updated, compatibility.js added for browser support, should fix: oc-395 2012-06-12 00:50:34 +02:00
Marco B
3be5e2af26 utf8 in der DB config 2012-06-11 23:04:28 +02:00
Georg Ehrke
66c3ddcd74 Merge branch 'master' into calendar_repeat 2012-06-11 22:18:46 +02:00
Thomas Tanghus
210b71502b Fix copy/paste error. 2012-06-11 22:18:14 +02:00
Georg Ehrke
3c9be43aa4 add some information about repeating events caching on personal settings page 2012-06-11 22:16:26 +02:00
Thomas Tanghus
e0a5e3e992 Fix js for missing address fields. 2012-06-11 22:15:56 +02:00
Thomas Tanghus
c75a7966de Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:15:31 +02:00
Thomas Tanghus
ac11647d7a Fix js for missing address fields. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
4b86cbcb6f Quick fix for index errors when not importing from files. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
c75f9f9397 Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e 2012-06-11 22:14:21 +02:00
Thomas Tanghus
8af53829d5 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Georg Ehrke
08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +02:00
Bart Visscher
759ddcbf32 Tasks: Fix resizing of the content part 2012-06-11 20:34:06 +02:00
Bart Visscher
0eee140eaf Gallery: remove extra include of lib/base.php 2012-06-11 20:34:06 +02:00
Bart Visscher
eddad8bedb Calendar: remove unused markup from #controls 2012-06-11 20:34:06 +02:00
Lukas Reschke
f9bf34340c Removed unecessary sanitization 2012-06-11 19:49:24 +02:00
Lukas Reschke
68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00
Georg Ehrke
9edd40354e Merge branch 'master' into calendar_repeat 2012-06-11 19:46:12 +02:00
Lukas Reschke
ad36fc8938 Fix double sanitization 2012-06-11 19:43:37 +02:00
Lukas Reschke
6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle
1d493a70e7 replace "=0D=0A" (\r\n) with a simple "\n" in vards during import 2012-06-11 18:13:12 +02:00
Bjoern Schiessle
18d19b022f Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-11 17:28:15 +02:00
Georg Ehrke
09e744b793 connect OC_Calendar_repeat to events.php 2012-06-11 17:25:03 +02:00
Georg Ehrke
009c4c9045 add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public 2012-06-11 17:15:50 +02:00
Georg Ehrke
2dd84373c1 fix bug in OC_Calendar_Repeat 2012-06-11 17:13:20 +02:00
Arthur Schiwon
266c5238c9 LDAP: offer config option for Group Display Name attribute 2012-06-11 16:50:54 +02:00
Arthur Schiwon
fcc9a5c8d4 LDAP: offer config option for Group Display Name attribute 2012-06-11 16:48:43 +02:00
Bjoern Schiessle
739589f485 make sure that contact data are always utf8 encoded to avoid encoding problems 2012-06-11 16:26:21 +02:00
Georg Ehrke
24a1ab8c15 Merge branch 'master' into calendar_repeat 2012-06-11 15:38:02 +02:00
Georg Ehrke
44e62c03e2 increase version number of calendar 2012-06-11 15:37:19 +02:00
Georg Ehrke
32b366585d some fixes for repeating events caching 2012-06-11 15:36:48 +02:00
Georg Ehrke
e6c8febafc add hooks to connect calendar / event changes with OC_Calendar_Repeat 2012-06-11 15:18:46 +02:00
Georg Ehrke
5cb9d82b45 modify hooks in OC_Calendar_Calendar 2012-06-11 15:16:59 +02:00
Georg Ehrke
eb3605aa63 modify hooks in OC_Calendar_Object 2012-06-11 15:15:13 +02:00
Georg Ehrke
01bd048bb3 remove insert id 2012-06-11 15:01:48 +02:00
Georg Ehrke
40459c8c66 some work on repeating events caching - basic class should work now :) 2012-06-11 15:00:51 +02:00
Lukas Reschke
c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Thomas Tanghus
74eece2620 Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:56:41 +02:00
Thomas Tanghus
6d9947b3ff Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:55:54 +02:00
Lukas Reschke
6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Arthur Schiwon
0df67aeae9 ldap: check array for emptiness, not nullness 2012-06-11 12:26:48 +02:00
Arthur Schiwon
c110308c1e Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-11 12:14:10 +02:00
Arthur Schiwon
7f5e8e39c4 ldap: check array for emptiness, not nullness 2012-06-11 12:13:55 +02:00
Lukas Reschke
6da717b644 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 
Backport for sanitized user data.
 2012-06-11 11:57:36 +02:00
Lukas Reschke
d294373f47 Sanitzing user input 2012-06-11 11:56:54 +02:00
Lukas Reschke
f8337c9d72 Using POST instead of GET. 2012-06-11 11:56:11 +02:00
Lukas Reschke
cc653a8a40 Sanitize user input 2012-06-11 11:54:45 +02:00
Lukas Reschke
8f09299e24 Sanitizing user input 2012-06-11 11:54:03 +02:00
Bart Visscher
f2216dc9d2 Gallery: Fix database creation on update, also only from version less then 0.5 2012-06-11 11:20:51 +02:00
Georg Ehrke
f4c459782b Merge branch 'master' into calendar_repeat 2012-06-11 10:59:19 +02:00
Georg Ehrke
ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55:26 +02:00
Thomas Tanghus
e79e18d866 Copy/paste error. 2012-06-11 02:40:55 +02:00
Lukas Reschke
3f9b967be7 Sanitizing user input 2012-06-11 00:36:58 +02:00
Lukas Reschke
f8d2e21c66 Sanitize user input 2012-06-11 00:23:35 +02:00
Lukas Reschke
27d1c1bb94 Sanitize user input 2012-06-11 00:14:28 +02:00
Lukas Reschke
9f276729c2 Using POST instead of GET. 2012-06-10 23:38:26 +02:00
Lukas Reschke
380aab470f Sanitzing user input 2012-06-10 23:16:59 +02:00
Michael Gapczynski
3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Thomas Tanghus
40f8419fdf Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Thomas Tanghus
c898a8a6c9 Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:54:52 +02:00
Thomas Tanghus
cdac0eae46 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-10 20:47:35 +02:00
Frank Karlitschek
6a44d02898 XSS-- 2012-06-10 19:54:04 +02:00
Frank Karlitschek
bf4626da93 prevent XSS 2012-06-10 19:52:23 +02:00
Georg Ehrke
c6a03ec6d8 remove include command for when 2012-06-10 18:41:17 +02:00
Georg Ehrke
ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke
bdb76d4873 Merge branch 'master' into calendar_export 2012-06-10 18:37:16 +02:00
Bartek Przybylski
c11f6cc3f9 fix variable name and undefined index notice 2012-06-10 17:25:50 +02:00
Bartek Przybylski
3970be3d7f fix variable name and undefined index notice 2012-06-10 17:25:19 +02:00
Bartek Przybylski
31d48d4ba4 adding missing file 2012-06-10 13:20:49 +02:00
Bartek Przybylski
de6b683b50 fix first time image loading error 2012-06-10 13:19:22 +02:00
Bartek Przybylski
2dca0926b0 gallery: removing search provider for now 2012-06-10 13:19:17 +02:00
Bartek Przybylski
7ee722e0da removing app access check, fix title for links in tiles 2012-06-10 13:18:55 +02:00
Bartek Przybylski
e073cd756c tabs for spaces, fix array key name 2012-06-10 13:18:47 +02:00
Bartek Przybylski
f6c07094c2 hide share button until sharing wont be fixed 2012-06-10 13:18:41 +02:00
Bartek Przybylski
1853a83874 adding navigation bar to gallery 2012-06-10 13:18:36 +02:00
Bartek Przybylski
fe64e625ff remove old code 2012-06-10 13:18:30 +02:00
Bartek Przybylski
f0f9269161 adding missing file 2012-06-10 13:18:17 +02:00
Bartek Przybylski
6682c60866 pictures: update script and removal some all stuff 2012-06-10 13:17:23 +02:00
Bartek Przybylski
9c1cc15c8d adding title when fancybox is displayed 2012-06-10 13:16:19 +02:00
Bartek Przybylski
c932f93a40 replace spaces with tabs, use const and linkTo instead of static path 2012-06-10 13:16:12 +02:00
Bartek Przybylski
276aefba81 hack for file download 2012-06-10 13:16:06 +02:00
Bartek Przybylski
71b4cddd52 removing test image 2012-06-10 13:16:00 +02:00
Bartek Przybylski
c67de113c6 aviod incorrect image size returning in gallery listing 2012-06-10 13:15:51 +02:00
Bartek Przybylski
63c02fd595 use fancybox to display image preview 2012-06-10 13:15:45 +02:00
Bartek Przybylski
7aff5eae6c navigate on galleries 2012-06-10 13:15:39 +02:00
Bartek Przybylski
2b80102909 new db scheme 2012-06-10 13:15:32 +02:00
Bartek Przybylski
9b2b5e0f6d git status 2012-06-10 13:15:23 +02:00
Bartek Przybylski
76f20eb57c fix first time image loading error 2012-06-10 13:05:00 +02:00
Thomas Tanghus
746994c2be Fixed merge conflict. 2012-06-10 12:59:36 +02:00
Thomas Tanghus
f90c8738ab Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Bartek Przybylski
0838b4c225 gallery: removing search provider for now 2012-06-10 09:52:33 +02:00
Frank Karlitschek
be6848a549 let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways. 2012-06-09 23:18:56 +02:00
Michiel de Jong
995f9c7348 sanitize scope and host 2012-06-09 21:08:24 +02:00
Michiel de Jong
322fd51261 avoid clickjacking 2012-06-09 21:08:24 +02:00
Michael Gapczynski
ab41b57f62 Add Dropbox storage backend 2012-06-09 15:02:48 -04:00
Michiel de Jong
b46903fa76 sanitize when logged in as another user 2012-06-09 20:39:24 +02:00
Robin Appelman
d065b2d29e prevent opening non-music files through the media ajax api 2012-06-09 17:39:14 +02:00
Robin Appelman
601bac746d use absolute path for file proxies 2012-06-09 17:34:13 +02:00
Georg Ehrke
e7f6f7e452 fix another XSS 2012-06-09 16:45:37 +02:00
Georg Ehrke
642e7ce110 fix another XSS 2012-06-09 16:44:48 +02:00
Georg Ehrke
f955f6a685 fix XSS in Calendar 2012-06-09 16:36:01 +02:00
Georg Ehrke
c9214afff8 fix XSS in Calendar 2012-06-09 16:35:35 +02:00
Georg Ehrke
ff4b175622 increase height of event dialog 2012-06-09 15:40:27 +02:00
Georg Ehrke
009fbd89b4 fix creation of monthly repeated events 2012-06-09 15:40:27 +02:00
Georg Ehrke
2862740674 increase height of event dialog 2012-06-09 15:38:03 +02:00
Georg Ehrke
cfb9c764ca fix creation of monthly repeated events 2012-06-09 15:15:00 +02:00
Bartek Przybylski
001293a702 removing app access check, fix title for links in tiles 2012-06-09 15:12:50 +02:00
Thomas Tanghus
0f454215e7 Code cleanup. 2012-06-09 15:04:08 +02:00
Thomas Tanghus
59d16c5f9a Contacts: Use POST instead of GET. 2012-06-09 15:02:23 +02:00
Thomas Tanghus
081e1874cb Contacts: Use POST instead of GET. 2012-06-09 15:00:44 +02:00
Thomas Tanghus
88341e5797 Code cleanup. 2012-06-09 15:00:44 +02:00
Georg Ehrke
28ab92ee76 make use of post instead of get 2012-06-09 14:41:26 +02:00
Bart Visscher
4aee5a7ce4 Tasks: Use POST for ajax calls that change data 2012-06-09 14:39:41 +02:00
Georg Ehrke
c83f418a02 Merge branch 'master' into calendar_repeat 2012-06-09 12:30:39 +02:00
Georg Ehrke
a9b561430a add hooks for events 2012-06-09 12:30:09 +02:00
Georg Ehrke
7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Georg Ehrke
cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke
ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Bartek Przybylski
201a40a1a3 tabs for spaces, fix array key name 2012-06-08 21:55:28 +02:00
Bartek Przybylski
0c7431e57d hide share button until sharing wont be fixed 2012-06-08 21:44:33 +02:00
Bartek Przybylski
8bc22907b8 adding navigation bar to gallery 2012-06-08 21:44:33 +02:00
Bartek Przybylski
6b0a2ae60e remove old code 2012-06-08 21:44:32 +02:00
Bartek Przybylski
71b04717ab adding missing file 2012-06-08 21:44:31 +02:00
Bartek Przybylski
9e434dea60 tabs for spaces, removing thumbnail on file removal 2012-06-08 21:44:31 +02:00
Bart Visscher
ac36512102 Don't use substr to get first char of string 2012-06-08 21:38:10 +02:00
Thomas Tanghus
23533a763a Don't fix bugs not present in this branch ;-) 2012-06-08 20:44:58 +02:00
Thomas Tanghus
5eb5d23ac1 Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 
Conflicts:

	apps/contacts/ajax/uploadphoto.php
 2012-06-08 20:43:42 +02:00
Thomas Tanghus
0a49bae87a Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 2012-06-08 20:39:54 +02:00
Georg Ehrke
e83e30a8a9 Merge branch 'master' into calendar_repeat 2012-06-08 19:54:42 +02:00
Michael Gapczynski
8fcdccdcdc Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage 2012-06-08 13:48:38 -04:00
Michael Gapczynski
4b3ae60558 Working UI for external storage mount configuration 2012-06-08 11:42:29 -04:00
Bjoern Schiessle
eb192ff4f3 code cleanup from previous commit 2012-06-08 16:31:12 +02:00
Bjoern Schiessle
cf1430df45 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-06-08 16:27:07 +02:00
Bjoern Schiessle
0722ff6e32 fix for bug #872: Folders not holding any images are ignored, even if they hold subfolders with images 2012-06-08 16:24:31 +02:00
Arthur Schiwon
0dc371f579 typo in var 2012-06-08 14:58:07 +02:00
Arthur Schiwon
f70615106f typo in var 2012-06-08 14:57:27 +02:00
Arthur Schiwon
8c7fa15aaf Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:58:00 +02:00
Arthur Schiwon
4d3b7574f3 Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:55:16 +02:00
Georg Ehrke
65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Georg Ehrke
1d93a8fcfe Merge branch 'master' into calendar_export 2012-06-08 11:20:17 +02:00
Robin Appelman
4768510923 split share and root config for smb backend, also sanitize config a bit more 2012-06-08 01:29:55 +02:00
Bart Visscher
4afcae8d56 Gallery: Fix database creation on update, also only from version less then 0.5 2012-06-07 23:38:50 +02:00
Brice Maron
cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus
d4f6f3e935 Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00
Thomas Tanghus
33c802dcaa Break text to fit in dialog. 2012-06-07 20:29:15 +02:00
Arthur Schiwon
0f68276921 LDAP: cache the results, reduce LDAP searches 2012-06-07 18:56:06 +02:00
Arthur Schiwon
c2f557f1dd LDAP: cache the results, reduce LDAP searches 2012-06-07 18:55:32 +02:00
Arthur Schiwon
4beabe23e7 ldap: enable the destructor 2012-06-07 18:15:11 +02:00
Arthur Schiwon
6626598435 ldap: enable the destructor 2012-06-07 18:13:41 +02:00
Bartek Przybylski
14e1be56a0 pictures: update script and removal some all stuff 2012-06-07 17:08:04 +02:00
Thomas Tanghus
d2a8746c49 Edited combobox to adhere to coding standards and added a dblclick handler. 2012-06-07 16:44:54 +02:00
Arthur Schiwon
f3f3c791ba ldap: correct query condition and determining of success 2012-06-07 13:40:26 +02:00
Arthur Schiwon
691f00eb39 ldap: check index carefully, can be 0 2012-06-07 13:40:16 +02:00
Arthur Schiwon
44880ab3fa ldap: remove unused private functions 2012-06-07 13:39:42 +02:00
Arthur Schiwon
6894882ca9 ldap: correct query condition and determining of success 2012-06-07 13:39:42 +02:00
Arthur Schiwon
470cb17f90 ldap: check index carefully, can be 0 2012-06-07 13:39:42 +02:00
Thomas Tanghus
9266f4da99 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:10:19 +02:00
Thomas Tanghus
312536dbf9 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:08:42 +02:00
Thomas Tanghus
de6d550cce Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:22:25 +02:00
Thomas Tanghus
e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Thomas Tanghus
3d48bf18d3 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:58:15 +02:00
Thomas Tanghus
3804f68ff5 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus
9c84149119 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Bartek Przybylski
8fd6cdf407 adding title when fancybox is displayed 2012-06-06 23:29:23 +02:00
Bartek Przybylski
5417d803c4 replace spaces with tabs, use const and linkTo instead of static path 2012-06-06 23:23:49 +02:00
Brice Maron
5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron
6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron
cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bartek Przybylski
a90089c792 hack for file download 2012-06-06 22:20:56 +02:00
Bartek Przybylski
7c88081acb removing test image 2012-06-06 22:13:49 +02:00
Bartek Przybylski
aa0fc3c69a aviod incorrect image size returning in gallery listing 2012-06-06 22:13:49 +02:00
Bartek Przybylski
671fe49809 use fancybox to display image preview 2012-06-06 22:13:49 +02:00
Bartek Przybylski
76e7e361ae navigate on galleries 2012-06-06 22:13:49 +02:00