Georg Ehrke
|
aa95cf2c98
|
Merge branch 'master' into calendar_import
|
2012-07-05 11:30:37 +02:00 |
Bjoern Schiessle
|
f86ecb3bf7
|
send ca cert path to sabredav client
|
2012-07-05 11:28:32 +02:00 |
Thomas Tanghus
|
9d00f4d2fb
|
Correct db default value.
|
2012-07-05 00:40:11 +02:00 |
|
Thomas Tanghus
|
dac2c14ae9
|
Add missing CSRF check.
|
2012-07-05 00:37:08 +02:00 |
|
Thomas Tanghus
|
5d79444852
|
Missing update script.
|
2012-07-04 22:58:31 +02:00 |
|
Thomas Tanghus
|
706a13544b
|
Remove ugly activation hack.
|
2012-07-04 22:13:36 +02:00 |
|
Georg Ehrke
|
7ec2d6ce85
|
Merge branch 'master' into calendar_import
|
2012-07-04 21:15:32 +02:00 |
|
Georg Ehrke
|
a4c2893128
|
some more work on calendar import - new import is (nearly) done
|
2012-07-04 21:14:40 +02:00 |
Bart Visscher
|
280c59e914
|
More helpfull debug msg for redirectToDefaultPage
|
2012-07-04 17:51:07 +02:00 |
|
Bart Visscher
|
621b83df72
|
Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong
|
2012-07-04 17:51:07 +02:00 |
|
Bart Visscher
|
9ea34cae43
|
Simplified remote.php file loading
|
2012-07-04 17:51:07 +02:00 |
|
Georg Ehrke
|
5880bbee8f
|
add miniColors
|
2012-07-04 17:37:47 +02:00 |
|
Bjoern Schiessle
|
e258da5c3c
|
certificate should be only visible for users
|
2012-07-04 17:22:04 +02:00 |
|
Bjoern Schiessle
|
5d61b85a1d
|
allow users to upload ssl root certificates for the webdav client
|
2012-07-04 17:18:36 +02:00 |
|
Thomas Tanghus
|
b2eac08ad3
|
Query contacts in batches of 20. Possible fix for oc-1126.
|
2012-07-04 16:54:00 +02:00 |
Sam Tuke
|
825d92d59c
|
Added undo functionality to delete user procedure on user settings page
|
2012-07-04 14:30:42 +01:00 |
|
Thomas Tanghus
|
6d3afb3857
|
Moved action buttons down to the add field menu. Fixes oc-1155.
|
2012-07-04 13:57:07 +02:00 |
|
Georg Ehrke
|
657eef354a
|
Merge branch 'master' into calendar_import
|
2012-07-04 13:03:30 +02:00 |
Brice Maron
|
3b09aa8578
|
Correct Postgresql connection with space in password. Work around php bug
|
2012-07-04 10:13:00 +00:00 |
|
Brice Maron
|
799e34acd4
|
Add slash to app url if not set fix oc-1169
|
2012-07-03 21:58:36 +00:00 |
|
Georg Ehrke
|
393eefa5d2
|
replace some direct links with OC.imagePath
|
2012-07-03 23:44:47 +02:00 |
Michael Gapczynski
|
1ad5e3e39f
|
Add parameter to showDropDown to not show private link UI, only files can be shared as private links
|
2012-07-03 17:00:23 -04:00 |
|
Michael Gapczynski
|
db33765e36
|
Add share with to list in dropdown after sharing
|
2012-07-03 16:52:53 -04:00 |
|
Georg Ehrke
|
f98bd1ad66
|
Merge branch 'master' into calendar_import
|
2012-07-03 22:35:46 +02:00 |
|
Georg Ehrke
|
c036700c54
|
some more work on calendar import
|
2012-07-03 22:33:24 +02:00 |
|
Michael Gapczynski
|
96dea9507a
|
Return false for single item checks and an empty array for multiple item checks
|
2012-07-03 14:03:04 -04:00 |
|
Michael Gapczynski
|
5e8ef33190
|
Clean up in the dropdown for unsharing
|
2012-07-03 14:00:09 -04:00 |
|
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 |
|
Michael Gapczynski
|
1e36e1f2cb
|
Use formatted shared addressbook in all cases, addressbooks out of order now
|
2012-07-03 11:36:57 -04:00 |
|
Michael Gapczynski
|
4185bd6292
|
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
|
2012-07-03 11:11:01 -04: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 |
|
Michael Gapczynski
|
77b582e4e6
|
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
|
2012-07-02 15:29:34 -04: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 |
|
Michael Gapczynski
|
dd56416a39
|
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
|
2012-07-02 14:23:13 -04: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 |