Jan-Christoph Borchardt
|
4845ef5ac6
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 13:01:52 +02:00 |
|
Jan-Christoph Borchardt
|
14003b6d96
|
replace different icons for code with proper ones
|
2013-08-14 13:00:13 +02:00 |
|
Jan-Christoph Borchardt
|
fc23649fa1
|
replace different icons for documents, spreadsheets and presentations with proper ones
|
2013-08-14 12:43:42 +02:00 |
|
Jan-Christoph Borchardt
|
5abf6ddea4
|
replace same but differently named package graphics with one proper one
|
2013-08-14 12:36:31 +02:00 |
|
Jan-Christoph Borchardt
|
20855add94
|
add more file type icons, replace old ones
|
2013-08-14 12:33:41 +02:00 |
|
Georg Ehrke
|
f9b2815767
|
remove \OC\Preview::showErrorPreview
|
2013-08-14 12:21:27 +02:00 |
|
Georg Ehrke
|
e704c8e4dc
|
use web.svg instead of web.png
|
2013-08-14 11:51:54 +02:00 |
|
Georg Ehrke
|
3cbbe395eb
|
don't use hardcoded size for preview
|
2013-08-14 11:38:52 +02:00 |
|
Georg Ehrke
|
1c9d52774e
|
update indexes of oc_permissions
|
2013-08-09 09:31:53 +02: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 |
|
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 |
|
Jenkins for ownCloud
|
0fce89308e
|
[tx-robot] updated from transifex
|
2013-08-05 07:54:38 -04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
kondou
|
de0dc30d89
|
Update skipped tests messages
|
2013-08-02 15:00:12 +02:00 |
|
Jörn Friedrich Dreyer
|
90d718634b
|
Merge pull request #4274 from owncloud/breadcrumbs_show
add OC.Breadcrumb.show(dir, filename, link)
|
2013-08-02 05:42:17 -07:00 |
|
kondou
|
12ee590b2c
|
Merge branch 'master' into add_ocimage_unittest
|
2013-08-02 13:39:48 +02:00 |
|
Thomas Tanghus
|
c5c05b808c
|
Merge pull request #4284 from owncloud/dont_fatal_on_is_file
Don't throw a fatal, if is_file() parameter isn't a 'valid path', but only a data/base64-string.
|
2013-08-02 04:38:26 -07:00 |
|
Bernhard Posselt
|
f5c3a346b0
|
make log date configurable, default to iso 8601
|
2013-08-02 13:34:20 +02:00 |
|
Jörn Friedrich Dreyer
|
895d9ba1b9
|
Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
Use !== and === in files_trashbin app
|
2013-08-02 03:14:24 -07:00 |
|
Jörn Friedrich Dreyer
|
f8bb4e10ae
|
use fixed OC.Breadcrumb.push()
|
2013-08-02 11:46:44 +02:00 |
|
Jörn Friedrich Dreyer
|
b12c1cb325
|
add OC.Breadcrumb.show(dir, filename, link)
|
2013-08-02 11:46:44 +02:00 |
|
Jörn Friedrich Dreyer
|
41739ff83f
|
Merge pull request #4278 from owncloud/breadcrumb-first
make sure the first breadcrumb item is inserted before any other elements in the topbar
|
2013-08-02 02:46:12 -07:00 |
|
Lennart Rosam
|
ad329f541b
|
users's -> user's
|
2013-08-02 11:19:33 +02:00 |
|
Lennart Rosam
|
504beb6cfd
|
Fix typo (again >.<).. gnah
|
2013-08-02 10:01:34 +02:00 |
|
Lennart Rosam
|
79351d064f
|
Make default language configurable via config.php
|
2013-08-02 09:41:31 +02:00 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
|
Thomas Müller
|
3500c39567
|
adding new cli script to rescan files
|
2013-08-01 22:49:43 +02:00 |
|
kondou
|
1b567b2ad1
|
Don't throw a fatal, if is_file() parameter isn't
a 'valid path', but only a data/base64-string.
Related to #4283
|
2013-08-01 21:01:26 +02:00 |
|
kondou
|
20b688d4be
|
Optimize image and skip mimetype test
|
2013-08-01 20:17:43 +02:00 |
|