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
Georg Ehrke
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +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
Georg Ehrke
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
Georg Ehrke
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +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
Frank Karlitschek
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
Frank Karlitschek
a72e6cc113
fix oc-780
2012-05-31 21:28:58 +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
ec0c0f3907
Added & improved documentation
2012-05-31 17:57:34 +01:00
Sam Tuke
ef60dcc23e
fixed typo
2012-05-31 17:38:35 +01:00
Sam Tuke
6b3df8ae9c
Improved class comment block
2012-05-31 17:32:34 +01:00
Sam Tuke
8744b09959
added extensive class comment based on icewind's January list email
2012-05-31 17:02:35 +01:00
Sam Tuke
fc400e06c3
fixed typos in var names
2012-05-31 14:53:52 +01:00
Sam Tuke
43fcae0409
clarified comment
2012-05-31 14:50:41 +01: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
Bart Visscher
4434016a8b
Whitespace fixes
2012-05-31 13:01:30 +02:00
Georg Ehrke
c5cc70c0e3
Merge branch 'master' into calendar_repeat
2012-05-31 12:20:56 +02:00
Robin Appelman
d98a0a1bb9
fix for pgsql database migration
2012-05-31 00:01:49 +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
Georg Ehrke
f1a48aec73
Merge branch 'master' into calendar_repeat
2012-05-29 19:47:48 +02:00
Georg Ehrke
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
Michael Gapczynski
fbe58755e5
Restrict requested app to apps directory
2012-05-29 12:31:47 -04: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
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
Georg Ehrke
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +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
Benjamin Diele
7b8664bbe5
Check for valid LDAP-resource before querying.
...
Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.
Signed-off-by: Benjamin Diele <benjamin@diele.be>
2012-05-28 17:54:38 +04:00