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
Björn Schießle
21bad1fcc0
fix type in var name
2013-03-04 12:33:16 +01:00
Björn Schießle
94dab96dba
fix quota calculation for trash and versions
2013-03-04 12:17:57 +01:00
Jenkins for ownCloud
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
Jenkins for ownCloud
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
Bernhard Posselt
10b108ed8a
Merge pull request #2030 from j-ed/master
...
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
Björn Schießle
70014d37dc
fix expire function
2013-03-04 17:20:14 +01:00
j-ed
20a45d547a
Update app.php
...
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
2013-03-02 12:26:13 +01:00
Jenkins for ownCloud
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
Björn Schießle
a01540a300
fix getVersions() call for the history view
2013-03-01 13:55:10 +01:00
Björn Schießle
e81b6395d4
make sure that the version app always work on the users real home folder and not on the mount point
2013-03-01 13:54:26 +01:00
Jenkins for ownCloud
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
Lukas Reschke
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
maelzx
a319fa8d47
Fix window.location mistakes in previous code
...
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
2013-02-28 11:26:42 +08:00
Jenkins for ownCloud
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
Lukas Reschke
fc5331eaec
[files_versions] From echo to p
2013-02-27 21:50:22 +01:00
Björn Schießle
f8bcd38d4d
remove admin settings from app.php
2013-02-27 15:53:08 +01:00
Björn Schießle
6cf147003f
Merge branch 'master' into versions_cleanup
2013-02-27 15:50:08 +01:00
Björn Schießle
9b220d0b93
rename History to Versions
2013-02-27 15:46:49 +01:00
Björn Schießle
d9e75c2b92
remove admin settings for versions
2013-02-27 15:44:02 +01:00
Björn Schießle
5c7e3cf2e2
escape regular expressions; fix typo in variable name
2013-02-27 10:51:32 +01:00
Björn Schießle
b917646516
fix quota calculation
2013-02-25 16:12:44 +01:00
Björn Schießle
4c980a4851
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
Bernhard Posselt
3f48bebe92
Merge pull request #1827 from owncloud/fix_getVersions
...
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
Björn Schießle
632ca9f06d
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
Robin Appelman
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
Bart Visscher
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Björn Schießle
9edec542c5
mount users home before write/read file to it, necessary to deal with external homes
2013-02-22 13:15:47 +01:00
Bart Visscher
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
Jenkins for ownCloud
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
Bart Visscher
db8dbb9847
Style cleanup files_versions
2013-02-21 23:47:21 +01:00
Björn Schießle
629097bee7
increase db fileds for usernames
2013-02-21 22:44:44 +01:00
Björn Schießle
0a5457c550
fix getVersions(), we need to get the correct user and filename
2013-02-21 14:40:16 +01:00
Björn Schießle
c24ec867f9
calculate versions size per user
2013-02-21 12:20:29 +01:00
Jenkins for ownCloud
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
Frank Karlitschek
57fbfaf86a
Merge pull request #1787 from maelzx/patch-1
...
Update apps/files_versions/js/versions.js
2013-02-20 08:32:36 -08:00
Björn Schießle
d426a09f90
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
...
Versioning app use new filesystem api
2013-02-20 03:38:37 -08:00
maelzx
94e5de8fd0
Update apps/files_versions/js/versions.js
...
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
2013-02-20 11:14:24 +08:00
Jenkins for ownCloud
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
Thomas Mueller
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
Björn Schießle
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
Jenkins for ownCloud
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
Jenkins for ownCloud
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
Björn Schießle
08b68aac6c
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
2013-02-15 12:29:52 +01:00
Jenkins for ownCloud
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
Björn Schießle
b05f05ec4a
make store function static
2013-02-14 14:26:49 +01:00
Björn Schießle
87b98dab25
use new filesystem to mount users home
2013-02-14 11:56:41 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
Björn Schießle
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
Tom Needham
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
Tom Needham
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
Jenkins for ownCloud
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
Jenkins for ownCloud
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
Jenkins for ownCloud
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
Jenkins for ownCloud
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
Jenkins for ownCloud
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
Tom Needham
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
Tom Needham
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
Tom Needham
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
Jenkins for ownCloud
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
Jenkins for ownCloud
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
Thomas Mueller
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
Thomas Mueller
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
Thomas Müller
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
Bart Visscher
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
Bart Visscher
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
Bart Visscher
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Björn Schießle
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
Robin Appelman
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
Robin Appelman
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
Björn Schießle
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
Robin Appelman
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Björn Schießle
f15deaf556
listen to post delete event to allow the trash bin to create a copy of the version first
2013-01-22 15:32:57 +01:00
Robin Appelman
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Björn Schießle
2b9c925a2b
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
...
fix for issue #1186 , missing variables added
2013-01-16 01:26:43 -08:00
Björn Schießle
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Björn Schießle
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Björn Schießle
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
Björn Schießle
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Björn Schießle
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Björn Schießle
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
Björn Schießle
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
Björn Schießle
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Björn Schießle
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
Björn Schießle
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Björn Schießle
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
Björn Schießle
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
Björn Schießle
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
Thomas Mueller
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
Robin Appelman
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Robin Appelman
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
Frank Karlitschek
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
Björn Schießle
ec3c5f36cb
debug output removed
2012-12-18 13:26:10 +01:00
Björn Schießle
21cdf93616
remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable
2012-12-18 12:57:28 +01:00
Björn Schießle
e6e9d332cb
add missing bracket
2012-12-18 12:37:24 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Björn Schießle
0e0d54dc58
get timestamp from file instead from time(); typo fixed
2012-12-17 18:00:11 +01:00
Björn Schießle
2a42344781
don't check for min interval, no longer needed
2012-12-17 17:14:24 +01:00
Björn Schießle
75a871ecd7
expire all operation no longer needed; delete oldest versions if limit of empty space is reached
2012-12-17 16:32:09 +01:00
Björn Schießle
a7bb4b128f
personal settings removed, there is no need to expire versions manually
2012-12-17 13:34:17 +01:00
Björn Schießle
acc902a0b6
remove blacklist
2012-12-17 13:30:18 +01:00
Björn Schießle
0a49fcf9d1
update files history according the given intervals
2012-12-17 13:28:40 +01:00
Björn Schießle
ee1ce6714b
add size to versions array
2012-12-17 11:39:57 +01:00
Björn Schießle
24d4f701bf
calculate free space for versions
2012-12-17 11:39:57 +01:00
Michael Gapczynski
63a2271c78
Change post_write hook to write to prevent creating a duplicate of the original file on upload
2012-12-16 15:08:18 -05:00
Frank Karlitschek
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
Robin Appelman
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
Bart Visscher
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
Bart Visscher
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
Robin Appelman
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
Jenkins for ownCloud
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
Björn Schießle
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
Björn Schießle
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Jenkins for ownCloud
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
Jenkins for ownCloud
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Robin Appelman
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Robin Appelman
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Robin Appelman
3358bface5
fix incorectly merged versions.php
2012-11-16 12:24:28 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Felix Moeller
9795bc19bf
Checkstyle: Fix the last two InvalidEOLChar
2012-11-04 18:42:18 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Björn Schießle
72aebe3aa3
fix broken paths in versions app
2012-10-27 18:08:00 +02:00
Björn Schießle
7891add286
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 18:06:14 +02:00
Björn Schießle
f151376ad5
remove remaining line from merge conflict
2012-10-27 17:06:13 +02:00
Björn Schießle
a93660d37a
fix broken paths in versions app
2012-10-27 15:52:48 +02:00
Björn Schießle
c1a0e809bf
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 15:50:17 +02:00
Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Felix Moeller
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
Robin Appelman
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Robin Appelman
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Robin Appelman
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
Robin Appelman
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
Arthur Schiwon
5708488b3e
make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs
2012-10-15 18:16:27 +02:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
Lukas Reschke
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Robin Appelman
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
Jenkins for ownCloud
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
Björn Schießle
4a712bdd48
only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down
2012-10-10 13:46:51 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Björn Schießle
33dcb3b1f4
fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively)
2012-10-10 11:49:16 +02:00