Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
icewind1991
|
118c3d8a38
|
Merge pull request #4353 from owncloud/fix_search_user
fix function call for searchUsers()
|
2013-08-08 06:23:53 -07:00 |
Bjoern Schiessle
|
df358dfef5
|
fix function call for searUsers()
|
2013-08-08 13:41:04 +02:00 |
Björn Schießle
|
c2f40d2495
|
Merge pull request #4243 from owncloud/no_empty_versions
don't create empty versions
|
2013-08-08 03:57:43 -07:00 |
Morris Jobke
|
35e1d8b265
|
Merge pull request #4328 from owncloud/cleanupdb_kondou
Clean up DB, after we're done with testing Preferences
|
2013-08-08 01:36:10 -07:00 |
Bjoern Schiessle
|
ab6e47b44a
|
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
|
2013-08-08 09:44:19 +02:00 |
Thomas Müller
|
f7915d745a
|
Merge pull request #4340 from owncloud/true-false-as-filename
Allow true and false as filenames.
|
2013-08-08 00:03:50 -07:00 |
Bjoern Schiessle
|
b39d2d1938
|
more error messages which might be useful for the user to debug his server config
|
2013-08-08 08:39:11 +02:00 |
Bjoern Schiessle
|
7ce03ba37c
|
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
|
2013-08-08 08:39:01 +02:00 |
Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
Bart Visscher
|
d563367b0f
|
More style fixes
|
2013-08-07 22:22:33 +02:00 |
Jan-Christoph Borchardt
|
31d50288a5
|
draw attention to the newly added app entry by flashing it twice
|
2013-08-07 21:54:28 +02:00 |
Jan-Christoph Borchardt
|
7a9daa99d1
|
scroll the app navigation down so the newly added app is seen
|
2013-08-07 21:53:53 +02:00 |
Jan-Christoph Borchardt
|
775f33cc1b
|
prepend the new app before the 'More apps' function
|
2013-08-07 21:53:25 +02:00 |
Bart Visscher
|
83988a5906
|
Fix stupid bug
|
2013-08-07 21:01:31 +02:00 |
Bart Visscher
|
0783267e2c
|
Move query processing after the check for prepared statement cache
|
2013-08-07 18:21:49 +02:00 |
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
Bart Visscher
|
2cc94cbc73
|
Style fixes
|
2013-08-07 18:17:37 +02:00 |
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 |
Georg Ehrke
|
41ba155a14
|
fix js error
|
2013-08-07 11:58:49 +02:00 |
Georg Ehrke
|
dcc92445a0
|
allow permissions.user to be null as suggested by @butonic
|
2013-08-07 11:51:08 +02:00 |
Georg Ehrke
|
91bd4dd67b
|
implement previews of single shared files
|
2013-08-07 11:48:08 +02: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 |
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
Georg Ehrke
|
554b1990e2
|
suppress is_file error msg
|
2013-08-05 14:23:30 +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 |
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 |
Thomas Müller
|
d97e3c3571
|
adding proper evaluation of plural form - uses LGPL licensed code of jsgettext
|
2013-08-03 23:31:49 +02:00 |