wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6821 commits 157 branches 562 tags 714 MiB
Commit graph

125 commits

Author SHA1 Message Date
Bart Visscher
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
Jenkins for ownCloud
dbd2dea689 [tx-robot] updated from transifex 2012-09-17 02:07:23 +02:00
Frank Karlitschek
9d533fcd72 add a legend tag. it´s consistent and looks nicer 2012-09-16 17:13:16 +02:00
Jenkins for ownCloud
e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Bart Visscher
10b74f9d05 Don't hide errors doing the versioning copy 2012-09-13 00:09:00 +02:00
Sam Tuke
9bfdf47cd4 Fixed bug oc-1659 - history dialogue cannot be closed once opened 2012-09-12 14:10:12 +01:00
Jenkins for ownCloud
8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Jenkins for ownCloud
5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
785aa751bb Whitespace fixes 2012-09-07 14:10:43 +02:00
Bart Visscher
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
Jenkins for ownCloud
a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Jenkins for ownCloud
af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Jenkins for ownCloud
e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Jenkins for ownCloud
b867b738e8 [tx-robot] updated from transifex 2012-09-04 02:03:21 +02:00
Bart Visscher
5153b8b293 Add url-params to url with new parameter in linkTo function 2012-09-03 21:51:32 +02:00
Jenkins for ownCloud
d386e0172a [tx-robot] updated from transifex 2012-09-03 02:07:40 +02:00
Jenkins for ownCloud
2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Thomas Mueller
10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Jörn Friedrich Dreyer
3ba27e624f unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:11:10 +02:00
Bart Visscher
db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher
0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Jenkins for ownCloud
9338d093f9 [tx-robot] updated from transifex 2012-08-29 02:06:48 +02:00
Jenkins for ownCloud
8374a49cc1 [tx-robot] updated from transifex 2012-08-28 02:03:56 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 03:14:26 +02:00
jfd
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
Jenkins for ownCloud
f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00
Jenkins for ownCloud
07a889631e [tx-robot] updated from transifex 2012-08-24 02:07:18 +02:00
Jenkins for ownCloud
082ed4ab71 [tx-robot] updated from transifex 2012-08-23 02:07:35 +02:00
Michael Gapczynski
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
Jenkins for ownCloud
36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Jenkins for ownCloud
70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Jenkins for ownCloud
da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Michael Gapczynski
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
Jenkins for ownCloud
19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Thomas Mueller
53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +02:00
Bart Visscher
cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Lukas Reschke
5b16c7a25d This is unnessecary because we already run htmlentities() over the template engine 2012-08-11 20:53:56 +02:00
Michael Gapczynski
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
Georg Ehrke
da4057ecfd fix label for versioning in admin settings 2012-08-04 18:51:09 +02:00
Michael Gapczynski
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
Michael Gapczynski
4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Robin Appelman
8a19e134df fix ununsed variables 2012-07-21 00:20:27 +02:00
Thomas Tanghus
748fcabba4 Added CSRF checks to files_versions. Expect some error messages - and report them ;) 2012-07-17 11:57:38 +02:00
Bjoern Schiessle
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