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

10654 Commits

Author SHA1 Message Date
Bernhard Posselt 11dfc7d141 added yet another test for the verion compare check due to mail 2013-04-09 10:41:25 +02:00
Bernhard Posselt 5bb248efd6 Merge pull request #2764 from owncloud/remove-limit-from-count-query 
Remove wrong limit parameter from count query in compatibility function
 2013-04-09 00:19:09 -07:00
Bernhard Posselt 74f90eabe4 Merge pull request #2798 from owncloud/fixing-2789-master 
fixes #2789 - no internet connectivity check if there is non on purpose
 2013-04-09 00:18:13 -07:00
Bernhard Posselt bfe48ba99e Merge pull request #2800 from owncloud/fixing-2743-master 
fixes #2743 - use public OC_User::getDisplayName instead of OC_User::det...
 2013-04-09 00:17:01 -07:00
Jenkins for ownCloud 5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Thomas Müller 89818e279b Merge pull request #2785 from owncloud/vobject_stringproperty 
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
 2013-04-08 14:23:38 -07:00
Thomas Mueller ce54d00b5c fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-08 23:11:33 +02:00
Thomas Tanghus a783bdaec1 StringProperty unittest 2013-04-08 22:54:30 +02:00
Thomas Mueller 46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Thomas Tanghus ae9548bc6e Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762 2013-04-08 14:57:43 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Thomas Tanghus 5fe5e1e17e Merge pull request #2767 from owncloud/js_compatibility 
Move compatibility functions to compatibility.js and add two more.
 2013-04-06 16:23:25 -07:00
Bart Visscher 6d6dfffea7 Merge pull request #2279 from owncloud/refactor_upload_js 
Refactor upload js
 2013-04-06 15:44:08 -07:00
Thomas Tanghus 75af38c1bd Move compatibility functions to compatibility.js and add two more. 2013-04-06 22:37:15 +02:00
Bart Visscher 248e097f3c Merge pull request #1974 from owncloud/use-rawurlencode 
OC6- Just use rawurlencode in files list template
 2013-04-06 11:55:44 -07:00
Bart Visscher 797b529da7 Merge pull request #2759 from owncloud/fix-2718 
Set file perms to 0640 of mount.json - fixes #2718
 2013-04-06 09:52:22 -07:00
Bart Visscher a8b366e612 Merge pull request #2610 from owncloud/vcategories_purge_multi 
Allow purging multiple objects from category index table.
 2013-04-06 09:48:03 -07:00
Bart Visscher 142b020d38 Remove wrong limit parameter from count query in compatibility function 2013-04-06 17:58:47 +02:00
Bart Visscher 46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
Lukas Reschke 6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Frank Karlitschek e91e8b1170 Merge pull request #2751 from Borkason/patch-1 
Fix indentation in util.php.
 2013-04-06 03:01:05 -07:00
Jenkins for ownCloud 6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
Bart Visscher 0e35eee6ac Merge pull request #2750 from Kondou-ger/fix_2693 
Fix #2693
 2013-04-05 13:59:28 -07:00
Birk Borkason d6253696cb Fix indentation in util.php. 2013-04-05 21:49:57 +03:00
kondou 32f96e19e5 Fix Typo 2013-04-05 19:06:58 +02:00
kondou 8d63b7d9bf Fix #2693 
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
 2013-04-05 18:52:14 +02:00
Jan-Christoph Borchardt 5525fade11 Merge pull request #2737 from Kondou-ger/proper_css_comments 
Proper CSS comment
 2013-04-05 07:58:00 -07:00
Frank Karlitschek adb8197c0b Update config.sample.php 
clarify documentation. Fixes https://github.com/owncloud/core/issues/2624
 2013-04-05 13:44:49 +03:00
root 74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
root 69105fce00 Proper CSS comment 
CSS comments don't work like that.
 2013-04-05 01:17:52 +02:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Thomas Tanghus 81a44c3045 Merge pull request #2732 from owncloud/sane_version_param 
Add a name to the version parameter
 2013-04-04 14:54:03 -07:00
Lukas Reschke f944ac9cba Add a name to the version parameter 
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
 2013-04-05 00:33:05 +03:00
Bart Visscher e824c6cffa Merge pull request #2611 from owncloud/filename-width 
Adds a fixed width to the filename to prevent horizontal scroll.
 2013-04-04 05:32:38 -07:00
Thomas Tanghus d048ff719d Remove redundant line 2013-04-04 14:10:34 +02:00
Bart Visscher 52fba43297 Merge pull request #2708 from owncloud/dont_expose_installatio 
Don't expose the server installation time
 2013-04-04 00:48:55 -07:00
Bart Visscher 2f19629407 Merge pull request #2706 from owncloud/random_is_random_and_not_time 
Use a more random source...
 2013-04-04 00:48:21 -07:00
Bart Visscher 866221a012 Merge pull request #2707 from owncloud/remove_brainfucked_method 
Use more random source
 2013-04-04 00:46:24 -07:00
Lukas Reschke 877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00
Lukas Reschke 37cb79155e *gnaaarf* 2013-04-04 01:27:13 +03:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Lukas Reschke 6645a54cac Use random bytes instead of time 
Thanks for the heads-up @VicDeo :-)
 2013-04-04 01:05:44 +03:00
Arthur Schiwon e75406e712 PostreSQL compatibility, fixes #2666 2013-04-03 23:56:59 +02:00
Lukas Reschke ba7c0cf548 Use a more random source... 2013-04-04 00:56:34 +03:00
Bernhard Posselt 40627a05a8 Merge pull request #2694 from owncloud/fix_2690 
Typo, fixes #2690
 2013-04-03 10:23:34 -07:00
Arthur Schiwon d44b649d2a Typo, fixes #2690 2013-04-03 17:52:34 +02:00
Jörn Friedrich Dreyer 7eef643600 Merge pull request #2594 from owncloud/fix_part_file_ignoring 
Fix part file ignoring
 2013-04-03 01:38:18 -07:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Bernhard Posselt b316ae2610 Merge pull request #2651 from owncloud/print_unescaped-u 
Unescape the update hint
 2013-04-02 14:19:30 -07:00