upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 18:11:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
14540 commits 891 branches 1201 tags 6.6 GiB
Commit graph

676 commits

Author SHA1 Message Date
Frank Karlitschek
6915367622 Merge pull request #5446 from frisco82/fixNotifyUser 
Fix notify user checkbox
 2013-10-21 14:07:33 -07: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
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
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
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
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
Morris Jobke
0febccee49 readability: single line -> multiple lines 2013-10-18 10:39:02 +02:00
Michael Gapczynski
7f9ff51308 Fix accidental deletion of if 2013-10-18 10:34:31 +02:00
Michael Gapczynski
a2c80bbc68 Don't show links option in dropdown if disabled 2013-10-18 10:34:30 +02:00
Vincent Petry
8a5c761239 Added missing var in share.js 2013-10-17 14:39:20 +02:00
Vincent Petry
467f864db4 Fixed sharing status update for new/uploaded files 
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

Performance should improve as the sharing list is now only loaded once
per navigation session.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977
 2013-10-17 12:55:10 +02:00
Morris Jobke
a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix 
Fixed conflict dialog in IE8
 2013-10-16 12:52:41 -07:00
Raghu Nayyar
8c25b5a0c1 Merge pull request #5295 from owncloud/show-eye-in-personal 
Shows The Eye permanently in the Confirm Password field in Personal Settings
 2013-10-15 02:59:53 -07:00
raghunayyar
2def1a8853 Removes Bogus showpassword js. thx @PVince81 2013-10-15 14:41:18 +05:30
raghunayyar
4eed240296 Should Display PasswordToggle Eye Everywhere. 2013-10-15 11:36:44 +05:30
Ramiro Aparicio
8ac518bb3e Show (group) after groups in share dropdown 2013-10-14 20:17:45 +02:00
raghunayyar
e961dbaa38 Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167 2013-10-12 12:42:23 +02:00
Victor Dubiniuk
8ce3ae50f0 Improve expand/collapse logic 2013-10-11 16:35:59 +03:00
Thomas Tanghus
31714f8871 Merge pull request #5133 from owncloud/js_vcategories_to_tags 
Js vcategories to tags
 2013-10-11 04:17:59 -07:00
Vincent Petry
e2a4417079 Fixed conflict dialog in IE8 
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
 2013-10-10 15:54:00 +02:00
VicDeo
d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes 
File conflicts dialog fixes
 2013-10-07 08:19:40 -07:00
Vincent Petry
e97aaee1aa Prevent share dropdown to close too early with autocomplete 
When clicking on an autocomplete result in the sharing dropdown,
it will mistakenly be detected as being clicked outside and would
trigger the sharing dropdown closing.

This fix adds a check to detect clicks inside the autocomplete and
prevent closing the dropdown in that case.

This fixes #4142
 2013-10-07 13:26:46 +02:00
Vincent Petry
68fbd7b922 Fixed label for sharing notification to be clickable 
Fixed the sharing notification checkbox label in the file sharing
dropdown, which makes it possible to click on the label directly.
 2013-10-07 13:15:25 +02:00
Vincent Petry
27579f36f6 Prevent scroll up when click on links in sharing dropdown 
When clicking on a link that points to "#" in the sharing dropdown, and
the current view is scrolled down, the browser will scroll the page up
to the top (anchor behavior).

This fix cancels the click event when clicking on "unshare" link or
"show crud" link.
 2013-10-07 13:11:34 +02:00
Jörn Friedrich Dreyer
5a174eba83 use correct property for mimetype of existing files 2013-10-07 11:14:11 +02:00
Thomas Tanghus
0e0927a887 It's 'status', not 'result'! 2013-10-04 20:02:33 +02:00
Thomas Tanghus
f19a236c8e Remove obsolete files. 2013-10-04 17:24:28 +02:00
Thomas Tanghus
12bb197028 JS version of the OCP\ITags interface 2013-10-04 17:21:52 +02:00
ringmaster
85f63d4f77 Allow "Finishing..." button on setup page to be translated. 
Fixes #5130.
 2013-10-04 11:09:59 -04:00
Ramiro Aparicio
8b62b2684a Fix disabled status after sending the email 2013-10-04 13:10:51 +02:00
Bjoern Schiessle
51295e9a6b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
 2013-10-04 12:30:49 +02:00
kondou
b0ff10a536 Hide defaultavatar in #header and don't darken proper avatars in #header 2013-10-04 02:27:53 +02:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
kondou
4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Björn Schießle
6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload 
check only permission from link-share to decide if public upload is enabled or disabled
 2013-09-26 03:16:15 -07:00
kondou
5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +02:00
kondou
24eb41548e Make it possible to have a different color than the username for placeholder 2013-09-25 12:57:41 +02:00
Bjoern Schiessle
6d0987bdb4 some small js fixes 2013-09-24 18:32:57 +02:00
Bjoern Schiessle
fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Björn Schießle
9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password 
sharing, allow user to disable password protection
 2013-09-23 01:20:09 -07:00
Bjoern Schiessle
71e129f295 initialize variable 2013-09-20 15:47:33 +02:00
Bjoern Schiessle
12b4e79201 calculate correct permissions while toggle the password protection 2013-09-20 13:11:05 +02:00
Bart Visscher
f9549a4465 Merge pull request #4908 from owncloud/fix_css_selector 
css selectors never have a : before []
 2013-09-19 10:59:45 -07:00
Jörn Friedrich Dreyer
7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/filelist.js
 2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto 
initial scrollto implementation
 2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer
078bf0df25 use {count} instead of 'One' for more versatile translation 2013-09-19 12:05:30 +02:00
Jörn Friedrich Dreyer
a6933efce3 use n to translate title 2013-09-19 11:25:41 +02:00
Jörn Friedrich Dreyer
cda58ae3df css selectors never have a : before [] 2013-09-19 10:14:07 +02:00
Jörn Friedrich Dreyer
0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00