mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,418 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

578 Commits

Author SHA1 Message Date
Bjoern Schiessle 85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle 9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller 37e278f2a9 don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 13:50:56 +01:00
Vincent Petry ca57a849ff When reading the size of "files" mountpoints need to be excluded 
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
 2014-01-20 17:11:33 +01:00
raghunayyar fd49d3c5c5 Fixes typo in versions.css 2014-01-16 14:45:23 +05:30
raghunayyar 775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
Bjoern Schiessle 76fa7bab63 call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 11:37:47 +01:00
Vincent Petry 1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
Thomas Müller 2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Jenkins for ownCloud d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry 409b510889 Moved content disposition code+workarounds to OCP\Response 
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
 2013-12-10 12:42:26 +01:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
zombiehugs 519f63ee97 Revert "[fix] Center Share Dropdown & Versions Dropdown" 
This reverts commit 1dbbfcf3dc.
 2013-12-03 08:23:13 -06:00
zombiehugs 1dbbfcf3dc [fix] Center Share Dropdown & Versions Dropdown 
Center Share Dropdown & Versions Dropdown
 2013-12-03 08:14:06 -06:00
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
raghunayyar cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
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
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Björn Schießle 62f84ff79c css for button no longer needed 2013-07-25 12:29:39 +02:00
Björn Schießle e5b0c1e78b remove unused code; use jquery 2013-07-25 11:15:24 +02:00
Björn Schießle 16d8074d77 fix css 2013-07-25 11:15:01 +02:00
Björn Schießle 9394fc5d4a new version drop down 
Squashed commit of the following:

commit 0dc404a557fa8253e3a87c7babefba6de8e6dab5
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 25 10:26:48 2013 +0200

    fix 'more versions' button for IE8

commit 5836e652857204d68dfdfa8b3318de8e2fe02493
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:56:46 2013 +0200

    clean-up some unused code

commit ac83e53fa24073783a165796fc3016dc7beca293
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:49:03 2013 +0200

    fix order of the versions, newest version should come first

commit f150a88843af316ff505728941287406f25a0751
Merge: bc713c7 b8e399b
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 16:19:36 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit bc713c7b0c3207d00d2f19b10a905a82724c0709
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 16:11:07 2013 +0200

    fix position of more versions button

commit b8e399b1754ae7656c3cb8cef2c53f6976a83d61
Merge: 24825b0 7b6e39d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:04:08 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit 24825b02004efa953197e72b470b9b033030aeee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:02:53 2013 +0200

    umark previous row if a new row gets selected

commit 7b6e39d2939f1b3bba4fff37ca9087dbc7795f03
Merge: 5bfb0ac 7b54644
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:37:19 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit 5bfb0ac5c102bdfd3b27a37cea8c792f69b3b803
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:37:09 2013 +0200

    more style adjustments for version dropdown

commit 7b54644d3036ffba448f0525ca09f6e8898b9950
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 15:12:53 2013 +0200

    remove debug output

commit a75662bcfdce34d4f14020a539172c7ef1b894d3
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:12:26 2013 +0200

    reword Revert to Restore

commit e784644daeac12bc6fa6844f24214a039266ae86
Merge: d07abfd 9978c96
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 15:00:11 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit d07abfdbb49778a8be30b2a6adbe326e1b1f238f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 14:59:17 2013 +0200

    if another drop-down is already open, always close it first

commit 9978c967a6ecbd2d0e5003df3cf4cdba09dab468
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:49:47 2013 +0200

    more style improvements for versions

commit a13355f16e6172c02069930a60a49aba4ebfa227
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:44:13 2013 +0200

    position fixes for versioning

commit 02c1d6b5eabc4075749c2a7a852c9ed7bbb3644d
Merge: c5a9462 203f544
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:31:16 2013 +0200

    merge versions style changes

commit c5a946231a3d011748248db13b6b95ce51eb3e4c
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:29:56 2013 +0200

    bigger clickable area for versions

commit 203f544825bd49b168f2316cf2a04caca75438c8
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 14:15:38 2013 +0200

    changes visual changes, as suggested by Jan

commit 90b1e93676d235a61f318768661b25e5815a9784
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:12:23 2013 +0200

    remove superfluous selector from ID

commit 9768254fe3b2469293fca23151e54cde69bd4661
Merge: c961278 b91c682
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 12:28:06 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c9612781e10a4de9e9405244f87c4e29428a0d3f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 11:05:25 2013 +0200

    replace modal dialog with a OC.Notification

commit 3dc7508a4c271818247afbaed0ce0b03706a8db6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 10:33:05 2013 +0200

    use image path without extension for proper svg to png fallback

commit 23ea7ad46c73fa4b86021070eb58a3b92bc8362e
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:53:58 2013 +0200

    some css fixes

commit 8d01499ae17e43a7d7960841a7c2127fa6de5a56
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:40:16 2013 +0200

    small fixes and improvements according to @Kondou-ger comments

