mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,645 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

13645 Commits

Author SHA1 Message Date
Bjoern Schiessle 6d0987bdb4 some small js fixes 2013-09-24 18:32:57 +02:00
Bjoern Schiessle 74f1359b8b revert broken 3rdparty reference 2013-09-24 12:50:03 +02:00
Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Björn Schießle 9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password 
sharing, allow user to disable password protection
 2013-09-23 01:20:09 -07:00
Thomas Müller 03eedb58fc Merge pull request #4327 from owncloud/scanfile-remove 
remove deleted files while scanning
 2013-09-22 22:40:13 -07:00
Bart Visscher 811f680457 Merge pull request #4623 from owncloud/convert-oc_preferences 
Convert OC_Preference to object interface
 2013-09-22 10:45:56 -07:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Morris Jobke 37bd489d2b Merge pull request #4929 from owncloud/fixing-4416-master 
Fixing 4416 master
 2013-09-22 08:40:20 -07:00
Jörn Friedrich Dreyer a1be01c66f Merge pull request #4938 from owncloud/scan-filter-outside-view 
When filtering search results, ensure results are children of the...
 2013-09-22 01:01:59 -07:00
Robin Appelman a1d4eb1f95 files: when filtering search results, ensure results are children of the fakeroot not just path starting the same 2013-09-22 01:24:12 +02:00
Thomas Müller 2a0c51a8bf Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading 
namespaces use upcasefirst parts
 2013-09-21 11:54:06 -07:00
Thomas Müller 3189ee2daf setting a default on filecache column unencrypted_size 2013-09-20 20:47:24 +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
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
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
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
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
Thomas Müller 3c0e93e220 no file actions during upload 2013-09-18 23:06:48 +02:00
Jörn Friedrich Dreyer 72d53008cc indentation 2013-09-18 17:58:15 +02:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer 12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00