Commit Graph

14811 Commits

Author SHA1 Message Date
Thomas Müller 408e0022dd Merge pull request #5249 from owncloud/activities-api
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Vincent Petry d1c27e08e5 Fixed empty content logic
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
2013-10-21 22:18:10 +02:00
Vincent Petry 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
Thomas Müller 124984905e introduce OC_Helper::linkToDocs() 2013-10-21 22:01:27 +02:00
Victor Dubiniuk 97aff7c64e Use quoteIdentifier with proper objects 2013-10-21 22:31:57 +03:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Vincent Petry 635a46b373 Merge pull request #5444 from frisco82/fixDisplayGroup
Fix display name for user after sharing
2013-10-21 12:05:14 -07:00
Frank Karlitschek 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
Vincent Petry 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
Thomas Müller 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
kondou 732e7db319 Fix mind-boggling emptycontent logic 2013-10-21 19:49:27 +02:00
Jenkins for ownCloud a376407da3 [tx-robot] updated from transifex 2013-10-21 13:03:32 -04:00
Thomas Müller 581cd9bb9c Support existing sessions within OCS API calls 2013-10-21 18:58:46 +02:00
kondou 7864a3bf07 Fix shared folder still showing fileheader 2013-10-21 17:59:51 +02:00
Vincent Petry a1038c271c Merge pull request #5424 from owncloud/sharing-directlink
Added direct link in public share page
2013-10-21 08:26:51 -07:00
Ramiro Aparicio b27595888a fix notify user, and made js more resiliant to changes 2013-10-21 16:14:23 +02:00
Ramiro Aparicio 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
blizzz 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
raghunayyar 744ddc2664 Takes Import button to next line. 2013-10-21 15:19:02 +05:30
Vincent Petry 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
Frank Karlitschek f5a6d6b43e Merge pull request #5200 from owncloud/ie8-warning-fix
Fix warning box in IE8
2013-10-20 23:55:18 -07:00
Andreas Fischer 5978ddbec6 Try to create custom log file before falling back to default. 2013-10-20 23:58:07 +02:00
Jan-Christoph Borchardt 5ac4ec3a84 unbold the 'Direct link' label 2013-10-21 00:12:38 +03:00
Jan-Christoph Borchardt 8a643ac5bc reduce width of direct link input field 2013-10-21 00:09:45 +03:00
kondou 40cc57ab3e Improve updateEmptyContent logic 2013-10-20 22:55:49 +02:00
kondou 60b25a2e97 Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion 2013-10-20 22:47:44 +02:00
Jan-Christoph Borchardt cbb42aae11 improve wording of permission notice 2013-10-20 23:46:01 +03:00
Jan-Christoph Borchardt dbcfb1b830 beautify 'you dont have write permissions' notice, fix #2770 2013-10-20 23:15:58 +03:00
Jan-Christoph Borchardt 84d4d797d1 shorten string to 'notify by email', cut 'user' 2013-10-20 23:04:24 +03:00
Jan-Christoph Borchardt fc7269e728 remove hover hide/show stuff for share dropdown to make things more obvious 2013-10-20 23:03:48 +03:00
Jan-Christoph Borchardt 1e8af6c5ef bold share username 2013-10-20 22:52:18 +03:00
Jan-Christoph Borchardt 846ce67d01 properly align checkboxes to text 2013-10-20 22:51:04 +03:00
Jan-Christoph Borchardt 5b75673e77 more breathing space in share list 2013-10-20 22:48:25 +03:00
Jan-Christoph Borchardt 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
Jan-Christoph Borchardt fbd0076be0 remove superfluous input hover color change 2013-10-20 22:38:14 +03:00
Arthur Schiwon adbaaf85ea Test that dispayNamesInGroup(s) always returns uid as key in the result array 2013-10-20 20:56:25 +02:00
Arthur Schiwon 701009bd72 dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209 2013-10-20 20:55:27 +02:00
Jan-Christoph Borchardt fa66dfff80 input field background size to white, fix input fields seeming disabled, fix #5168 2013-10-20 21:22:41 +03:00
Frank Karlitschek 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
Frank Karlitschek 44d15d497e change the language 2013-10-20 15:22:50 +02:00
Jenkins for ownCloud e4929a4d60 [tx-robot] updated from transifex 2013-10-20 07:49:42 -04:00
Jenkins for ownCloud 6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Frank Karlitschek 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
Arthur Schiwon e61d961efb LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @sfyang 2013-10-19 00:51:37 +02:00
raghunayyar 45cecc9c08 Adds margin to the SSL root certificate button 2013-10-19 03:09:45 +05:30
Frank Karlitschek 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
Vincent Petry 7abfe2bd4f Added direct link in public share page
Fixes #1167
2013-10-18 17:40:41 +02:00
Frank Karlitschek 9e99f9d13d the logfile shoudn't be world readable. 2013-10-18 17:15:02 +02:00
Morris Jobke b201e87af6 Merge pull request #5338 from frisco82/fixGroupDisplay
Show (group) after groups in share dropdown
2013-10-18 05:46:05 -07:00
Jan-Christoph Borchardt 7297c6a5ef Merge pull request #5403 from owncloud/fix-breadcrumbs
correctly position ... overflow in breadcrumbs, fix #5158
2013-10-18 05:28:48 -07:00