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

3741 commits

Author SHA1 Message Date
Michael Gapczynski
bd0d189f6f Merge branch 'master' into googledrive 2013-05-30 11:20:22 -04:00
Jörn Friedrich Dreyer
476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10 
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
 2013-05-30 06:00:52 -07:00
icewind1991
aa1c5a5d63 Merge pull request #3529 from owncloud/folder-permissions 
Cache: provide a function to get the permissions of all files in a folder with one query
 2013-05-30 05:54:29 -07:00
Jenkins for ownCloud
8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Michael Gapczynski
dbbf195727 Only retrieve the current user's permissions 2013-05-29 18:08:18 -04:00
Morris Jobke
5c04b3a63a fix wrong signature delimiter - fix #3523 2013-05-29 20:21:48 +02:00
Michael Gapczynski
5bbc583b56 Merge pull request #3532 from owncloud/scan-update 
Only update metadata that has changed
 2013-05-29 10:23:41 -07:00
Michael Gapczynski
59655e9afd Style fixes 2013-05-29 10:56:28 -04:00
Michael Gapczynski
ea55367678 Organize conditionals in a better order 2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9 Only update metadata that has changed 2013-05-29 10:19:03 -04:00
Robin Appelman
24a401a548 Cache mimetype icons 2013-05-29 15:43:41 +02:00
Robin Appelman
44d217c425 Cache: provide a function to get the permissions of all files in a folder with one query 2013-05-29 15:25:42 +02:00
Jenkins for ownCloud
7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Robin Appelman
57f712f8a9 implement ArrayInterface with Session 2013-05-28 16:52:40 +02:00
Robin Appelman
cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Jenkins for ownCloud
3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman
040045cc2e provide a dummy session for CLI 2013-05-28 01:15:38 +02:00
Robin Appelman
f547b66d6b check fix if session start is successfull 2013-05-28 01:13:36 +02:00
Robin Appelman
e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Robin Appelman
76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Robin Appelman
9e65f40d1b Add PublicEmitter class 2013-05-27 20:20:06 +02:00
kondou
3001db6b50 Update jquery to 1.10.0 & add jquery-migrate 1.2.1 2013-05-27 20:13:13 +02:00
Michael Gapczynski
16925672e8 Merge branch 'master' into googledrive 2013-05-27 11:35:57 -04:00
Michael Gapczynski
0953b68556 Return null if file size is negative for WebDAV, fix #2013 2013-05-27 11:35:31 -04:00
Michael Gapczynski
6151c0d310 Merge pull request #3412 from owncloud/fix_2013 
Don't set Content-Length header if size is unknown
 2013-05-27 07:44:35 -07:00
Jenkins for ownCloud
73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
Jenkins for ownCloud
0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Michael Gapczynski
0fdf3a7e63 Merge pull request #3388 from roha4000/master 
Duplicate DB entries in filecache table when renaming folder in WebUI #2
 2013-05-25 11:18:20 -07:00
Michael Gapczynski
c870aed1b6 Merge pull request #3493 from owncloud/bumpversion 
Bump version for files_encryption changes
 2013-05-25 10:20:42 -07:00
Michael Gapczynski
2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Jenkins for ownCloud
6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Thomas Müller
4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Alessandro Cosentino
3fbfe3c06a small typo in the comments 2013-05-23 20:59:02 -04:00
Michael Gapczynski
a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 
Support for moving/copying folders between storages
 2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Michael Gapczynski
30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Michael Gapczynski
3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 10:23:16 -04:00
Björn Schießle
ee53bd1aa3 Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 15:29:22 +02:00
Jörn Friedrich Dreyer
1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer
cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Morris Jobke
9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template 
Use js templates in OC.dialogs etc.
 2013-05-22 03:00:04 -07:00
Roland Hager
2ea2abf11e Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users. 2013-05-22 08:18:57 +02:00
Florin Peter
28d72b822d Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 01:26:35 +02:00
Thomas Müller
e2444ec9c5 Merge pull request #3266 from owncloud/hooks 
New hook system
 2013-05-21 15:21:25 -07:00
Robin Appelman
81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop 
Prevent backgroundScan() from looping
 2013-05-21 09:15:22 -07:00
Björn Schießle
5cd14425f9 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
 2013-05-21 15:30:19 +02:00