Bjoern Schiessle
0d1a07d4ae
show pictures in folder with special characters, e.g. '+'
2012-06-05 16:36:05 +02:00
Bjoern Schiessle
d71c4db10a
xss vulnerability fixed
2012-06-05 10:46:28 +02:00
Bjoern Schiessle
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
Thomas Tanghus
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
Frank Karlitschek
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
Bart Visscher
64f6534f51
Tasks: styling fixes
2012-06-04 23:04:31 +02:00
Bart Visscher
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
Bart Visscher
091b343d5c
Calendar & Contacts: Store import progress in OC_Cache
...
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Bjoern Schiessle
f291a843bf
prevent xss attacks by manipulating image file names
2012-06-04 16:22:25 +02:00
Bjoern Schiessle
1d6ca084a6
prevent xss attacks by manipulating text file names
2012-06-04 16:20:03 +02:00
Thomas Tanghus
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
Arthur Schiwon
782d82730a
commited a bit too much before
2012-06-04 13:28:31 +02:00
Thomas Tanghus
2842088b75
Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
2012-06-04 13:14:31 +02:00
Thomas Tanghus
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
Arthur Schiwon
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
Bjoern Schiessle
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
Arthur Schiwon
e58efd7877
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:38 +02:00
Arthur Schiwon
a4f177d75d
LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
2012-06-01 13:49:11 +02:00
Frank Karlitschek
a2b41a140e
correctly detect https
2012-06-01 11:46:18 +02:00
Frank Karlitschek
83c6714c72
don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
2012-06-01 11:12:50 +02:00
Frank Karlitschek
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
Frank Karlitschek
5f4132d6ba
more fixes
2012-05-31 21:16:36 +02:00
Frank Karlitschek
57a56299d8
more fixes
...
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
Frank Karlitschek
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
Georg Ehrke
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
Arthur Schiwon
3db28d7616
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-05-31 19:46:51 +02:00
Sam Tuke
e93bb5135d
Applied fix from kalassico for "Chiper text must be a string" bug ( http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094 )
2012-05-31 12:25:07 +01:00
Arthur Schiwon
3b36a9b704
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:07:49 +02:00
Bart Visscher
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Bart Visscher
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
Bart Visscher
0934a975b2
Remove unused L10N variable
2012-05-31 13:01:30 +02:00
Arthur Schiwon
8b4e16ec77
LDAP: fix wrong value for input type
2012-05-30 22:34:51 +02:00
Frank Karlitschek
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
Thomas Tanghus
dbcd26be68
Contacts: Rewrote import script.
2012-05-29 23:41:53 +02:00
Michael Gapczynski
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
Thomas Tanghus
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +02:00
Thomas Tanghus
51aa84e70a
Contacts: NOTE wasn't saved properly.
2012-05-29 16:43:59 +02:00
Thomas Tanghus
dff16e70a9
Contacts: Improve loading and cleanup of dialogs.
2012-05-29 16:43:59 +02:00
Georg Ehrke
29372677ae
add lib collection and lib scanner to media's appinfo/app.php
2012-05-29 13:36:51 +02:00
Georg Ehrke
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
Brice Maron
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
Thomas Tanghus
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
Frank Karlitschek
1eebbaebdb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-28 13:59:47 +02:00
Frank Karlitschek
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
Thomas Tanghus
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
Georg Ehrke
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
Robin Appelman
143287738a
allow longer paths for gallery
2012-05-26 21:50:54 +02:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Arthur Schiwon
d2369b6e96
LDAP: support for 'member' as group-member-association
2012-05-26 16:38:37 +02:00