29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
5924d1d95c
add backticks around table names
2013-03-25 12:29:13 +01:00
63e3f978ab
[tx-robot] updated from transifex
2013-03-20 00:02:44 +01:00
418fb98c40
remove backticks around table names
2013-03-15 12:10:21 +01:00
e37e884d7a
add backtick for db queries to prevent postgresql errors
2013-03-15 12:10:07 +01:00
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
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
f78594c0ae
fix var name
2013-03-14 17:09:48 +01:00
93b2ada6f6
fix var name
2013-03-14 17:08:16 +01:00
0cf50d63bf
create new version if the same file is uploaded again over the web interface
2013-03-14 16:47:59 +01:00
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
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
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
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
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
45869afa5a
remove debug output
2013-03-08 10:51:28 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
2a5d9ca9c5
damn copy&paste, fix wrong var name
2013-03-04 12:59:48 +01:00
21bad1fcc0
fix type in var name
2013-03-04 12:33:16 +01:00
94dab96dba
fix quota calculation for trash and versions
2013-03-04 12:17:57 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
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
70014d37dc
fix expire function
2013-03-04 17:20:14 +01:00
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
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
a01540a300
fix getVersions() call for the history view
2013-03-01 13:55:10 +01:00
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
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
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
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
fc5331eaec
[files_versions] From echo to p
2013-02-27 21:50:22 +01:00
f8bcd38d4d
remove admin settings from app.php
2013-02-27 15:53:08 +01:00
6cf147003f
Merge branch 'master' into versions_cleanup
2013-02-27 15:50:08 +01:00
9b220d0b93
rename History to Versions
2013-02-27 15:46:49 +01:00
d9e75c2b92
remove admin settings for versions
2013-02-27 15:44:02 +01:00
5c7e3cf2e2
escape regular expressions; fix typo in variable name
2013-02-27 10:51:32 +01:00
b917646516
fix quota calculation
2013-02-25 16:12:44 +01:00
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
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
632ca9f06d
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
9edec542c5
mount users home before write/read file to it, necessary to deal with external homes
2013-02-22 13:15:47 +01:00
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
db8dbb9847
Style cleanup files_versions
2013-02-21 23:47:21 +01:00
629097bee7
increase db fileds for usernames
2013-02-21 22:44:44 +01:00
0a5457c550
fix getVersions(), we need to get the correct user and filename
2013-02-21 14:40:16 +01:00
c24ec867f9
calculate versions size per user
2013-02-21 12:20:29 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
57fbfaf86a
Merge pull request #1787 from maelzx/patch-1
...
Update apps/files_versions/js/versions.js
2013-02-20 08:32:36 -08:00
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
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
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
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
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
b05f05ec4a
make store function static
2013-02-14 14:26:49 +01:00
87b98dab25
use new filesystem to mount users home
2013-02-14 11:56:41 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
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
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
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
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
Jenkins for ownCloud
Björn Schießle
Frank Karlitschek
Tom Needham
Tom Needham
Bernhard Posselt
j-ed
Lukas Reschke
maelzx
Robin Appelman
Bart Visscher
Jörn Friedrich Dreyer
Björn Schießle
Michael Gapczynski
Felix Moeller
Arthur Schiwon