Commit graph

2266 commits

Author SHA1 Message Date
Robin Appelman
38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Robin Appelman
5bfff6c56e use absolute paths when resolving mount points 2012-10-27 12:17:35 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Bart Visscher
43e8293d9c Change Symfony/Component/Routing from submodule to composer fetching 2012-10-27 11:32:16 +02:00
Robin Appelman
3437071cf1 remove old searchByMime 2012-10-27 10:40:27 +02:00
Robin Appelman
fcc92a9f43 add searchByMime to new cache api 2012-10-27 10:34:25 +02:00
Jakob Sack
d0bbd9416b Add BackgroundJob::setExecutionType() to public API 2012-10-27 10:15:39 +02:00
Jakob Sack
9cf9d41e51 Add a new backgroundjob class to access the type of background jobs easily 2012-10-27 10:08:56 +02:00
Robin Appelman
cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Robin Appelman
695405dfeb add permissions data to the results of the cache api 2012-10-27 10:01:20 +02:00
Jenkins for ownCloud
3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman
9953427197 also use new cache api here 2012-10-26 23:26:12 +02:00
Robin Appelman
7d6da68d53 prove some compatibility with the old cache api 2012-10-26 23:25:52 +02:00
Florian Hülsmann
a48734bcb5 fixed user/group sharing hooks 2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Bart Visscher
fe75793815 Split database setup code to functions 2012-10-26 22:48:57 +02:00
Robin Appelman
4b616764e8 Merge branch 'master' into filesystem 2012-10-26 22:32:44 +02:00
Florian Hülsmann
b7bf28d1c7 Hook emission on sharing stuff 2012-10-26 20:53:32 +02:00
Victor Dubiniuk
d428d72dab Fix mimetype detection with the 'file' utility 2012-10-26 21:02:04 +03:00
Robin Appelman
c22a723785 add file permissions cache 2012-10-26 19:07:29 +02:00
Robin Appelman
ad5957207d merge master into filesystem 2012-10-26 18:29:24 +02:00
Robin Appelman
ad720c4c17 possible fix for bombarding the server with the htaccess test during setup 2012-10-26 18:24:06 +02:00
Robin Appelman
286fd78865 Merge branch 'master' into filesystem 2012-10-26 17:40:57 +02:00
Robin Appelman
8bce661e4d add search to the filecache api 2012-10-26 13:23:49 +02:00
Georg Ehrke
1888ac0d41 add the possibility to add an preupdate.php 2012-10-26 13:10:56 +02:00
Robin Appelman
7ef0ffe8ad add View->putFileInfo to the filecache api 2012-10-26 12:43:23 +02:00
Robin Appelman
e63e246c48 fix problem with normalizePath when there was a double leading slash 2012-10-26 12:37:49 +02:00
Robin Appelman
39adadd3e3 move the cache api from OC_Files to filesystem(view) 2012-10-26 12:30:25 +02:00
Robin Appelman
0e2bf8d373 Merge branch 'master' into filesystem 2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Lukas Reschke
228a05a792 Check for iconv 2012-10-25 16:49:55 +02:00
Lukas Reschke
55277c8e5a Allow any characters in the groupname
Fixes #82
2012-10-25 11:54:31 +02:00
Jenkins for ownCloud
43bae1b473 [tx-robot] updated from transifex 2012-10-25 02:11:53 +02:00
Lukas Reschke
515e1b467e Merge pull request #81 from fmms/master
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Björn Schießle
0c2a4264c9 normalize path 2012-10-24 17:39:39 +02:00
Robin Appelman
5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Lukas Reschke
a7eb56c799 Merge pull request #76 from fmms/master
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Lukas Reschke
f112d8cd69 Merge pull request #75 from fmms/master
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
Felix Moeller
561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke
73f85c3b81 Merge pull request #62 from fmms/master
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
Lukas Reschke
d18ea0e76c Merge pull request #40 from scambra/dateformat-fixes
Dateformat fixes
2012-10-23 08:06:28 -07:00
Robin Appelman
56c7ee799c use strtotime on non-nummeric times in oc_filesystem::touch 2012-10-23 16:37:46 +02:00
Robin Appelman
7fdbce6ac1 use strtotime on non-nummeric times in oc_filesystem::touch 2012-10-23 16:36:09 +02:00
scambra
9601352d46 fix strftime in windows, use %#d instead of %e in windows 2012-10-23 16:24:54 +02:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes
check free space using folder's owner
2012-10-23 07:02:21 -07:00
icewind1991
fbe059afd3 Merge pull request #59 from fmms/master
Starting point to take care of Checkstyle warnings
2012-10-23 06:58:15 -07:00