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

13356 Commits

Author SHA1 Message Date
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04: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
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
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
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 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
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
Christopher f28c6bc213 Merge pull request #4761 from owncloud/fix_language_selection-kondou 
Fix language selection
 2013-09-08 05:50:41 -07:00
kondou 4963a5b30f Fix language selection; Fix #4756 2013-09-07 16:28: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
Bjoern Schiessle b8241aa79d remove some more debug output 2013-09-06 16:07:54 +02:00
Bjoern Schiessle edb78c917c remove some error_logs 2013-09-06 16:07:45 +02:00
Bjoern Schiessle d33fabd02d remove error logs 2013-09-06 16:07:25 +02:00
Bjoern Schiessle b2dde14dbc coding style fixes 2013-09-06 16:07:18 +02:00
Bjoern Schiessle 627b6164c4 if the files doesn't exist yet we start with the parent to search for shares 2013-09-06 16:07:07 +02:00
Bjoern Schiessle 93f4dec798 fix part file handling and real size calculation, this should also solve #4581 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-09-06 16:06:34 +02:00
Bjoern Schiessle f6830e7462 check shares for the real file and not for the .part file 2013-09-06 16:05:11 +02:00
Bjoern Schiessle 404e36323a first check if a extension exists before comparing it 2013-09-06 16:05:03 +02:00
Bjoern Schiessle 597a3cf1ad handle part files correctly 2013-09-06 16:04:56 +02:00
Pete McFarlane 83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
Thomas Müller e9849270e3 Revert "fixes #4574" 
This reverts commit 81a45cfcf1.
 2013-09-06 00:28:13 +02:00
Bart Visscher 4629d6ad67 Merge pull request #4704 from owncloud/rename-lostpassword-controller 
Use the namespaced variation of the classname.
 2013-09-05 14:38:03 -07:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Georg Ehrke 2954db165b use avconv instead of ffmpeg 2013-09-05 09:53:35 +02:00
Bernhard Posselt fbedd643f7 Merge pull request #4477 from owncloud/hooks-view 
also emit hooks for views that are a subfolder of the user folder
 2013-09-04 16:09:22 -07:00
Thomas Müller 3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror 
Fixed public upload error that prevents upload
 2013-09-04 11:50:38 -07:00
Thomas Müller e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller 
Conflicts:
	core/lostpassword/controller.php
 2013-09-04 20:46:32 +02:00
Morris Jobke 09187f3b3b Merge pull request #4449 from owncloud/clean_up_util 
Clean up \OC\Util
 2013-09-03 22:53:03 -07:00
Morris Jobke 6435e18e95 Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker 
Add previews to OC.dialogs.filepicker()
 2013-09-03 22:35:58 -07:00
Christopher c2eaf7589d Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind 
use on to add event listener instead of deprecated jquery bind
 2013-09-03 06:27:08 -07:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jörn Friedrich Dreyer 449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment 
This reverts commit 64d09452f5.
 2013-09-03 13:20:20 +02:00
Jörn Friedrich Dreyer b0c6f990e4 use on to add event listener instead of deprecated jquery bind 2013-09-03 13:12:19 +02:00
Morris Jobke 84aba4542d Merge pull request #4702 from owncloud/center-utils 
center utils
 2013-09-03 02:27:52 -07:00
Morris Jobke 2da6f6b4ce Merge pull request #4695 from owncloud/placeholder-hsl 
RGB -> HSL
 2013-09-03 02:18:39 -07:00
Christopher a7de0e9652 Merge pull request #4706 from owncloud/fix_filepicker_mimetype 
Use provided mimetype on open. Fix #4696
 2013-09-02 19:36:03 -07:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00