Commit Graph

12880 Commits

Author SHA1 Message Date
Andreas Fischer
67df0a60fb Check expected type after JSON decode instead of checking what is not expected.
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-07 17:01:14 +02:00
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
kondou
6c78152564 Proper WHERE – the table is called userid not user 2013-08-06 17:31:50 +02:00
kondou
b8bfebe51e Use setUpBeforeClass() and tearDownAfterClass() 2013-08-06 17:26:12 +02:00
kondou
b560bb21f0 Clean up DB, after we're done with testing 2013-08-06 17:01:01 +02:00
Robin Appelman
95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Morris Jobke
057d7aa108 Merge pull request #4321 from owncloud/add_unittests_kondou
Add unittests
2013-08-06 04:39:20 -07:00
Bart Visscher
9b6357e6aa Merge pull request #4291 from owncloud/schema
update DB Schema class
2013-08-05 11:29:52 -07:00
kondou
87ad677151 Remove pointless unittest (search/result) 2013-08-05 19:38:52 +02:00
Thomas Müller
1bbe979345 Merge pull request #4319 from owncloud/fixing-undefined-index-mtime-cache-scanner-master
use isset to prevent undefined index
2013-08-05 07:47:29 -07:00
Morris Jobke
f55fbc9093 Merge pull request #4320 from owncloud/adding-executable-occ-master
adding executable script occ (ownCloud console)
2013-08-05 06:07:27 -07:00
kondou
a51af39595 Add unittests
Unittests for:

- search/result

- util

- preferences
2013-08-05 14:47:14 +02:00
Thomas Müller
2871d11b5c adding executable script occ (ownCloud console) 2013-08-05 14:03:11 +02:00
Jenkins for ownCloud
0fce89308e [tx-robot] updated from transifex 2013-08-05 07:54:38 -04:00
Thomas Müller
464afb5eca use isset to prevent undefined index 2013-08-05 13:51:45 +02:00
Thomas Müller
19e3780ef2 remove unneeded vars from unit test 2013-08-05 10:21:51 +02:00
Thomas Müller
bf1a9dfae3 Merge pull request #4285 from owncloud/scan-files-script-master
adding new cli script to rescan files
2013-08-05 01:09:15 -07:00
Thomas Müller
d1a39ab01c Merge pull request #4293 from owncloud/config-date
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
Thomas Müller
b5f18111f4 Merge pull request #4308 from owncloud/fix-4194
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 15:16:32 -07:00
Thomas Müller
0ae2bb77ba Merge pull request #4228 from owncloud/fix-3836
app migrate: Use = instead of LIKE as described in the comment above.
2013-08-04 15:00:24 -07:00
Thomas Müller
33d78ab9c7 fixing PHPDoc 2013-08-04 23:13:34 +02:00
Thomas Müller
ad952f215d add 'logdateformat' to config.sample.php 2013-08-04 23:13:19 +02:00
Thomas Müller
b716d035c3 fixing PHPDoc 2013-08-04 22:58:40 +02:00
Jan-Christoph Borchardt
5a77b67147 change long couldn't be determined string to question mark again 2013-08-04 16:27:17 +02:00
Jenkins for ownCloud
9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Andreas Fischer
e03d9e3aa0 Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. 2013-08-04 02:48:00 +02:00
Myles McNamara
74a264e82e fix syntax error
accidentally had ; included, and changed concatenating
2013-08-03 18:47:27 -04:00
Thomas Müller
d97e3c3571 adding proper evaluation of plural form - uses LGPL licensed code of jsgettext 2013-08-03 23:31:49 +02:00
Thomas Müller
b229381dda initialize $plural_form_string with English default 2013-08-03 23:29:31 +02:00
Thomas Müller
2e5f1142be return plural form in ajax translations 2013-08-03 23:27:18 +02:00
Robin Appelman
3534c3b373 add reveal mimetype 2013-08-03 21:59:44 +02:00
Jenkins for ownCloud
17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Myles McNamara
8edc0f210b use theme name and title for password reset
password reset email uses owncloud, updated to use theme settings
2013-08-03 00:00:32 -04:00
Thomas Müller
e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
Thomas Müller
550b647d8a another new line 2013-08-02 23:07:53 +02:00
Thomas Müller
35a42da3ca PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction 2013-08-02 21:46:25 +02:00
Thomas Müller
389d0824e8 add new line to generated php code 2013-08-02 21:45:36 +02:00
Thomas Müller
afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction
Simplify OC_DB transaction functions
2013-08-02 12:32:41 -07:00
Thomas Müller
010c4e0b83 remove cli check 2013-08-02 21:28:04 +02:00
Thomas Müller
58f369d029 more verbose printouts - fixing execution 2013-08-02 21:23:50 +02:00
Thomas Müller
5e1a775016 adjust usage text 2013-08-02 21:23:26 +02:00
Alexander Bogdanov
72ad843203 Fixing owncloud/core#4301
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
Robin Appelman
ed054e67d6 DB: remove invalid asserts 2013-08-02 20:10:26 +02:00
Robin Appelman
2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher
43b31f2161 Merge pull request #4283 from owncloud/add_ocimage_unittest
Add ocimage unittest
2013-08-02 08:27:24 -07:00
Bart Visscher
fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24 Use function to create schema manager 2013-08-02 16:02:33 +02:00
Thomas Müller
821a99b937 Merge pull request #4287 from Takuto88/language-config
Make default language configurable via config.php
2013-08-02 06:49:54 -07:00
Bart Visscher
a7a05b321a Use console.php entry point for file scanning from console 2013-08-02 15:36:54 +02:00
Robin Appelman
258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00