wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14299 commits 157 branches 562 tags 714 MiB
Commit graph

442 commits

Author SHA1 Message Date
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
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
Thomas Müller
e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 
remove ru_RU - fixes #3135
 2013-08-17 03:10:42 -07:00
Morris Jobke
50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 
Versions fix css
 2013-08-17 03:01:24 -07:00
Bjoern Schiessle
16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle
137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Bjoern Schiessle
a3d009e3b5 also create root dir if it doesn't exist yet 2013-08-14 20:51:36 +02:00
Bjoern Schiessle
d314729cea use OC files API to create missing directory which should handle special chars in every environment correctly 2013-08-14 17:58:41 +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
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
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud
9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04: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
Bjoern Schiessle
853b106bb2 don't create empty versions 2013-07-30 16:01:27 +02:00
Bjoern Schiessle
22b8967031 check if app is enabled 2013-07-30 12:19:01 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00