Commit graph

1986 commits

Author SHA1 Message Date
Tom Needham
b261c980c7 Fix autoloader merge conflict 2012-09-13 10:50:10 +00:00
Tom Needham
182f890110 Remove a merge conflict 2012-09-13 10:32:35 +00:00
Tom Needham
227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Tom Needham
fa5dff22a0 API: Require api calls to register the required auth level 2012-09-13 09:41:20 +00:00
Frank Karlitschek
5a149dcfab mark as an updated beta 3 with some more fixes 2012-09-13 11:39:26 +02:00
Bart Visscher
e3e4a2bec2 Enable post_write trigger
This is used when uploading a file with webdav. The trigger will add the file to the cache and make it show up in listings
2012-09-13 00:12:10 +02:00
Bart Visscher
78a022fda6 dirname can also return '.' for empty path 2012-09-13 00:09:00 +02:00
Jörn Friedrich Dreyer
d3553ce33d correctly calculate the MDB2 portability 2012-09-12 23:10:45 +02:00
Jörn Friedrich Dreyer
c7054f374c log details for an error when upgrading the schema 2012-09-12 23:03:56 +02:00
Jörn Friedrich Dreyer
b2d60ed6b7 add proper logging to filecache 2012-09-12 23:03:56 +02:00
Jörn Friedrich Dreyer
0fe3354c61 add proper error logging in OC_User database queries 2012-09-12 12:47:33 +02:00
Jörn Friedrich Dreyer
e31dfb643a add getErrorMessage to OC_DB 2012-09-12 12:47:33 +02:00
Frank Karlitschek
f31264a0c2 this is now 4.5 beta 3 2012-09-12 12:12:23 +02:00
Michael Gapczynski
c5f9b887ff Don't call clearCache() for OC_Minimizer statically, create OC_Minimizer objects for both CSS and JS to clear cache after upgrade 2012-09-12 01:18:07 -04:00
Michael Gapczynski
ca6322465d Treat getUsers() as case insensitive, helpful for showing proper results in the share with autocomplete 2012-09-12 01:12:25 -04:00
Michael Gapczynski
60feaf9abf Merge branch 'master' into share_expiration
Conflicts:
	core/js/share.js
	lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski
8f0354bcdd Temporarily disable sharing with contacts and emails, will come in next release 2012-09-12 01:02:08 -04:00
Michael Gapczynski
b194ac3dde Add expiration column to share table and bump version number 2012-09-12 01:01:45 -04:00
Jenkins for ownCloud
8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Thomas Mueller
5c1a79210f added hint to restart the web server in case recetly installed php modules are still not available 2012-09-11 23:51:12 +02:00
Jörn Friedrich Dreyer
b6a106a920 allow using only dbname for oracle 2012-09-11 18:12:38 +02:00
Jörn Friedrich Dreyer
bf2d1e78f2 don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again 2012-09-11 13:16:34 +02:00
Michael Gapczynski
37f0b85d3f Fix problem with non share collection item types being treated as collections 2012-09-11 00:37:31 -04:00
Jenkins for ownCloud
6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Georg Ehrke
463b48b2e1 fix file upload 2012-09-10 14:41:27 +02:00
Jörn Friedrich Dreyer
86c3f9b8fe Merge branch 'master' of github.com:owncloud/core 2012-09-10 14:14:49 +02:00
Jörn Friedrich Dreyer
db7a18455f use tabs for indentation 2012-09-10 14:14:36 +02:00
Thomas Müller
5a65c5a46c Respect coding style 2012-09-10 14:59:08 +03:00
Thomas Müller
0444877218 Respect coding style 2012-09-10 12:35:15 +03:00
Thomas Müller
c6cd1b77d3 Respect coding style 2012-09-10 12:32:49 +03:00
Thomas Müller
5721bd2786 Respect coding style 2012-09-10 12:31:57 +03:00
Thomas Müller
1a10955644 Respect coding style 2012-09-10 12:29:35 +03:00
Thomas Müller
2271a97992 Respect coding style 2012-09-10 12:28:09 +03:00
Thomas Müller
9a2bc5255b Respect coding style 2012-09-10 12:26:20 +03:00
Thomas Müller
23f348c99f Respect coding style 2012-09-10 12:25:42 +03:00
Thomas Müller
87e1a27fde Respect coding style 2012-09-10 12:23:55 +03:00
Thomas Müller
f34588d1ff Respect coding style 2012-09-10 12:21:54 +03:00
Michael Gapczynski
6c17a4cb77 Don't display actions for children in shared collections, show the parent collection the child is shared in 2012-09-09 14:44:08 -04:00
Michael Gapczynski
13d513c17c Fix shared collection item searching 2012-09-09 11:50:12 -04:00
Michael Gapczynski
3e7951e1e6 Normalize the file path for shared children as a precaution 2012-09-08 23:42:24 -04:00
Michael Gapczynski
fe7f095b08 Insert id for unique user group share rows 2012-09-08 23:09:58 -04:00
Michael Gapczynski
b163bd514f Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder 2012-09-08 23:09:57 -04:00
Michael Gapczynski
f23f719d99 Fix unsharing from self for group shares and add test for it 2012-09-08 20:15:47 -04:00
Jenkins for ownCloud
5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Robin Appelman
46422e6dbe don't use regular expresions for a simple string replace 2012-09-08 23:40:23 +02:00
Robin Appelman
697061fa9f add OC_Image::fitIn 2012-09-08 23:26:19 +02:00
Thomas Tanghus
abc930c57c Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security. 2012-09-08 17:58:59 +02:00
Georg Ehrke
2b42893fa9 style fixes for public util api 2012-09-08 16:18:47 +02:00
Georg Ehrke
89f3afe2fe style fixes for public user api 2012-09-08 16:17:01 +02:00
Georg Ehrke
439ede2a1d style fixes for public response api 2012-09-08 16:15:42 +02:00