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
kondou f6faec0e0b Use a controller instead of two files for changepassword.php 2013-09-11 16:35:13 +02:00
kondou 037cf22c51 Add a comment to clear defaultavatar-functionality 2013-09-11 16:04:41 +02:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
VicDeo 62eeac3390 Merge pull request #4798 from owncloud/fixing-variable-typos-master 
no further comment - which dev did not test this BEFORE submitting the p...
 2013-09-11 05:58:07 -07:00
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
Pete McFarlane 92b57c13c1 Added autoFocus to #shareWith autocomplete options 2013-09-11 11:45:32 +01:00
kondou 83d3df4111 Split some lines, use ===, avoid unnecessary operation 2013-09-11 12:12:40 +02:00
Bart Visscher 4ab8dc9c08 Merge pull request #4788 from owncloud/fixin-irods-session-master 
Fixing session handling in iRODS
 2013-09-11 00:01:55 -07:00
kondou bf7f94422f Bring another enable_avatars to $_ and fix $thus->$this 2013-09-11 07:11:33 +02:00
Thomas Müller af2164bbcb no further comment - which dev did not test this BEFORE submitting the pull request? 
which reviewer did not test the pull request?
 2013-09-11 01:23:37 +02:00
Thomas Müller 3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Robin Appelman b9167196fb adjust test cases to namespace changes 2013-09-10 22:21:49 +02:00
Andreas Fischer a2ade4294c Merge pull request #4472 from owncloud/remove-disconnect 
Remove disconnect function from OC_DB

* owncloud/remove-disconnect:
  Remove disconnect function from OC_DB
 2013-09-10 21:48:56 +02:00
Robin Appelman 2e5ce091f0 add storage backend interface to public namespace 2013-09-10 20:13:47 +02:00
Robin Appelman 9ad7891b4e improve phpdoc for the public files interface 2013-09-10 20:10:25 +02:00
Robin Appelman e271a55783 move filesystem expceptions to global namespace 2013-09-10 19:44:23 +02:00
Robin Appelman 315344eb9c move public files api to a clearer namespace 2013-09-10 19:34:38 +02:00
Jörn Friedrich Dreyer 2c9b3d32ef unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack 2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Müller 03ab26df75 Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master 
Fixing php end tags irods master
 2013-09-10 04:53:22 -07:00
Thomas Müller d63ca25a94 proper test for use_logon_credentials 2013-09-10 12:35:14 +02:00
Thomas Müller 36e7a7c29b use \OC::$session instead of $_SESSION 2013-09-10 12:34:41 +02:00
Thomas Müller 21e5daa218 removing all ?> jutt in case 2013-09-10 11:25:40 +02:00
Thomas Müller c32c116957 removing ?> followed by whitespaces 2013-09-10 11:16:43 +02:00
Thomas Müller 956a2335ad Merge pull request #4647 from owncloud/fix_4619 
Workaround for IE 9 & 10 for clicking filelist after adding new item
 2013-09-10 01:22:25 -07:00
Thomas Tanghus 2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes 
Fixed missing checkboxes in IE8
 2013-09-09 18:25:37 -07:00
Thomas Tanghus fdfdd2e4e7 Remove console logging 2013-09-10 00:25:07 +02:00
Thomas Tanghus 51547c3316 Fix setting ocdialog options after initialization. 2013-09-10 00:21:42 +02:00
Thomas Müller 63a5409c6e Merge pull request #4757 from owncloud/deleteAll-alias 
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
 2013-09-09 15:08:18 -07:00
Thomas Müller 5e1821f21d Merge pull request #4772 from owncloud/preview_improvements 
oc\preview use avconv instead of ffmpeg
 2013-09-09 12:32:45 -07:00
kondou 1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Vincent Petry 5f67ccba00 Fixed missing checkboxes in IE8 
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
 2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer e17c40acb7 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-08 17:31:49 +02:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +02:00
Jörn Friedrich Dreyer 03c90e968f whitespace and indentation fixes 2013-09-08 17:29:43 +02:00
kondou 564de4bc3f Optimize triangle-e.png and triangle-e.svg 2013-09-08 15:18:23 +02:00
Christopher f28c6bc213 Merge pull request #4761 from owncloud/fix_language_selection-kondou 
Fix language selection
 2013-09-08 05:50:41 -07:00
Jörn Friedrich Dreyer 577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer 8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +02:00
kondou 4963a5b30f Fix language selection; Fix #4756 2013-09-07 16:28:51 +02:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +02:00
Robin Appelman 46a57a9f05 change View->deleteAll to an alias of View->rmdir since rmdir works recursive 2013-09-07 14:10:51 +02:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Robin Appelman 2e1b534957 update phpdoc for public fileapi 2013-09-06 20:55:47 +02:00