wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11089 commits 157 branches 562 tags 714 MiB
Commit graph

11089 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop 
Prevent backgroundScan() from looping
 2013-05-21 09:15:22 -07:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Thomas Müller
54d3b381a8 Merge pull request #3430 from owncloud/vcategory_rename 
Add rename() method to OC_VCategories.
 2013-05-20 08:08:15 -07:00
Thomas Tanghus
946740a71f Add test for renaming non-existing category. 2013-05-20 13:57:18 +02:00
Thomas Tanghus
c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus
b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Bernhard Posselt
71668cf08a Merge pull request #3399 from owncloud/fix_js_for_ie 
cleanup after people who don't test in ie
 2013-05-19 11:25:39 -07:00
Michael Gapczynski
67729f5f9f Merge pull request #3421 from owncloud/pre_login_password 
Add password to pre_login
 2013-05-19 10:09:24 -07:00
Lukas Reschke
7ec36c5bbb Add password to pre_login 
I need this to intercept passwords for my WIP multi-factor
authentication app.
 2013-05-19 13:33:33 +02:00
Jenkins for ownCloud
694f42dfd5 [tx-robot] updated from transifex 2013-05-19 02:01:55 +02:00
Jenkins for ownCloud
9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +02:00
Jörn Friedrich Dreyer
800c39fef1 cleanup after people who don't test in ie 2013-05-17 12:47:32 +02:00
FlorinPeter
0f314c1404 Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup 
fix for SQLite3Result::fetchArray() on setup
 2013-05-17 01:55:28 -07:00
Jenkins for ownCloud
6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Florin Peter
a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00
Florin Peter
469d6028ad revert changes 2013-05-17 01:17:55 +02:00
blizzz
2d51eefcb8 Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid 
Ldap configurable username n uuid
 2013-05-16 05:40:31 -07:00
Jenkins for ownCloud
966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Thomas Müller
0b2bfe6186 Merge pull request #3371 from owncloud/fix-3353 
Fix finding mount in background watcher, fixes #3353
 2013-05-15 15:02:01 -07:00
Thomas Mueller
5dcec346e5 Merge branch 'master' into fix-3353 2013-05-15 23:43:46 +02:00
Thomas Müller
dfddaf8fbf Merge pull request #3374 from owncloud/vobject_compound_property 
Add Compound property to avoid double escaping values.
 2013-05-15 14:34:16 -07:00
Thomas Mueller
990980392c No unit test coverage reports for pgsql - this causes issues on Jenkins. 2013-05-15 22:44:15 +02:00
Thomas Müller
4b3c58c2ca Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point 
fix for disappearing root mount point on lib/files/filesystem.php
 2013-05-15 12:34:32 -07:00
Florin Peter
c50bf3e3c5 fix for losing mount point "/" 2013-05-15 20:09:02 +02:00
Florin Peter
68059b1ec3 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 19:49:40 +02:00
Thomas Tanghus
cb41a30b00 Add Compound property to avoid double escaping values. 2013-05-15 18:56:54 +02:00
Michael Gapczynski
d91161186b Fix finding mount in background watcher, fixes #3353 2013-05-15 09:33:38 -04:00
Michael Gapczynski
de2ccf4723 Merge pull request #3366 from owncloud/contributing_add_contacts 
Add Contacts repo to CONTRIBUTING.md
 2013-05-15 06:24:21 -07:00
Thomas Tanghus
162da3ce4e Add Contacts repo to CONTRIBUTING.md 2013-05-15 13:53:15 +02:00
Jenkins for ownCloud
6a788d1a54 [tx-robot] updated from transifex 2013-05-15 02:02:45 +02:00
Thomas Müller
fdef2a373a Merge pull request #2821 from owncloud/fix-2159-rename-to-shared 
fix allowed rename of folder in root directory to reserved name "Shared"
 2013-05-14 13:13:16 -07:00
Björn Schießle
96ff19a703 fix history template, print_unescaped() needs to include closing tags 2013-05-14 21:22:30 +02:00
Raghu Nayyar
418503a4ad Merge pull request #3338 from owncloud/button_color_fix 
Keeping Font Colors Consistant on the headers.
 2013-05-14 09:52:54 -07:00
Morris Jobke
784f117ec2 Merge pull request #3330 from owncloud/preselect_filename_on_rename 
peselect filename without extension on rename
 2013-05-14 06:16:30 -07:00
Morris Jobke
0d8fa2eb98 [files] add private declaration of $view 2013-05-14 12:49:23 +02:00
raghunayyar
18618c75aa color change to crumb elements as well. 2013-05-14 11:07:12 +05:30
Jenkins for ownCloud
2b84da9793 [tx-robot] updated from transifex 2013-05-14 02:04:01 +02:00
raghunayyar
6d95d130e4 Keeping Font Colors Consistant on the headers. 2013-05-13 23:12:05 +05:30
Michael Gapczynski
71eed76dbe Prevent backgroundScan() from looping if opendir() is failing for the same path 2013-05-13 11:17:08 -04:00
Morris Jobke
d980ee9d9f Merge pull request #3303 from owncloud/update_etags_on_restore 
Make sure that etags get updated once a file gets retored from the trash bin
 2013-05-13 08:12:57 -07:00
Bernhard Posselt
1ec92b6377 Merge pull request #3329 from owncloud/increase_lock_timeout 
Set the SQLite database lock timeout to 60 seconds which is the default ...
 2013-05-13 06:56:07 -07:00
Jörn Friedrich Dreyer
591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Lukas Reschke
665663432c Merge pull request #3326 from owncloud/fix-3321 
Add requesttoken to guest view
 2013-05-13 05:45:38 -07:00
Lukas Reschke
739f799912 Add requesttoken to guest view 
Should fix #3321
 2013-05-13 14:23:56 +02:00
Arthur Schiwon
beaa10b823 Merge branch 'master' into ldap_configurable_username_n_uuid 2013-05-13 12:41:22 +02:00
Björn Schießle
0ef8590773 Merge branch 'master' into update_etags_on_restore 2013-05-13 10:48:06 +02:00
Morris Jobke
e60cf2a997 Merge pull request #3235 from NCTU-NBA/pr-langcode 
Modify zh_* language codes
 2013-05-13 00:42:13 -07:00
Frank Karlitschek
0e55accee2 Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues. 2013-05-13 02:42:18 +02:00