dcf1eed816
add unique instance id
2012-06-05 19:32:48 +02:00
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
9d936976a9
Make check for writable apps dir configurable
2012-06-05 17:51:52 +02:00
57326ea1f8
Move setting remote_core.* to after setup of OC, also check if it is not set yet
2012-06-05 17:51:52 +02:00
0d1a07d4ae
show pictures in folder with special characters, e.g. '+'
2012-06-05 16:36:05 +02:00
edecc5bca3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 15:29:59 +02:00
ae91557748
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 15:26:51 +02:00
e747fd794e
fix login for hosts running on port 80
2012-06-05 15:26:31 +02:00
6c4231b3d3
Per user quota didn't show in FF (and possibly IE) http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324 .
2012-06-05 14:17:38 +02:00
7621559d00
make groups not static, fixes oc-919
2012-06-05 14:02:13 +02:00
80fc01388a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 12:52:44 +02:00
e3031ae28b
more reliable host detection for reverse proxy servers
2012-06-05 12:52:23 +02:00
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
d71c4db10a
xss vulnerability fixed
2012-06-05 10:46:28 +02:00
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +02:00
64f6534f51
Tasks: styling fixes
2012-06-04 23:04:31 +02:00
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
786325a4bb
Fix newline in code
2012-06-04 22:24:17 +02:00
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
dfc90021ca
load authentication apps before checking wether user exists. fixes oc-910
2012-06-04 21:40:32 +02:00
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
cf85a1e264
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:43:22 +00:00
55e88120cd
Validate email on save
2012-06-04 18:42:25 +00:00
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
6d70f42dd4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:04:29 +02:00
c6a1d9491b
don't allow user to delete Shared dir via webdav and sync client (bug #774 )
2012-06-04 18:03:16 +02:00
59086fe082
update file paths in filecache when the parent is renamed
2012-06-04 17:59:42 +02:00
f291a843bf
prevent xss attacks by manipulating image file names
2012-06-04 16:22:25 +02:00
1d6ca084a6
prevent xss attacks by manipulating text file names
2012-06-04 16:20:03 +02:00
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
782d82730a
commited a bit too much before
2012-06-04 13:28:31 +02:00
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
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
8755fd88bb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 12:46:22 +02:00
1e6802e567
add deprecated warning
2012-06-04 12:45:45 +02:00
4eba41a2a0
no move (rename) operation for "Shared" directory
2012-06-04 11:04:05 +02:00
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
f3c1d1eded
link to apps.owncloud.com
...
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
e90cbcaf5b
http user backend
2012-06-03 02:51:05 +02:00
993ebc4c90
Verify user exists when checking if logged in, fix for bug oc-863
2012-06-02 20:06:52 -04:00
cc84bd2993
Fix typo in log message
2012-06-01 15:15:05 -04:00
66f1957e3b
Improve efficiency of retrieving log file entries
2012-06-01 14:39:50 -04:00
3d7143c730
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:01:00 +01:00
4aa96de537
add a check for pdo
2012-06-01 20:00:33 +02:00
2ccf3da411
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:00:28 +01:00
Robin Appelman
Bart Visscher
Bjoern Schiessle
Frank Karlitschek
Thomas Tanghus
Arthur Schiwon
Tom Needham
Michael Gapczynski
Sam Tuke