Commit Graph

4635 Commits

Author SHA1 Message Date
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
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
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
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
Frank Karlitschek 8755fd88bb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-04 12:46:22 +02:00
Frank Karlitschek 1e6802e567 add deprecated warning 2012-06-04 12:45:45 +02:00
Bjoern Schiessle 4eba41a2a0 no move (rename) operation for "Shared" directory 2012-06-04 11:04:05 +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
Frank Karlitschek f3c1d1eded link to apps.owncloud.com
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
Robin Appelman e90cbcaf5b http user backend 2012-06-03 02:51:05 +02:00
Michael Gapczynski 993ebc4c90 Verify user exists when checking if logged in, fix for bug oc-863 2012-06-02 20:06:52 -04:00
Michael Gapczynski cc84bd2993 Fix typo in log message 2012-06-01 15:15:05 -04:00
Michael Gapczynski 66f1957e3b Improve efficiency of retrieving log file entries 2012-06-01 14:39:50 -04:00
Sam Tuke 3d7143c730 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:01:00 +01:00
Frank Karlitschek 4aa96de537 add a check for pdo 2012-06-01 20:00:33 +02:00
Sam Tuke 2ccf3da411 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:00:28 +01:00
Sam Tuke 410b556a86 Added class comment block 2012-06-01 18:59:57 +01:00
Frank Karlitschek 07e1e3a945 check if apps folder is writable 2012-06-01 19:54:07 +02:00
Sam Tuke 4b4d13165a Minor change to comment 2012-06-01 16:46:18 +01:00
Sam Tuke 7203f6951e Extended class comment 2012-06-01 16:34:09 +01:00
Frank Karlitschek e6b0eb3423 prevend a division by zero problem 2012-06-01 16:48:42 +02:00
Frank Karlitschek 1395e411f4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 16:35:14 +02:00
Frank Karlitschek dcb06393a8 fix propper error reporting 2012-06-01 16:30:47 +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
Frank Karlitschek ad6562d14f sort users and groups. fixes oc-779 2012-06-01 14:18:14 +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 75d56f24f2 try to switch magic quotes off.
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
Frank Karlitschek 93295994dc fix oc-769 2012-06-01 12:15:03 +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 24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00