Commit graph

2465 commits

Author SHA1 Message Date
Robin Appelman
97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Thomas Müller
a85d891938 Merge pull request #538 from Deltachaos/fix_537
Fixes update of shared files with mirall because it dose not update all ...
2012-11-20 22:55:08 -08:00
Jenkins for ownCloud
9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Maximilian Ruta
ac4cafcfc7 Fixes update of shared files with mirall because it dose not update all methadata for a file 2012-11-20 23:34:25 +01:00
Jenkins for ownCloud
568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Brice Maron
8fa7d6a48a Fix typo in getUrlContent fix #514 2012-11-19 17:13:07 +00:00
Thomas Müller
d91c841f73 Merge pull request #383 from owncloud/contacts_api
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
Frank Karlitschek
5b2aeebaf0 Merge pull request #280 from butonic/feature_bmp_support
add bmp support
2012-11-19 00:53:46 -08:00
Jenkins for ownCloud
c5e891008b [tx-robot] updated from transifex 2012-11-19 00:01:48 +01:00
Robin Appelman
40fae0acbf fix outdated permissions cache use in scanner 2012-11-18 14:10:28 +01:00
Robin Appelman
a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Thomas Müller
ea80a8b9e3 Merge pull request #114 from riso/xsendfile
Implement X-Sendfile support
2012-11-18 04:35:46 -08:00
Jenkins for ownCloud
e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Brice Maron
4337e0fb99 Little case fix 2012-11-17 22:12:24 +00:00
Brice Maron
71adad8817 Add User agent when OC does a request 2012-11-17 21:08:58 +00:00
Thomas Müller
ac3e962732 Merge pull request #375 from tdevos/master
Use curl to get remote file content
2012-11-17 12:31:25 -08:00
Jenkins for ownCloud
61670184c4 [tx-robot] updated from transifex 2012-11-17 00:02:24 +01:00
Robin Appelman
f4f00b4edb Merge branch 'master' into filesystem 2012-11-16 12:13:03 +01:00
Thomas Müller
d1c0f2a739 Merge pull request #454 from Raydiation/master
Routing fixes
2012-11-15 15:15:07 -08:00
Jenkins for ownCloud
d86a368e54 [tx-robot] updated from transifex 2012-11-16 00:03:47 +01:00
Thomas Müller
36bf4e24f0 Merge pull request #433 from owncloud/user_setting_fixes
User setting fixes
2012-11-15 14:01:16 -08:00
Robin Appelman
288ecf318c add getFileInfo and getDirectoryContent to OC_Files for compatibility 2012-11-15 22:08:08 +01:00
Robin Appelman
5569f07e8d add OC_FilesystemView alias for compatibility 2012-11-15 22:04:48 +01:00
Robin Appelman
f94d62380f Merge branch 'master' into filesystem 2012-11-15 21:27:24 +01:00
thomas
d2047a00cf Remove parentheses in return, modify description, and fix a mistake 2012-11-15 20:46:17 +01:00
Bart Visscher
9419913c06 Better place to check for user removal 2012-11-15 18:10:40 +01:00
Bernhard Posselt
e642d18e26 When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request 2012-11-15 14:48:18 +01:00
Arthur Schiwon
fd060d4849 really check if mod_deflate is loaded 2012-11-15 10:35:53 +01:00
Arthur Schiwon
64a8a0c872 coding style 2012-11-15 10:35:44 +01:00
Arthur Schiwon
4a75c539ed Fix remote.php CSS+JS garbish on some systems 2012-11-15 10:35:34 +01:00
Robin Appelman
cbcd9ba84a allow storage backends to implement custom permission management 2012-11-15 00:57:30 +01:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
thomas
40dd5ae61c change and transfert getUrlContent 2012-11-14 23:14:04 +01:00
Bart Visscher
343e9d8621 Better check and handing of user deletion 2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae Better check and handling of user creation 2012-11-14 21:52:28 +01:00
Valerio Ponte
de7e419610 Fixed style according to owncloud styleguide 2012-11-14 20:10:20 +01:00
Valerio Ponte
8e190a5a97 Moved X-Sendfile headers into OC_Files::get
now should work with temp files too
2012-11-14 20:10:20 +01:00
Valerio Ponte
8420b9bf67 Implemented X-Sendfile support 2012-11-14 20:10:20 +01:00
Lukas Reschke
8b03b683df Merge pull request #271 from owncloud/239_webdav_999_files
fixes #239 - query the database in chunks of 200
2012-11-14 10:53:00 -08:00
Alessandro Cosentino
7d01342bab fix translation issues with previous commit 2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18 uncomment hours entries in relative date functions 2012-11-13 19:18:26 -05:00
Thomas Mueller
33a4dfa087 function isEnabled() added 2012-11-13 20:59:47 +01:00
Thomas Tanghus
bfb6faa850 Bump version to trigger update. 2012-11-13 12:11:18 +01:00
Thomas Tanghus
268a48479d Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 23:36:59 +01:00
Thomas Tanghus
d809efc1e5 Change insertIfNotExist() for sqlite. Not fast, but more reliable than previous attempt. 2012-11-12 23:34:02 +01:00
Thomas Mueller
c3825112a0 public contacts api as discussed here https://github.com/owncloud/apps/issues/113 2012-11-12 23:25:32 +01:00
Bart Visscher
7b53c9d3f0 Merge pull request #157 from owncloud/setup
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
42b871dcf1 Correct SQL syntax. 2012-11-12 18:45:56 +01:00
thomas
847467ab00 Add connection time out option 2012-11-12 16:29:22 +01:00