Michael Gapczynski
|
4c822df28d
|
Fix incorrect copy/paste for file_put_contents()
|
2012-07-27 09:37:47 -04:00 |
Bjoern Schiessle
|
680eed6bac
|
fix for bug #1295, don't escape password reset link
|
2012-07-27 15:35:36 +02:00 |
Georg Ehrke
|
bccd372565
|
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
|
2012-07-27 14:17:55 +02:00 |
Bart Visscher
|
a7a5433108
|
Merge branch 'master' into chunked_upload
Conflicts:
lib/connector/sabre/directory.php
|
2012-07-27 11:40:51 +02:00 |
Michael Gapczynski
|
7050f0fa67
|
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
|
2012-07-26 23:54:25 -04:00 |
Michael Gapczynski
|
ea2e76eecc
|
Forgot data parameter for file_put_contents() streams pre proxies
|
2012-07-26 23:10:21 -04:00 |
Michael Gapczynski
|
d006a551f4
|
Run pre and post proxies for file_put_contents() streams
|
2012-07-26 22:53:55 -04:00 |
Michael Gapczynski
|
cb21406e18
|
Implement CRUDS in share dropdown, and some clean-up
|
2012-07-26 21:56:22 -04:00 |
Michael Gapczynski
|
d1dee28437
|
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
|
2012-07-26 20:45:58 -04:00 |
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
Georg Ehrke
|
16928f4d59
|
fix spelling fail
|
2012-07-26 18:50:59 +02:00 |
Georg Ehrke
|
d8aca0c78e
|
apply fix suggested in oc-1132 - bugfix for oc-1132
|
2012-07-26 18:40:12 +02:00 |
Arthur Schiwon
|
6fbed6a588
|
LDAP: add Test Configuration functionality in the settings
|
2012-07-26 18:11:12 +02:00 |
Bart Visscher
|
d26f87e738
|
Smarter remove of etag properties for path
|
2012-07-26 17:56:32 +02:00 |
Bart Visscher
|
3725cd079b
|
Fix oc-1362: post_rename has no path param but newpath and oldpath
|
2012-07-26 17:41:57 +02:00 |
Georg Ehrke
|
ebe4d1f0ee
|
Merge branch 'subadmin'
|
2012-07-26 16:50:02 +02:00 |
Georg Ehrke
|
e1d14ab461
|
Merge branch 'master' into subadmin
|
2012-07-26 16:47:05 +02:00 |
Michael Gapczynski
|
0810f92894
|
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
|
2012-07-26 10:30:33 -04:00 |
Arthur Schiwon
|
6c92a85d49
|
LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
|
2012-07-26 16:11:32 +02:00 |
Arthur Schiwon
|
e0121ea75e
|
LDAP: some cleanup
|
2012-07-26 16:11:32 +02:00 |
Arthur Schiwon
|
b893aa9567
|
code style
|
2012-07-26 16:11:32 +02:00 |
Georg Ehrke
|
c8de77b3fd
|
fix errors like Failed opening required ownCloudcalendar/appinfo/remote.php
|
2012-07-26 16:03:19 +02:00 |
Georg Ehrke
|
e4679770c4
|
declare OCP\App::register as deprecated
|
2012-07-26 15:16:07 +02:00 |
Georg Ehrke
|
4e62e121a6
|
mark OCP\App::register as deprecated
|
2012-07-26 15:12:57 +02:00 |
Georg Ehrke
|
8cff0d997f
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:48:00 +02:00 |
Georg Ehrke
|
f7155b4276
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:46:03 +02:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
Lukas Reschke
|
12dfe5868a
|
Updated style
|
2012-07-26 01:38:46 +02:00 |
Lukas Reschke
|
d24326ecce
|
Updated style
|
2012-07-26 01:38:20 +02:00 |
Lukas Reschke
|
d425740dc2
|
Remove unused files
|
2012-07-26 01:19:46 +02:00 |
Lukas Reschke
|
1554d7a2c0
|
Check for admin user
|
2012-07-26 01:16:32 +02:00 |
Lukas Reschke
|
efbd7ca166
|
Updated packages
|
2012-07-26 01:16:22 +02:00 |
Lukas Reschke
|
95936024bc
|
Updated packages
|
2012-07-26 01:12:58 +02:00 |
Lukas Reschke
|
9605e1926c
|
Check for admin user
|
2012-07-26 00:06:51 +02:00 |
Lukas Reschke
|
85a410d7a3
|
Remove unused files
|
2012-07-26 00:04:12 +02:00 |
Michael Gapczynski
|
586fe8f940
|
Change is_writable() call to isUpdatable()
|
2012-07-25 17:39:28 -04:00 |
Michael Gapczynski
|
add8f09355
|
No longer need hash() in shared storage, already implemented by the common file storage
|
2012-07-25 17:13:48 -04:00 |
Bart Visscher
|
783d67be62
|
Create uniqid ETag for directories
|
2012-07-25 23:09:03 +02:00 |
Bart Visscher
|
381e493a8c
|
Rename functions
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
|
2012-07-25 23:09:03 +02:00 |
Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
Michael Gapczynski
|
f25ccaff59
|
Fix filesystem hash, no longer using basicOperation()
|
2012-07-25 16:55:01 -04:00 |
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Jenkins for ownCloud
|
37bccf54f2
|
[tx-robot] updated from transifex
|
2012-07-25 22:15:24 +02:00 |
Arthur Schiwon
|
b94631de0c
|
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
|
2012-07-25 18:40:48 +02:00 |
Arthur Schiwon
|
3c9919e475
|
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
|
2012-07-25 18:21:16 +02:00 |
Bart Visscher
|
d17eb2983f
|
OpenID: fix include path
|
2012-07-25 17:45:59 +02:00 |
Georg Ehrke
|
9b0870bb91
|
add some calendar sharing hooks in stable4 - bugfix for oc-1325
|
2012-07-25 17:02:24 +02:00 |
Arthur Schiwon
|
71b862e571
|
LDAP: replace deprecated constant
|
2012-07-25 15:11:58 +02:00 |
Arthur Schiwon
|
4a2295b75b
|
code style
|
2012-07-25 15:10:56 +02:00 |