Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Morris Jobke
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Bjoern Schiessle
348706854c
use better coding style
2013-11-28 19:31:35 +01:00
Bjoern Schiessle
bef5108218
detect mimetype from the original filename, without the versioning timestamp
2013-11-28 18:59:38 +01:00
Bjoern Schiessle
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
Björn Schießle
34a8c3c4cd
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
...
move files to owners trash
2013-11-27 10:24:55 -08:00
Bjoern Schiessle
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
Bjoern Schiessle
acf74b24f2
remove unused variable
2013-11-22 16:10:30 +01:00
Bjoern Schiessle
c309067c81
use oc filesystem operations to calc the versions size. This makes sure that we can handle missing directories correctly
2013-11-19 12:23:14 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Frank Karlitschek
29e9f2833d
Merge pull request #5214 from owncloud/no_extra_slashes
...
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
Georg Ehrke
238e4bc3eb
implement delete hooks in file versions lib
2013-11-12 14:06:32 +01:00
Jenkins for ownCloud
e431ba5ce8
[tx-robot] updated from transifex
2013-11-11 05:47:59 -05:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Vincent Petry
41c6c44221
Disable versions app JS in public mode
...
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
2013-10-17 21:04:18 +02:00
Jenkins for ownCloud
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
Bjoern Schiessle
9baedb4102
remove debug output
2013-10-11 17:06:43 +02:00
Bjoern Schiessle
c32c5979d8
Merge branch 'master' into versioning_preview_shared
2013-10-11 17:00:21 +02:00
Bjoern Schiessle
a0de5dd325
some small fixes
2013-10-11 10:34:34 +02:00
Bjoern Schiessle
f4e86045de
make files versions root a class constant
2013-10-10 20:09:38 +02:00
Bjoern Schiessle
87cccb2e32
some small changes/fixes
2013-10-10 20:06:42 +02:00
Bjoern Schiessle
4c2e3919de
make previews work for shared files in the versions drop-down
2013-10-10 17:23:27 +02:00
Bjoern Schiessle
92009c5d8e
fix getVersions() for sub directories
2013-10-10 16:58:11 +02:00
Bjoern Schiessle
bb3b38947d
add missing preview link
2013-10-10 14:57:25 +02:00
Bjoern Schiessle
e56947255e
don't use glob() and getLocalFile(), this can lead to problems on windows servers
2013-10-10 14:43:40 +02:00
ringmaster
c737b521ab
Don't double-slash filenames at the root.
...
Replace either the end of the dir string that isn't preceded by a slash or the slash at the end of the dir string with a slash and the filename.
This prevents the root directory from ending up as two slashes, which breaks files_versions on Windows servers. See #4079 for an explanation.
2013-10-08 12:48:59 -04:00
Bjoern Schiessle
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
Morris Jobke
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
Bjoern Schiessle
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
Bjoern Schiessle
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
Jenkins for ownCloud
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Jenkins for ownCloud
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
Jenkins for ownCloud
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
Jenkins for ownCloud
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
Jenkins for ownCloud
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04: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
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07: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
Morris Jobke
6ae6dc00e5
Merge pull request #4427 from owncloud/fix_4425
...
use OC files API to create missing directory
2013-08-17 08:09:07 -07:00
Bjoern Schiessle
f28f528431
switched to dirname()
2013-08-17 13:49:42 +02:00
Bjoern Schiessle
db8fdd5032
added missing parameter documentation
2013-08-17 13:46:33 +02:00
Björn Schießle
1af2ec1724
Merge pull request #4481 from owncloud/fix_versioning_size_check
...
first check if file exists before checking the files size
2013-08-17 04:37:09 -07:00
Bjoern Schiessle
f71794f0d5
added createMissingDirectories() method
2013-08-17 13:28:35 +02:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00