73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
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
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
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
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
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
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
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
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
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
ec3c5f36cb
debug output removed
2012-12-18 13:26:10 +01:00
21cdf93616
remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable
2012-12-18 12:57:28 +01:00
e6e9d332cb
add missing bracket
2012-12-18 12:37:24 +01:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
0e0d54dc58
get timestamp from file instead from time(); typo fixed
2012-12-17 18:00:11 +01:00
2a42344781
don't check for min interval, no longer needed
2012-12-17 17:14:24 +01:00
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
a7bb4b128f
personal settings removed, there is no need to expire versions manually
2012-12-17 13:34:17 +01:00
acc902a0b6
remove blacklist
2012-12-17 13:30:18 +01:00
0a49fcf9d1
update files history according the given intervals
2012-12-17 13:28:40 +01:00
ee1ce6714b
add size to versions array
2012-12-17 11:39:57 +01:00
24d4f701bf
calculate free space for versions
2012-12-17 11:39:57 +01:00
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
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
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
3358bface5
fix incorectly merged versions.php
2012-11-16 12:24:28 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
9795bc19bf
Checkstyle: Fix the last two InvalidEOLChar
2012-11-04 18:42:18 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
72aebe3aa3
fix broken paths in versions app
2012-10-27 18:08:00 +02:00
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
f151376ad5
remove remaining line from merge conflict
2012-10-27 17:06:13 +02:00
a93660d37a
fix broken paths in versions app
2012-10-27 15:52:48 +02:00
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
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
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
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
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
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
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
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
f29f1cad1d
Prevent Versions click handler from closing sharing dropdown
2012-10-09 13:00:33 +03:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Björn Schießle
Bart Visscher
Robin Appelman
Jenkins for ownCloud
Frank Karlitschek
Michael Gapczynski
Felix Moeller
Arthur Schiwon
Lukas Reschke
VicDeo