Sam Tuke
|
b1c9785eb3
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts:
apps/files_versions/lib/versions.php
|
2012-07-03 18:17:32 +01:00 |
|
Sam Tuke
|
a775deaf22
|
Moved hooks and versions.php into new lib directory
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
|
2012-07-03 17:42:51 +01:00 |
Bjoern Schiessle
|
aec6eea235
|
use filesystem abstraction layer to copy file versions
|
2012-07-03 18:25:49 +02:00 |
Georg Ehrke
|
641e77327e
|
Merge branch 'master' into calendar_import
|
2012-07-03 16:48:30 +02:00 |
|
Georg Ehrke
|
b6cff93254
|
fix spelling fail in code
|
2012-07-03 16:47:46 +02:00 |
|
Bjoern Schiessle
|
4bc9e4e012
|
wrong var name fixed
|
2012-07-03 16:43:57 +02:00 |
|
Georg Ehrke
|
0b3ed2b048
|
Merge branch 'master' into calendar_import
|
2012-07-03 16:39:09 +02:00 |
|
Georg Ehrke
|
ca2b1f7863
|
fix encoding fail in calendar app - bugfix for oc-1194
|
2012-07-03 13:55:48 +02:00 |
|
Georg Ehrke
|
cfcfdd674e
|
Merge branch 'master' into calendar_import
|
2012-07-03 13:43:52 +02:00 |
|
Georg Ehrke
|
29a9559fa9
|
some work on calendar import dialog
|
2012-07-03 13:43:18 +02:00 |
Brice Maron
|
8a1c279183
|
Escape pg connection string on setup
|
2012-07-03 09:20:42 +02:00 |
Tom Needham
|
88cbbc86b8
|
Text editor: Always use UTF-8 to keep Ace happy.
|
2012-07-02 19:06:40 +00:00 |
Arthur Schiwon
|
0a6f7b33c3
|
LDAP: make it UTF-8 save
|
2012-07-02 20:31:19 +02:00 |
|
Arthur Schiwon
|
52822652bc
|
provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8
|
2012-07-02 20:31:19 +02:00 |
|
Bjoern Schiessle
|
ab036d4764
|
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
|
2012-07-02 17:52:51 +02:00 |
|
Arthur Schiwon
|
515adceace
|
LDAP: reset resource on failed bind
check for resource
|
2012-07-02 14:03:29 +02:00 |
Lukas Reschke
|
90331a3fa1
|
Remove forced download
|
2012-07-02 12:20:43 +02:00 |
|
Lukas Reschke
|
f5e0e5587d
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-07-02 10:25:53 +02:00 |
|
Lukas Reschke
|
f8cebed348
|
Don't display error messages
|
2012-07-02 10:24:22 +02:00 |
|
Georg Ehrke
|
e4960c3bb4
|
fix a small PHP fail
|
2012-07-02 10:23:32 +02:00 |
|
Georg Ehrke
|
e89a0949c4
|
remove some whitespace
|
2012-07-01 23:32:21 +02:00 |
|
Georg Ehrke
|
5ff72f2cd7
|
fix a small PHP fail
|
2012-07-01 21:51:46 +02:00 |
|
Georg Ehrke
|
803f2c2517
|
some work on calendar import
|
2012-07-01 21:36:09 +02:00 |
Michael Gapczynski
|
eca2e073f8
|
Don't reload the page after sending private link to email address
|
2012-07-01 11:54:32 -04:00 |
|
Michael Gapczynski
|
7ceba61413
|
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
This reverts commit 265d7e50f5.
|
2012-07-01 11:29:02 -04:00 |
|
Lukas Reschke
|
4e63981da9
|
Disable mimesniffing
|
2012-07-01 13:45:20 +02:00 |
|
Georg Ehrke
|
6a060ecd23
|
use light grey instead of white
|
2012-07-01 01:02:54 +02:00 |
|
Tom Needham
|
b2cb7d54d1
|
Fixed app path
|
2012-06-30 22:56:47 +00:00 |
|
Tom Needham
|
cfc78d44bb
|
Return correct json response, fix syntax
|
2012-06-30 22:56:47 +00:00 |
|
Tom Needham
|
c7a4075aaa
|
Updates contacts migration provider
|
2012-06-30 22:56:47 +00:00 |
|
Georg Ehrke
|
be11f71d27
|
fix doc for OC_Calendar_Calendar::generateTextColor()
|
2012-07-01 00:31:05 +02:00 |
|
Georg Ehrke
|
601237a0c3
|
add algorithm to generate the calendar's text color
|
2012-07-01 00:09:33 +02:00 |
|
Georg Ehrke
|
ce331bd1d3
|
improvements for dropoimport
|
2012-06-30 23:18:41 +02:00 |
|
Georg Ehrke
|
a705b19cd5
|
little fix for import
|
2012-06-30 22:45:12 +02:00 |
|
Georg Ehrke
|
f15941a967
|
improve dropimport
|
2012-06-30 22:26:29 +02:00 |
|
Georg Ehrke
|
4890bbb30d
|
Merge branch 'master' into calendar_import
|
2012-06-30 22:08:36 +02:00 |
|
Georg Ehrke
|
376431fa0d
|
import works now for dropimport
|
2012-06-30 22:08:30 +02:00 |
|
Georg Ehrke
|
fa5b31ac9c
|
fix documentation style
|
2012-06-30 17:09:20 +02:00 |
Florian Hülsmann
|
4ed55315e7
|
fixed linkTo()
|
2012-06-30 16:53:41 +02:00 |
|
Georg Ehrke
|
8e0addebc3
|
fix some doc
|
2012-06-30 15:39:20 +02:00 |
|
Georg Ehrke
|
34b2486d53
|
some improvements for calendar export
|
2012-06-30 15:23:21 +02:00 |
|
Georg Ehrke
|
390f5cc89f
|
some work on (drop)import)
|
2012-06-30 15:17:29 +02:00 |
|
Tom Needham
|
51173163ce
|
Contacts: align the bottom control buttons
|
2012-06-30 11:22:09 +00:00 |
|
Tom Needham
|
704a1c655e
|
Contacts: fix add contact icon path
|
2012-06-30 11:07:54 +00:00 |
|
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02:00 |
|
Georg Ehrke
|
6e6f90a8a2
|
fix merge conflicts
|
2012-06-30 12:44:51 +02:00 |
|
Georg Ehrke
|
34d4eb8edd
|
some more work on calendar import class
|
2012-06-30 12:42:36 +02:00 |
|
Michael Gapczynski
|
edc6a648d1
|
Fix placeholder value for optional fields in external storage UI
|
2012-06-29 19:35:57 -04:00 |
Robin Appelman
|
2c35e185f7
|
make sure the filesystem is setup properly for oc_cache_file tests
|
2012-06-30 01:14:01 +02:00 |
|
Robin Appelman
|
d43ed43b5a
|
cant to ttl tests for xcache
|
2012-06-30 01:13:33 +02:00 |