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
Frank Karlitschek
5c9325bbe0
CLI is no availabe in stable4
2012-06-05 14:10:50 +02:00
Arthur Schiwon
7621559d00
make groups not static, fixes oc-919
2012-06-05 14:02:13 +02:00
Frank Karlitschek
d3bb01b598
more reliable host detection for reverse proxy scenarios
2012-06-05 12:53:48 +02:00
Frank Karlitschek
80fc01388a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 12:52:44 +02:00
Frank Karlitschek
e3031ae28b
more reliable host detection for reverse proxy servers
2012-06-05 12:52:23 +02:00
Bjoern Schiessle
061abb88b5
write a warning to the log file if .htaccess is not writable instead of failing silently
2012-06-05 11:50:21 +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
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
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +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
786325a4bb
Fix newline in code
2012-06-04 22:24:17 +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
Arthur Schiwon
dfc90021ca
load authentication apps before checking wether user exists. fixes oc-910
2012-06-04 21:40:32 +02:00
Arthur Schiwon
b0d83d6d8d
make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863
2012-06-04 21:40:18 +02:00
Arthur Schiwon
ae2bcf968d
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-04 21:33:02 +02:00
Arthur Schiwon
454f81fb15
load authentication apps before checking wether user exists. fixes oc-910
2012-06-04 21:31:35 +02:00
Arthur Schiwon
773f3cf973
make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863
2012-06-04 21:30:58 +02:00
Tom Needham
daa4d2cd84
Validate email on save
2012-06-04 18:44:55 +00:00
Tom Needham
cf85a1e264
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:43:22 +00:00
Tom Needham
55e88120cd
Validate email on save
2012-06-04 18:42:25 +00:00
Michael Gapczynski
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
Robin Appelman
b117a1e3ec
update file paths in filecache when the parent is renamed
2012-06-04 18:12:25 +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
ca64a4080f
don't allow user to delete Shared dir via webdav and sync client (bug #774 )
2012-06-04 18:08:51 +02:00
Bjoern Schiessle
6d70f42dd4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:04:29 +02:00
Bjoern Schiessle
c6a1d9491b
don't allow user to delete Shared dir via webdav and sync client (bug #774 )
2012-06-04 18:03:16 +02:00
Robin Appelman
59086fe082
update file paths in filecache when the parent is renamed
2012-06-04 17:59:42 +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
Bjoern Schiessle
7fbe306990
no move (rename) operation for "Shared" directory
2012-06-04 14:00:35 +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
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
Arthur Schiwon
8983c6dd6b
commited a bit too much before
2012-06-04 13:27:55 +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
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
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
Arthur Schiwon
8554525ebe
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-04 13:04:37 +02:00
Arthur Schiwon
b48228ae3d
LDAP: link to documentation on settings page
2012-06-04 13:04:18 +02:00
Frank Karlitschek
64fe06710a
add deprecated warning
2012-06-04 12:49:33 +02:00