commit 985b6461e81035967959659fab8ea59c733e00eb
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 15:58:19 2013 +0200

    replace == with ===

commit bc8fc3b4a664db2d819e0a7091f31207ffcfe44a
Merge: c1da183 a94c55b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:55:45 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c1da183d13b8098eb33e708d4fdd04111bdc33a5
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:53:37 2013 +0200

    translate timestamps into strings like "X minutes ago" for the versions drop-down

commit c78d2b4bfb0a6800ab8516ac115ba42268be019a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 12:52:44 2013 +0200

    download versions directly from the versions drop-down

commit 14aaf9907625fc76bc153cd846704b7efd15db46
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 11:01:21 2013 +0200

    only show 'more versions' button of necessary

commit a0d8cb46b2255be3d9b3f9bd5f835a173c9665b8
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:49:17 2013 +0200

    remove unneeded code

commit 47eec0679ce16ece0b7890e9b41bf28d7613b131
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:44:58 2013 +0200

    add title for revert and download action

commit df87ccb24327b5c2770f7c23c97e41b143d65ec3
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:40 2013 +0200

    add download button to versions drop-down

commit 622c87ec37c14b7b3237bc9ca980b7f35689a933
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:08 2013 +0200

    adapt css file for the new versions drop-down

commit 300699024fe74a9f0f998c1cce4024484311f50c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 17:28:34 2013 +0200

    revert on click

commit 6673ae6ed45bbda1e0d962e9b32e943afc7123c0
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 16:50:08 2013 +0200

    new versions list, show the latest 5 with a button to retrieve more versions if needed
 2013-07-25 10:35:19 +02:00
Björn Schießle b16c5a6df7 fix array access and change variable names according to the coding style 2013-07-12 11:25:40 +02:00
Björn Schießle 15f7bb296c continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota 2013-07-12 11:25:31 +02:00
Björn Schießle fbf34f3bf6 fix some var names according to our style guide 2013-07-12 11:25:23 +02:00
Björn Schießle 2f0d88cae4 adjust comments 2013-07-12 11:25:12 +02:00
Björn Schießle e7959d3da0 fix typo in comment 2013-07-12 11:25:04 +02:00
Björn Schießle e8760d7284 also expire versions on rename, to update the history more regularly 2013-07-12 11:24:52 +02:00
Björn Schießle d6c1e5490d it is enough to call the expire function once 2013-07-12 11:24:31 +02:00
Björn Schießle e159143165 call expire function before writing the new version to make sure to have enough free space 2013-07-12 11:24:19 +02:00
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Björn Schießle efb026c664 don't normalize absolute local path 2013-06-17 14:42:18 +02:00
Björn Schießle f91b02e9b6 only escape glob pattern 2013-06-14 15:07:06 +02:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Florin Peter b3834b49c3 prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations 2013-05-30 22:05:52 +02:00
Jenkins for ownCloud afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Björn Schießle 96ff19a703 fix history template, print_unescaped() needs to include closing tags 2013-05-14 21:22:30 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Björn Schießle bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
Björn Schießle ddde1b65db adapt free space calculation to the way it is done for the trash bin 2013-04-17 10:43:12 +02:00
Björn Schießle 01d203c773 add explenation of the expire function to the apps description 2013-04-16 12:31:33 +02:00
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Jenkins for ownCloud 33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Björn Schießle 544a46c690 remove used space for versions from db is a user was deleted 2013-04-11 14:39:56 +02:00
Jenkins for ownCloud b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +02:00
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Jenkins for ownCloud 29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Jenkins for ownCloud 5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Björn Schießle 5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Björn Schießle 418fb98c40 remove backticks around table names 2013-03-15 12:10:21 +01:00
Björn Schießle e37e884d7a add backtick for db queries to prevent postgresql errors 2013-03-15 12:10:07 +01:00
Frank Karlitschek 92a8676350 Merge pull request #2317 from owncloud/create_version_on_upload 
create new version if the same file is uploaded again over the web interface
 2013-03-15 01:18:20 -07:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Björn Schießle f78594c0ae fix var name 2013-03-14 17:09:48 +01:00
Björn Schießle 93b2ada6f6 fix var name 2013-03-14 17:08:16 +01:00
Björn Schießle 0cf50d63bf create new version if the same file is uploaded again over the web interface 2013-03-14 16:47:59 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods 
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
 2013-03-09 16:59:13 -08:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Bernhard Posselt 0525bbd73c Merge pull request #2189 from owncloud/versioning_sync_client 
fix versioning for the sync client - distinguish between touch and write operation
 2013-03-08 03:05:28 -08:00
Björn Schießle 8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle 45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Björn Schießle 48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Björn Schießle 2a5d9ca9c5 damn copy&paste, fix wrong var name 2013-03-04 12:59:48 +01:00