Morris Jobke
|
2622839fcf
|
Merge pull request #4171 from owncloud/fix-config
Fix config
|
2013-07-24 00:48:43 -07:00 |
Jan-Christoph Borchardt
|
54263624ea
|
Merge pull request #4030 from owncloud/more-themable-strings
More themable strings
|
2013-07-24 00:36:40 -07:00 |
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +02:00 |
Jenkins for ownCloud
|
7bb6aab8ee
|
[tx-robot] updated from transifex
|
2013-07-24 01:57:21 -04:00 |
Thomas Müller
|
5fc0535f1b
|
Merge pull request #4090 from owncloud/cleanup-some-template-functions
Cleanup some template functions
|
2013-07-23 15:53:43 -07:00 |
Bart Visscher
|
7ad38535e5
|
Merge pull request #3392 from owncloud/googledrive
Switch to using Google Drive SDK, closes #2047
|
2013-07-23 12:23:08 -07:00 |
Jörn Friedrich Dreyer
|
7242480049
|
use $defaults->getName() as webdav REALM
|
2013-07-23 18:14:05 +02:00 |
Bart Visscher
|
485e8ab0a5
|
ignore config read failures
|
2013-07-23 17:38:37 +02:00 |
Bart Visscher
|
5caa7576d4
|
Revert "fix failing master branch - Test_Config::testWriteData"
This reverts commit 8f93490ac4 .
|
2013-07-23 17:36:08 +02:00 |
Jörn Friedrich Dreyer
|
f7422ad132
|
Merge pull request #4150 from owncloud/better-error-handling
Better error handling
|
2013-07-23 08:30:02 -07:00 |
Jörn Friedrich Dreyer
|
ab77af7b4d
|
Merge pull request #4159 from owncloud/Fixing-share-sj-error
Fixing share JS error
|
2013-07-23 08:23:15 -07:00 |
Michael Gapczynski
|
c904504365
|
Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing
|
2013-07-23 10:50:14 -04:00 |
Victor Dubiniuk
|
ab997bdc68
|
Create an array entry before filling it
|
2013-07-23 14:57:58 +03:00 |
Jenkins for ownCloud
|
a94c55be98
|
[tx-robot] updated from transifex
|
2013-07-23 02:03:19 -04:00 |
Thomas Müller
|
6ddad8dc49
|
Merge pull request #4126 from owncloud/parallel-autotest.sh-master
Parallel autotest.sh master
|
2013-07-22 14:48:49 -07:00 |
Bart Visscher
|
179b42c56d
|
Fixed review issues
|
2013-07-22 23:04:14 +02:00 |
Victor Dubiniuk
|
5160ea6063
|
Show generic error when there is no error
|
2013-07-22 21:02:18 +03:00 |
Andreas Fischer
|
7abf35b085
|
Merge pull request #4156 from owncloud/fix_oc_image_reference
* owncloud/fix_oc_image_reference:
need to use \OC_Image to escape OCP namespace
|
2013-07-22 19:19:01 +02:00 |
Jörn Friedrich Dreyer
|
cb4cf3e2f7
|
need to use \OC_Image to escape OCP namespace
|
2013-07-22 17:25:55 +02:00 |
Kondou
|
bc86ce00cf
|
Merge pull request #4154 from owncloud/return-ocl10n
return result from getL10N
|
2013-07-22 08:05:32 -07:00 |
VicDeo
|
f3c19d72b2
|
Merge pull request #4071 from owncloud/fix_return_value_search_principals
OC_Connector_Sabre_Principal::searchPrincipals - return empty array instead of 0
|
2013-07-22 07:16:47 -07:00 |
Robin Appelman
|
d509a0c403
|
return result from getL10N
|
2013-07-22 15:52:02 +02:00 |
Georg Ehrke
|
f1e939e1a3
|
Merge branch 'master' into fix_return_value_search_principals
|
2013-07-22 15:30:57 +02:00 |
Thomas Müller
|
57d178274d
|
Merge pull request #3142 from owncloud/ext-fs-irods-master
Ext fs irods master
|
2013-07-22 05:16:49 -07:00 |
Thomas Müller
|
f9f013bba7
|
Merge pull request #4045 from owncloud/disable-anon-upload-master
Disable anon upload master
|
2013-07-22 04:04:59 -07:00 |
Thomas Müller
|
840e96cda3
|
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
|
2013-07-22 11:55:20 +02:00 |
Thomas Müller
|
7b28f5a82c
|
Merge branch 'master' into ext-fs-irods-master
|
2013-07-22 11:40:28 +02:00 |
Thomas Müller
|
6e2418141d
|
Merge branch 'master' into parallel-autotest.sh-master
|
2013-07-22 11:39:27 +02:00 |
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +02:00 |
Morris Jobke
|
342a54bf7b
|
Merge pull request #2980 from owncloud/===_and_!==_in_settings
Use !== and === in settings.
|
2013-07-22 02:32:40 -07:00 |
Thomas Müller
|
a2cdf8b91e
|
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
|
2013-07-22 02:19:27 -07:00 |
Björn Schießle
|
da892d69ab
|
if the file doesn't exists; create a new one. We use this to create new text files in the web interface
|
2013-07-22 09:15:19 +02:00 |
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
Bart Visscher
|
25e3c9cbeb
|
Only display call trace in debug mode
|
2013-07-21 22:56:21 +02:00 |
Bart Visscher
|
aa22194a09
|
In debug mode uncaught exceptions should display a nice page
|
2013-07-21 22:40:35 +02:00 |
Bart Visscher
|
8c5df31c49
|
DRY use OC_Template::printErrorPage
|
2013-07-21 22:30:32 +02:00 |
Bart Visscher
|
df8ad46dae
|
Change exit calls to throwing an exception
This way the error won't be fatal in a unit test
|
2013-07-21 22:29:50 +02:00 |
Bart Visscher
|
6d39e0ad6f
|
Change to use !== and ===
|
2013-07-21 21:42:42 +02:00 |
Thomas Müller
|
01c39cf2be
|
fixing typos, PHPDoc and missing namespace \
|
2013-07-21 21:42:42 +02:00 |
Bart Visscher
|
3de8570e35
|
Move basic template functions to their own class
|
2013-07-21 21:42:42 +02:00 |
Bart Visscher
|
2593395561
|
Move template functions to there own file
|
2013-07-21 21:37:25 +02:00 |
Bart Visscher
|
5965f3ecea
|
Split locating JS and CSS files to their own class
|
2013-07-21 21:36:15 +02:00 |
Bart Visscher
|
37a731bcad
|
Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
|
2013-07-21 11:32:11 -07:00 |
Bart Visscher
|
639097db59
|
Merge pull request #4092 from owncloud/base-better-errors
Generate better errors in base.php
|
2013-07-21 11:20:30 -07:00 |
Bart Visscher
|
9bf12da750
|
Merge pull request #3880 from owncloud/code-checker
Add classes replaced by the public api to the code checker
|
2013-07-21 11:19:20 -07:00 |
kondou
|
05084e03a0
|
Use !== and === in settings.
|
2013-07-21 13:55:25 +02:00 |
icewind1991
|
94fcbc736e
|
Merge pull request #4145 from owncloud/fix-failing-master
Fix failing master
|
2013-07-21 04:31:27 -07:00 |
Morris Jobke
|
f54f203e56
|
mark test as incomplete because I can't reproduce jenkins failure
|
2013-07-21 11:28:06 +02:00 |
Morris Jobke
|
8f93490ac4
|
fix failing master branch - Test_Config::testWriteData
|
2013-07-21 11:13:29 +02:00 |
Morris Jobke
|
05c83a163a
|
add proper deprecated tag
|
2013-07-21 10:30:00 +02:00 |