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

2405 commits

Author SHA1 Message Date
Robin Appelman
8a902d8f65 improve filecache support for smb 2012-07-10 14:20:11 +02:00
Robin Appelman
a1fefea66f split share and root config for smb backend, also sanitize config a bit more 2012-07-10 14:19:51 +02:00
Robin Appelman
8fcce55e76 share code between smb and ftp filestorage backends 2012-07-10 14:19:40 +02:00
Robin Appelman
539e4a1813 smb filestorage backend 2012-07-10 14:19:31 +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
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
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
b11b6afbb9 Hopefully fix for drag'n'drop import in oc-813. 2012-07-05 00:25:38 +02:00
Thomas Tanghus
5fb9b3e965 Disable expires header on thumbnail and photo. 2012-07-04 15:32:41 +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
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
895d5707ee Don't overwrite fake directory stream for Shared storage 2012-06-27 12:09:11 -04:00
Bjoern Schiessle
c0e86489c9 no reason to strip tags at this point 2012-06-27 17:56:00 +02:00
Bjoern Schiessle
7af76e36e1 enable highlighting of address in OSM. 2012-06-27 11:41:52 +02:00
Georg Ehrke
ae00f40b97 add OC_Calendar_Object::createUID() 2012-06-26 15:21:41 +02:00
Arthur Schiwon
a72eddeef7 LDAP: compare base trees case insensitively 2012-06-25 20:54:21 +02:00
Thomas Tanghus
2ad93849ab Idiot proof dialog ;-) 2012-06-25 19:33:51 +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
Bjoern Schiessle
85ac75b4f4 xss vulnerability fixed 2012-06-25 12:38:11 +02:00
Bjoern Schiessle
0083dbb3ce Only delete existing thumbnails (bug #1100) 2012-06-25 10:11:06 +02: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
Georg Ehrke
a12557ca4d another fix for oc-1044 2012-06-24 09:42:14 +02:00
Tom Needham
1c0e72cd5a Text editor: Waste less space for line numbers 2012-06-23 14:43:52 +00:00
Tom Needham
b591c83008 Text Editor: fix editor positioning 2012-06-22 16:20:09 +00:00
Bjoern Schiessle
b6c862b32f use sanitizeHTML() function 
Conflicts:

	apps/gallery/lib/tiles.php
 2012-06-22 14:03:05 +02:00
Arthur Schiwon
e5171da300 remove unnecessary closing PHP tag 2012-06-22 12:50:49 +02:00
Arthur Schiwon
0d9534eb4b LDAP: cheaper userExists() implementation 2012-06-22 12:43:09 +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
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
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
Georg Ehrke
096f5598b4 fix calendar 2012-06-21 16:23:13 +02:00
Georg Ehrke
288c5e7581 fix a PHP Notice 2012-06-21 15:20:53 +02:00
Bjoern Schiessle
3b4d2a971a check if user is allowed to edit bookmarks 2012-06-21 12:29:50 +02:00
Georg Ehrke
37ed3b5bd2 make edit event form work with DateTime Property UTC 2012-06-21 11:35:58 +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
Arthur Schiwon
d0dbc8beab make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:04:41 +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
Arthur Schiwon
0289f442a8 forgotten $, incorrect subtract 2012-06-20 12:41:30 +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
Arthur Schiwon
244920aeb0 LDAP: only map users within the User Base Tree 2012-06-19 01:15:58 +02:00
Thomas Tanghus
d8048414aa Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:39:38 +02:00
Tom Needham
8d67ca09b5 user_migrate: remove old code 2012-06-17 12:07:16 +00:00
Thomas Tanghus
33ab91710f PDF Viewer: Double encode link. 2012-06-16 19:49:57 +02:00
Thomas Tanghus
707660b35f files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:57:51 +02:00
Georg Ehrke
fc632b5795 fix merge conflicts 2012-06-16 09:48:07 +02:00
Georg Ehrke
cbe5449f47 remove a closing php tag in calendar 2012-06-16 09:40:32 +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
Tom Needham
c1744d2eb6 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:17:31 +00:00
Thomas Tanghus
5c6a7172ca Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:58:10 +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
Arthur Schiwon
b025ff8de3 reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:33:00 +02:00
Thomas Tanghus
3b58c7a407 Remove debug statements. 2012-06-14 18:03:50 +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
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
df4737f52a prevent xss attacks also if some javascript ends up in the alt-tag 2012-06-14 14:19:12 +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
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
Georg Ehrke
f9af0ef703 fix another ui bug of calendar 2012-06-13 22:21:23 +02:00
Georg Ehrke
92a11011b1 another ui fix 2012-06-13 22:15:12 +02:00
Georg Ehrke
4ff11308a3 fix a ui bug for calendar sharing 2012-06-13 22:13:24 +02:00
Georg Ehrke
e543ec6eb6 show username of the body who shares in the summary 2012-06-13 22:07:30 +02:00
Thomas Tanghus
3e339f3d66 Remove check for encryption. 2012-06-13 19:04:47 +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
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
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
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
Thomas Tanghus
cee9d400c0 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:33: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
Thomas Tanghus
210b71502b Fix copy/paste error. 2012-06-11 22:18:14 +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
Arthur Schiwon
266c5238c9 LDAP: offer config option for Group Display Name attribute 2012-06-11 16:50:54 +02:00