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 |