Commit graph

13853 commits

Author SHA1 Message Date
Thomas Müller
3189ee2daf setting a default on filecache column unencrypted_size 2013-09-20 20:47:24 +02:00
Thomas Müller
d84d548618 when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy 2013-09-20 20:34:17 +02:00
Bart Visscher
45a7b0dbac Fix the apps enabling/disabling in settings 2013-09-20 20:29:15 +02:00
Bart Visscher
e92abfd4d8 Add Config container class to server container 2013-09-20 20:21:24 +02:00
Bart Visscher
e3013c5801 Add Navigation class to server container 2013-09-20 20:20:01 +02:00
Jenkins for ownCloud
5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Jörn Friedrich Dreyer
4b3e56bcf9 remove unneccessary lib in namespace 2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer
9e39118b52 namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Bjoern Schiessle
71e129f295 initialize variable 2013-09-20 15:47:33 +02:00
Bart Visscher
aa8a85f77d Add DBConnection to server container 2013-09-20 14:33:45 +02:00
Bart Visscher
ac73ce1b2a Add UserSession to server container 2013-09-20 14:32:43 +02:00
Bjoern Schiessle
12b4e79201 calculate correct permissions while toggle the password protection 2013-09-20 13:11:05 +02:00
Bjoern Schiessle
944e9b8c69 make sure that both $permissions and $oldPermissions have the same type 2013-09-20 12:40:21 +02:00
Bart Visscher
8e26f291a7 Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
Jörn Friedrich Dreyer
6aeb0a99da same for search by mime 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811 add all results, sharing cache also returns entries for shared files in external storages 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda fix getAll(), refactor search by mime & search 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832 return fixed path, skip shared files outside of 'files' 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187 divide ids into chunks of 1k 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bart Visscher
f9549a4465 Merge pull request #4908 from owncloud/fix_css_selector
css selectors never have a : before []
2013-09-19 10:59:45 -07:00
Bart Visscher
a9ea99e93d Add copyright, remove starting blank line 2013-09-19 19:12:16 +02:00
Bart Visscher
0a2a4cb12e update inherit docs comment 2013-09-19 18:59:06 +02:00
Bart Visscher
55efe1e56c Fix insert/update/delete helper functions for oracle 2013-09-19 18:13:39 +02:00
Bart Visscher
f6284bdce7 Add missing return true statements to legacy preferences functions 2013-09-19 18:13:06 +02:00
Bart Visscher
395cc737a1 Add missing static 2013-09-19 18:13:06 +02:00
Bart Visscher
445d34a2a9 Convert OC_Preference to object interface 2013-09-19 18:13:06 +02:00
Thomas Müller
09cfebe936 Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
file upload conflicts dialog
2013-09-19 08:23:07 -07:00
Jörn Friedrich Dreyer
7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer
bd5cb1d801 Merge pull request #4900 from owncloud/fixing-4488-master
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer
98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Thomas Tanghus
de81210bec Add another test. 2013-09-19 13:55:45 +02:00
Thomas Tanghus
9e4d13858c Fix syntax error 2013-09-19 13:27:41 +02:00
Thomas Tanghus
d5126dd6b4 Merge branch 'appframework-master' into server_folder_methods 2013-09-19 12:32:32 +02:00
Jörn Friedrich Dreyer
078bf0df25 use {count} instead of 'One' for more versatile translation 2013-09-19 12:05:30 +02:00
Thomas Müller
4344c62f7e Merge branch 'master' into fixing-4488-master 2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer
1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer
ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Tanghus
314ca843e8 Updated method names and added a few more tests. 2013-09-19 11:27:13 +02:00
Jörn Friedrich Dreyer
a6933efce3 use n to translate title 2013-09-19 11:25:41 +02:00
Thomas Müller
eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
Thomas Müller
c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer
89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +02:00
Jörn Friedrich Dreyer
cda58ae3df css selectors never have a : before [] 2013-09-19 10:14:07 +02:00
Jörn Friedrich Dreyer
0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Jörn Friedrich Dreyer
f7800cd63e fix 'event is not defined' error 2013-09-19 09:47:51 +02:00
Christopher
ae4775a683 Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
fixing syntax error - it it that hard to test own code?
2013-09-18 22:17:04 -07:00
Thomas Müller
de8d0783ed fixing syntax error - it it that hard to test own code? 2013-09-18 23:46:58 +02:00
Thomas Müller
43a96621ea adding comma to get cleaner diffs in the future 2013-09-18 23:42:36 +02:00