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

13667 Commits

Author SHA1 Message Date
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
Jörn Friedrich Dreyer 64cc13a8d3 allow passing classes to buttons 2013-09-18 17:13:07 +02:00
Bart Visscher 817b8d151b Merge pull request #4745 from owncloud/split_personal-user_passwordchange 
Split personal and user-mgmt password change logic
 2013-09-18 07:53:11 -07:00
kondou 18a2c48ceb Translate errormsgs in settings/changepassword/controller 2013-09-18 16:47:27 +02:00
Jörn Friedrich Dreyer 715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer 17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-18 14:19:58 +02:00
Jörn Friedrich Dreyer ec1949f5ed Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-18 14:15:28 +02:00
Jörn Friedrich Dreyer 1eb42626f5 Merge pull request #4769 from owncloud/gitignore_apps_fix 
add slash so inverts are triggered
 2013-09-18 04:58:05 -07:00
Jörn Friedrich Dreyer c531b4ef5b Merge pull request #4872 from owncloud/refactor_upload_progress 
refactor upload progress
 2013-09-18 04:55:10 -07:00
Thomas Müller 20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller 6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Bjoern Schiessle 1a60aa2b6a only remember password if the user changes the permissions, otherwise the user disabled the password protection 2013-09-18 11:49:02 +02:00
Morris Jobke b54e9be0ac Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page 
disable avatar loading on public guest page
 2013-09-18 02:33:44 -07:00
Thomas Müller 370ed814f7 add permissions of the file to the json response 2013-09-18 11:22:29 +02:00
Björn Schießle e0f18ec72b Merge pull request #4708 from owncloud/encryption_fixes 
make sure that initial encryption also starts for a fresh installation
 2013-09-18 01:33:52 -07:00
Jörn Friedrich Dreyer 342a420eba disable avatar loading on public guest page 2013-09-17 19:25:03 +02:00
Jörn Friedrich Dreyer e43e961dcb we cannot load avatar on guest page 2013-09-17 19:20:16 +02:00
Jörn Friedrich Dreyer 3f7f6434d1 Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-17 19:11:47 +02:00
Jörn Friedrich Dreyer 86c4c83b86 use exists 2013-09-17 19:11:18 +02:00
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00