Thomas Müller
|
d5ddbfb045
|
Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
|
2013-09-12 15:44:20 -07:00 |
|
Thomas Müller
|
9d661eab23
|
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
|
2013-09-12 00:40:35 +02:00 |
|
Jenkins for ownCloud
|
68015b2761
|
[tx-robot] updated from transifex
|
2013-09-11 06:50:06 -04:00 |
|
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
2013-09-10 10:42:16 -04:00 |
|
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
2013-09-05 07:37:32 -04:00 |
Arthur Schiwon
|
c01675de5d
|
more is_resource checks before readdir
|
2013-09-05 11:58:57 +02:00 |
|
Jenkins for ownCloud
|
fe0b8ac2c0
|
[tx-robot] updated from transifex
|
2013-09-03 07:46:55 -04:00 |
|
Jenkins for ownCloud
|
e68b5f8b0d
|
[tx-robot] updated from transifex
|
2013-09-01 13:30:40 -04:00 |
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
|
Thomas Müller
|
3eed060ec9
|
backport of #4357 to master
|
2013-08-27 23:53:04 +02:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04:00 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
Georg Ehrke
|
224b80f906
|
move isMimeSupported out of template files
|
2013-08-21 15:55:59 +02:00 |
Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
|
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
|
Georg Ehrke
|
d9e8ebabdc
|
outsource sharing and deleted files previews to apps
|
2013-08-19 13:24:07 +02:00 |
icewind1991
|
d7dde3cfbc
|
Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
|
2013-08-19 03:38:55 -07:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
|
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
Robin Appelman
|
d8c71ba734
|
merge master in storage-wrapper-quota
|
2013-08-18 11:34:56 +02:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
Andreas Fischer
|
4bb0e1567b
|
Use boolean casting for bitwise and result.
|
2013-08-17 23:41:37 +02:00 |
Bart Visscher
|
29b6dd53a0
|
Compare result are already true/false
|
2013-08-17 12:58:10 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Thomas Müller
|
bd1895bdf8
|
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-15 14:08:01 -07:00 |
|
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +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
|
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 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
|
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
|
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
|
Thomas Müller
|
d3e610f589
|
Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
|
2013-07-30 13:20:28 -07:00 |
Victor Dubiniuk
|
15e9e95817
|
Use default cursor for list items
|
2013-07-30 20:58:21 +03:00 |
|
Georg Ehrke
|
93cdfc3e8a
|
Merge branch 'master' into oc_preview
|
2013-07-30 13:52:53 +02:00 |
|
Georg Ehrke
|
ac6a3133ec
|
style fixes
|
2013-07-30 12:33:54 +02:00 |
|
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
|
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
|
Victor Dubiniuk
|
a10a17f818
|
Rewording
|
2013-07-29 18:25:17 +03:00 |