Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 4 | -9/+18 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 1786 | -18838/+101723 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | General CSS cleanup | kondou | 2013-07-09 | 4 | -22/+44 | |
* | | | | | | | | Merge pull request #4353 from owncloud/fix_search_user | icewind1991 | 2013-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix function call for searUsers() | Bjoern Schiessle | 2013-08-08 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #4243 from owncloud/no_empty_versions | Björn Schießle | 2013-08-08 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | don't create empty versions | Bjoern Schiessle | 2013-07-30 | 1 | -2/+5 | |
* | | | | | | | | | Merge pull request #4328 from owncloud/cleanupdb_kondou | Morris Jobke | 2013-08-08 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Proper WHERE – the table is called userid not user | kondou | 2013-08-06 | 1 | -1/+1 | |
| * | | | | | | | | | Use setUpBeforeClass() and tearDownAfterClass() | kondou | 2013-08-06 | 1 | -6/+2 | |
| * | | | | | | | | | Clean up DB, after we're done with testing | kondou | 2013-08-06 | 1 | -0/+9 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4340 from owncloud/true-false-as-filename | Thomas Müller | 2013-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Check expected type after JSON decode instead of checking what is not expected. | Andreas Fischer | 2013-08-07 | 1 | -1/+1 | |
* | | | | | | | | | more error messages which might be useful for the user to debug his server co... | Bjoern Schiessle | 2013-08-08 | 2 | -2/+6 | |
* | | | | | | | | | improved error message to refect openSSL PHP extension and stock openSSL conf... | Bjoern Schiessle | 2013-08-08 | 1 | -1/+1 | |
* | | | | | | | | | also write error message to the log | Bjoern Schiessle | 2013-08-08 | 1 | -0/+1 | |
* | | | | | | | | | catch broken server config and disable encryption app. | Bjoern Schiessle | 2013-08-08 | 2 | -1/+13 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 248 | -541/+6032 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #4321 from owncloud/add_unittests_kondou | Morris Jobke | 2013-08-06 | 2 | -0/+151 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove pointless unittest (search/result) | kondou | 2013-08-05 | 1 | -17/+0 | |
| * | | | | | | | | Add unittests | kondou | 2013-08-05 | 3 | -0/+168 | |
* | | | | | | | | | Merge pull request #4291 from owncloud/schema | Bart Visscher | 2013-08-05 | 2 | -59/+81 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use function to create schema manager | Bart Visscher | 2013-08-02 | 1 | -20/+35 | |
| * | | | | | | | | | remove invalid type hinting and cleanup namespaces a bit | Robin Appelman | 2013-08-02 | 1 | -5/+8 | |
| * | | | | | | | | | Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager | Bart Visscher | 2013-08-02 | 2 | -7/+7 | |
| * | | | | | | | | | Change OC_DB_Schema to use DI for db connection object | Bart Visscher | 2013-08-02 | 2 | -51/+55 | |
* | | | | | | | | | | Merge pull request #4319 from owncloud/fixing-undefined-index-mtime-cache-sca... | Thomas Müller | 2013-08-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use isset to prevent undefined index | Thomas Müller | 2013-08-05 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #4320 from owncloud/adding-executable-occ-master | Morris Jobke | 2013-08-05 | 2 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | adding executable script occ (ownCloud console) | Thomas Müller | 2013-08-05 | 2 | -2/+13 | |
| |/ / / / / / / / / / | ||||||
* / / / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-05 | 66 | -121/+124 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4285 from owncloud/scan-files-script-master | Thomas Müller | 2013-08-05 | 2 | -0/+67 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove cli check | Thomas Müller | 2013-08-02 | 1 | -4/+0 | |
| * | | | | | | | | | | more verbose printouts - fixing execution | Thomas Müller | 2013-08-02 | 1 | -7/+18 | |
| * | | | | | | | | | | adjust usage text | Thomas Müller | 2013-08-02 | 1 | -2/+2 | |
| * | | | | | | | | | | Use console.php entry point for file scanning from console | Bart Visscher | 2013-08-02 | 2 | -2/+25 | |
| * | | | | | | | | | | adding new cli script to rescan files | Thomas Müller | 2013-08-01 | 1 | -0/+37 | |
* | | | | | | | | | | | Merge pull request #4293 from owncloud/config-date | Thomas Müller | 2013-08-04 | 2 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixing PHPDoc | Thomas Müller | 2013-08-04 | 1 | -3/+3 | |
| * | | | | | | | | | | | add 'logdateformat' to config.sample.php | Thomas Müller | 2013-08-04 | 1 | -1/+4 | |
| * | | | | | | | | | | | make log date configurable, default to iso 8601 | Bernhard Posselt | 2013-08-02 | 1 | -1/+3 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4308 from owncloud/fix-4194 | Thomas Müller | 2013-08-04 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixing PHPDoc | Thomas Müller | 2013-08-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. | Andreas Fischer | 2013-08-04 | 1 | -2/+5 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4228 from owncloud/fix-3836 | Thomas Müller | 2013-08-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | app migrate: Use = instead of LIKE as described in the comment above. | Andreas Fischer | 2013-07-29 | 1 | -1/+1 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-04 | 360 | -1589/+1610 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | add reveal mimetype | Robin Appelman | 2013-08-03 | 1 | -1/+2 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-03 | 35 | -140/+200 | |
* | | | | | | | | | | | Merge pull request #4299 from owncloud/simplify-db-transaction | Thomas Müller | 2013-08-02 | 1 | -10/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |