Commit graph

224 commits

Author SHA1 Message Date
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +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
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
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
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
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
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
Jenkins for ownCloud
401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +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