Commit graph

7475 commits

Author SHA1 Message Date
Robin Appelman
8973124574 Merge branch 'master' into filesystem 2012-10-27 15:31:27 +02:00
Bart Visscher
939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Robin Appelman
38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Robin Appelman
0fb707d2c9 some more porting of the sharing 2012-10-27 14:25:15 +02:00
Thomas Müller
0c40a061e4 fix paths in preeseed-config.php 2012-10-27 12:59:28 +02:00
Bart Visscher
9317039e0c Add composer command for now, see
http://getcomposer.org/doc/00-intro.md#installation-nix
for local install
2012-10-27 12:27:54 +02:00
Robin Appelman
86be7e8872 remove last uses of depricated OC_Filesystem 2012-10-27 12:23:13 +02:00
Arthur Schiwon
605281da9b LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow. 2012-10-27 12:19:08 +02:00
Arthur Schiwon
67cd268df9 LDAP: debug messaged 2012-10-27 12:19:08 +02:00
Arthur Schiwon
ee6fc22d4b LDAP: sourced out paged search init into initPagedSearch method, making search slicker again 2012-10-27 12:19:08 +02:00
Robin Appelman
dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +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
beaaf5425d More info for composer.json 2012-10-27 11:56:51 +02:00
Thomas Müller
74665faec5 exeuting tests now on apps as well - the apps repo shall be cloned into the sub folder apps2 2012-10-27 11:43:24 +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
22dcd3b6a6 fix bug 2012-10-27 10:23:36 +02:00
Jakob Sack
d0bbd9416b Add BackgroundJob::setExecutionType() to public API 2012-10-27 10:15:39 +02:00
Jakob Sack
f5f204de56 improve cron.php, add locking for cli cron.php 2012-10-27 10:08:56 +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
Arthur Schiwon
1313cad1b9 LDAP: let getUsers make use of paged search 2012-10-26 21:54:35 +02:00
Arthur Schiwon
84130b885f LDAP: add support for paged searches. 2012-10-26 21:54:34 +02:00
Arthur Schiwon
fc446d0af4 LDAP: know, wether server supports paged search 2012-10-26 21:54:34 +02:00
Arthur Schiwon
3f78a8190f LDAP: check for resource before unbinding 2012-10-26 21:54:34 +02:00
Jan-Christoph Borchardt
46871e9b2e update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin 2012-10-26 21:47:05 +02:00
Thomas Müller
628c7ca9cf closes #113 2012-10-26 21:18:03 +02:00
Florian Hülsmann
b7bf28d1c7 Hook emission on sharing stuff 2012-10-26 20:53:32 +02:00
Robin Appelman
da57fbc93a show/hide navigation entries after enabling/disabling app 2012-10-26 20:13:24 +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
Jan-Christoph Borchardt
f477fda785 separate buttons for new file and upload 2012-10-26 18:16:42 +02:00
Robin Appelman
7ad8bf3156 move filesystem test case 2012-10-26 18:07:01 +02:00
Brice Maron
db2d1f6822 Fix migration problems for postgresql with MDB2 fix owncloud/apps#21
Ref of MDB2 bug is 19676
2012-10-26 15:56:53 +00: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