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
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
5f997021d1
Fix syntax bug
2012-09-19 21:29:16 +02:00
ee32d1aad5
Fix versioning of shared files
2012-09-19 21:29:16 +02:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
b04c7175dc
Check if the versioned file exists before trying to do the versioning
...
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
9d533fcd72
add a legend tag. it´s consistent and looks nicer
2012-09-16 17:13:16 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
10b74f9d05
Don't hide errors doing the versioning copy
2012-09-13 00:09:00 +02:00
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
785aa751bb
Whitespace fixes
2012-09-07 14:10:43 +02:00
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
5b16c7a25d
This is unnessecary because we already run htmlentities() over the template engine
2012-08-11 20:53:56 +02:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
da4057ecfd
fix label for versioning in admin settings
2012-08-04 18:51:09 +02:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
748fcabba4
Added CSRF checks to files_versions. Expect some error messages - and report them ;)
2012-07-17 11:57:38 +02:00
e248412ca9
use getStorage() to get versions location
...
update routine implemented
version number of files_versions increased
Conflicts:
apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
bf09bcc854
add OCP\Files to access files
2012-07-10 19:22:06 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
b967530795
increase the time limit again to a sensible granularity of 1 min.
...
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
51774cca6b
use OC_Filesystem for rollback
2012-07-05 14:20:40 +02:00
55cde0e5aa
moved remove and rename hook to libs/hooks.php
2012-07-05 11:35:08 +02:00
b1c9785eb3
Merge branch 'master' of gitorious.org:owncloud/owncloud
...
Conflicts:
apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
a775deaf22
Moved hooks and versions.php into new lib directory
...
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
bdd1baeb85
use public API
2012-06-28 14:18:57 +02:00
e5792cc064
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
2012-06-28 14:06:20 +02:00
f22f49671b
move hook to erase versions from deleted files to the right place
2012-06-28 12:42:47 +02:00
52f99a7570
delete file versions if the user deletes a file
2012-06-28 11:48:57 +02:00
dac539b619
handover the correct timestamp
2012-06-28 11:46:17 +02:00
c67ae2e7f1
no reason to strip tags at this point
2012-06-27 15:56:14 +02:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
cd934d5d89
Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
2012-06-20 17:10:49 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
5f4132d6ba
more fixes
2012-05-31 21:16:36 +02:00
57a56299d8
more fixes
...
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
27f7dae932
removed closing php tag
2012-05-22 13:42:55 +01:00
35bd601215
Fix check for when to store a new version of a file
2012-05-18 22:27:43 -04:00
f750da1802
Fix revert link on history page of file versions
2012-05-18 22:07:48 -04:00
89f5701d1a
Fix versioning of shared files
2012-05-18 22:07:48 -04:00
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
122d1efecf
Don't show the select form in the history dropdown if a file has no other versions
2012-05-18 10:39:43 -04:00
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
1fc74ea174
Add ctmp extension to blacklist to make sync test files not versioned.
2012-05-14 10:51:41 +02:00
d98d72aa99
improved url generation - made use of OC.linkTo() for linking to versions history page
2012-05-11 17:13:58 +01:00
03fad97764
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
4ba527625f
don't try to register file actions when we're not in the files app
2012-05-02 23:26:57 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
Jenkins for ownCloud
Robin Appelman
Arthur Schiwon
Bart Visscher
Lukas Reschke
Björn Schießle
VicDeo
Frank Karlitschek
scambra
Sam Tuke
Jörn Friedrich Dreyer
jfd
Michael Gapczynski
Georg Ehrke
Thomas Tanghus
Brice Maron
Sam Tuke
Michael Gapczynski
Tom Needham
Sam Tuke
Klaas Freitag