Commit graph

10847 commits

Author SHA1 Message Date
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Bart Visscher
51e07a90b7 Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
Lukas Reschke
0c395e9aa4 Merge pull request #2834 from owncloud/suppress-setup-warning
Suppress the notice from the nullbyte check
2013-04-09 13:10:26 -07:00
Bart Visscher
f9b77e392c Suppress the notice from the nullbyte check 2013-04-09 21:11:44 +02:00
eMerzh
8db76ef7d2 Merge pull request #2147 from eMerzh/split_config
[OC6] Allow to load splited config files
2013-04-09 09:56:16 -07:00
Thomas Müller
be47f77060 Merge pull request #2811 from owncloud/app-version-check
added yet another test for the verion compare check due to mail
2013-04-09 08:10:26 -07:00
Thomas Tanghus
6ba391c87a Merge pull request #2815 from owncloud/default-quota
Users: fix "Other.." quota option for the default quota
2013-04-09 05:39:06 -07:00
Bernhard Posselt
c10d4af234 Merge pull request #2819 from Kondou-ger/fix_2730
Fix #2730
2013-04-09 05:13:02 -07:00
kondou
5f89812a9b Fix #2730
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
kondou
e44cc8ea57 Fix OC.dialogs.form()
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
Robin Appelman
27f710d860 Users: fix "Other.." quota option for the default quota 2013-04-09 12:47:08 +02:00
Bernhard Posselt
352af6005f Merge pull request #2801 from OpenLarry/patch-1
fixes #2679 - 5.0.3 Renaming -> Nothing happens
2013-04-09 03:40:40 -07:00
Bernhard Posselt
27d8337728 Merge pull request #2697 from owncloud/button-css-fixes
Button css fixes
2013-04-09 03:04:34 -07:00
Bernhard Posselt
6fc0319e1b Merge pull request #2754 from owncloud/cookie-path
Just send the cookies in the ownCloud directory
2013-04-09 02:36:20 -07:00
Bernhard Posselt
8cd4cadb22 Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
Add mimetype filter to getDirectoryContent function
2013-04-09 02:25:40 -07:00
Björn Schießle
2d489a94c6 Merge pull request #2797 from owncloud/fixing-2792-master
fixes #2792 - only touch if writable
2013-04-09 01:50:05 -07:00
Bernhard Posselt
721cbe8280 used oc version 5.0.3 2013-04-09 10:47:02 +02:00
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
Michael Gapczynski
d51a94161e Initialize collectionTypes variable as false 2013-04-08 17:46:52 -04:00
OpenLarry
49313b334a fixes #2679 2013-04-09 00:26:16 +03: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
kondou
9c53f35d9a Remove manual mimetype checking. 2013-04-08 23:00:02 +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
Bart Visscher
a07a8794b8 Add mimetype filter to getDirectoryContent function 2013-04-08 22:40:03 +02:00
Thomas Mueller
d069ee8a8b fixes #2792 - only touch if writable 2013-04-08 22:22:49 +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
Michael Gapczynski
e704bcd96e Correct undefined variable in post_shared hook, fixes #2592 2013-04-07 20:05:54 -04: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
870b73ce5a Add octemplate jQuery plugin 2013-04-06 23:24:43 +02: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
kondou
275badaf76 Make files _and_ directorys selectable/browsable.
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02: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
d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +02:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
kondou
3e185911f1 Fix repeating directory names.
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
Bart Visscher
fa8214ecc9 Use the MDB2 function to get the count result 2013-04-06 15:38:30 +02:00
kondou
fba6681f71 Make directories show at top. 2013-04-06 14:42:56 +02:00
kondou
6231e5be39 Make directories clickable.
A bit bugged though ...
2013-04-06 14:17:47 +02:00