408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
fa1864971e
Merge pull request #5120 from frisco82/sendEmailJS
...
Fix disabled status after sending a share link email
2013-10-21 13:02:52 -07:00
635a46b373
Merge pull request #5444 from frisco82/fixDisplayGroup
...
Fix display name for user after sharing
2013-10-21 12:05:14 -07:00
be5e1e990b
Merge pull request #5452 from owncloud/fixing-4548-master
...
OCS API to get current user information
2013-10-21 12:02:21 -07:00
bd7cf436c6
Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix
...
Fixed share with link checkbox missing as regular user
2013-10-21 11:46:01 -07:00
66a2f3b0b9
New OCS route:
...
/ocs/cloud/user
Response:
<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>100</statuscode>
<message/>
</meta>
<data>
<id>thomas</id>
<display-name>DeepDiver</display-name>
<email>no-response@domain.tld</email>
</data>
</ocs>
2013-10-21 20:14:18 +02:00
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
a1038c271c
Merge pull request #5424 from owncloud/sharing-directlink
...
Added direct link in public share page
2013-10-21 08:26:51 -07:00
85edbb08c1
fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used
2013-10-21 15:31:31 +02:00
dfe38d13e2
Merge pull request #5434 from owncloud/fix5209
...
dispayNamesInGroup(s) should always return uid as key in the result array, fixes #5209
2013-10-21 04:04:38 -07:00
f8717bc260
Fixed share with link checkbox missing as regular user
...
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.
Fixes #5440
2013-10-21 11:29:40 +02:00
f5a6d6b43e
Merge pull request #5200 from owncloud/ie8-warning-fix
...
Fix warning box in IE8
2013-10-20 23:55:18 -07:00
5ac4ec3a84
unbold the 'Direct link' label
2013-10-21 00:12:38 +03:00
8a643ac5bc
reduce width of direct link input field
2013-10-21 00:09:45 +03:00
c93328bddf
Merge pull request #5433 from owncloud/inputs-seem-disabled
...
input field background size to white, fix input fields seeming disabled,...
2013-10-20 12:42:45 -07:00
fbd0076be0
remove superfluous input hover color change
2013-10-20 22:38:14 +03:00
adbaaf85ea
Test that dispayNamesInGroup(s) always returns uid as key in the result array
2013-10-20 20:56:25 +02:00
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
fa66dfff80
input field background size to white, fix input fields seeming disabled, fix #5168
2013-10-20 21:22:41 +03:00
2747862b13
Merge pull request #5429 from owncloud/fix_cron_docu
...
harmonize this with the documentation. Once every minute is way to often.
2013-10-20 08:49:59 -07:00
44d15d497e
change the language
2013-10-20 15:22:50 +02:00
e4929a4d60
[tx-robot] updated from transifex
2013-10-20 07:49:42 -04:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
37b89b11b6
harmonize this with the documentation. Once every minute is way to often. Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html
2013-10-19 01:42:59 +02:00
e61d961efb
LDAP: Fix base-comparison with multibyte characters, fixes #5081 . Thanks to @sfyang
2013-10-19 00:51:37 +02:00
e6d13468d3
Merge pull request #5422 from owncloud/fix_logfile_permissions
...
the logfile shoudn't be world readable.
2013-10-18 09:10:24 -07:00
7abfe2bd4f
Added direct link in public share page
...
Fixes #1167
2013-10-18 17:40:41 +02:00
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
b201e87af6
Merge pull request #5338 from frisco82/fixGroupDisplay
...
Show (group) after groups in share dropdown
2013-10-18 05:46:05 -07:00
7297c6a5ef
Merge pull request #5403 from owncloud/fix-breadcrumbs
...
correctly position ... overflow in breadcrumbs, fix #5158
2013-10-18 05:28:48 -07:00
7a1d0b8497
Merge pull request #5321 from owncloud/settings-applistwidths
...
Fixed app list right container to not overlap left container scrollbar
2013-10-18 05:18:49 -07:00
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
33c4747fdf
Use display name from magic cookie, fixes #4884
2013-10-18 13:36:33 +02:00
c954b04973
Merge pull request #5412 from owncloud/fix_5141
...
give getSelectedFilesTrash() a unique name for the trash.js
2013-10-18 03:51:54 -07:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
1c611a3dfb
give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js
2013-10-18 10:57:10 +02:00
33cf4708d5
Merge pull request #5411 from owncloud/ocs_share_api_cleanup
...
filter duplicates directly in the sql query
2013-10-18 01:41:15 -07:00
0febccee49
readability: single line -> multiple lines
2013-10-18 10:39:02 +02:00
7f9ff51308
Fix accidental deletion of if
2013-10-18 10:34:31 +02:00
a2c80bbc68
Don't show links option in dropdown if disabled
2013-10-18 10:34:30 +02:00
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
0755aca501
Merge pull request #5405 from owncloud/sharing-chromehangswithversionenabled
...
Disable versions app JS in public mode
2013-10-18 01:27:30 -07:00
48cd9d9444
filter duplicates directly in the sql query
2013-10-18 10:23:34 +02:00
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
41c6c44221
Disable versions app JS in public mode
...
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
2013-10-17 21:04:18 +02:00
07b885e291
correctly position ... overflow in breadcrumbs, fix #5158
2013-10-17 21:22:55 +03:00
76be7cd1ac
Merge pull request #5382 from owncloud/sharing_api_include_reshares
...
add reshare option for the OCS Share API
2013-10-17 11:07:47 -07:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
Thomas Müller
Vincent Petry
Frank Karlitschek
Ramiro Aparicio
blizzz
Jan-Christoph Borchardt
Morris Jobke
Björn Schießle
Bjoern Schiessle
Michael Gapczynski