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

2322 commits

Author SHA1 Message Date
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
Thomas Tanghus
74eece2620 Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:56:41 +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
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
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
Thomas Tanghus
746994c2be Fixed merge conflict. 2012-06-10 12:59:36 +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
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
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
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
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
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
8c7fa15aaf Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:58:00 +02:00
Arthur Schiwon
0f68276921 LDAP: cache the results, reduce LDAP searches 2012-06-07 18:56:06 +02:00
Arthur Schiwon
4beabe23e7 ldap: enable the destructor 2012-06-07 18:15:11 +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
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
de6d550cce Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:22:25 +02:00
Thomas Tanghus
3d48bf18d3 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:58:15 +02:00
Bjoern Schiessle
bb07c20bf4 fixed var name, $filename should be $foldername 2012-06-06 18:11:23 +02:00
Arthur Schiwon
48ccfa42d3 LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914 2012-06-06 12:31:22 +02:00
Thomas Tanghus
517bd28940 Corrected typos. 2012-06-06 11:49:45 +02:00
Robin Appelman
f1b10fcc93 update translations 2012-06-06 00:29:44 +02:00
Robin Appelman
063c9accb6 prevent creating files with a / the name 2012-06-06 00:04:02 +02:00
Bjoern Schiessle
3a5076d646 show pictures in folder with special characters, e.g. '+' 2012-06-05 17:58:23 +02:00
Arthur Schiwon
769d94ab26 linkTo instead of hard links in Files and Files_Archive. Hope that makes sense. 2012-06-05 14:14:26 +02:00
Bjoern Schiessle
44260a552c xss vulnerability fixed 2012-06-05 10:49:36 +02:00
Bjoern Schiessle
e817504569 xss vulnerability fixed 2012-06-05 10:49:26 +02:00
Bjoern Schiessle
4bc88ef59d prevent xss attacks by manipulating image file names 2012-06-04 18:11:17 +02:00
Bjoern Schiessle
d5566d0267 prevent xss attacks by manipulating text file names 2012-06-04 18:11:08 +02:00
Bjoern Schiessle
c8f670dfab Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 14:00:35 +02:00
Arthur Schiwon
8983c6dd6b commited a bit too much before 2012-06-04 13:27:55 +02:00
Thomas Tanghus
d657263403 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-04 13:13:53 +02:00
Thomas Tanghus
74ac2ac63a Contacts: When editing photo on a newly created contact the name in the contact list was cleared. 2012-06-04 13:13:43 +02:00
Arthur Schiwon
b48228ae3d LDAP: link to documentation on settings page 2012-06-04 13:04:18 +02:00
Arthur Schiwon
34464b1f8b LDAP group backend: Set configured true when it is... fixe oc-887 2012-06-01 16:02:04 +02:00
Arthur Schiwon
86279bc192 LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867 2012-06-01 14:05:08 +02:00
Frank Karlitschek
e44f9ab46e correctly detect https 2012-06-01 11:47:14 +02:00
Frank Karlitschek
8ed13e627e don´t do warnings. 
Not sure if this start_session call is really needed here.
 2012-06-01 11:08:40 +02:00
Frank Karlitschek
670022cc8a fix the breadcrumb 2012-05-31 21:43:07 +02:00
Frank Karlitschek
c3ccdbaa79 more fixes 2012-05-31 21:14:46 +02:00
Frank Karlitschek
d56966f14f someone broke this completely. Hope it works again. Please check your apache error log and turn php notices on if you work on ajax call 2012-05-31 20:45:39 +02:00
Frank Karlitschek
739c5488a5 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-05-31 20:17:30 +02:00
Frank Karlitschek
5d425a9f79 use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:16:44 +02:00
Georg Ehrke
0059535140 fix potential XSS 2012-05-31 20:03:15 +02:00
Arthur Schiwon
7ec3e37199 LDAP: make queries compatible also with PostgreSQL 2012-05-31 13:06:27 +02:00
Arthur Schiwon
449b9b92f0 LDAP: fix wrong value for input type 2012-05-30 22:37:00 +02:00
Arthur Schiwon
93849916bb LDAP: support for 'member' as group-member-association 2012-05-30 22:36:48 +02:00