wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16486 commits 157 branches 562 tags 714 MiB
Commit graph

763 commits

Author SHA1 Message Date
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
Morris Jobke
ce3df44699 Merge pull request #6031 from s0taka/master 
No decimal points for Kilobyte and Byte #5371.
 2014-01-05 11:52:10 -08:00
Simon Könnecke
8fdc4585f7 spaces to tabs 2013-12-18 15:43:45 +01:00
Thomas Müller
f57c38df77 Merge pull request #6431 from owncloud/core-pluraltranslationsfix 
Added plural translation fallback
 2013-12-18 03:11:18 -08:00
Frank Karlitschek
753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb 
always show 'Deleted Files' breadcrumb
 2013-12-17 00:25:06 -08:00
Bjoern Schiessle
3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Vincent Petry
d8d11e3976 Fixed JS plural function to be per app 
Some apps might not define the same "nplural" value.
To avoid conflicts, the plural function is now generated per app.

Fixes #6427
 2013-12-16 16:00:23 +01:00
Vincent Petry
df1a404466 Fix webroot for update page 
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.

This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
 2013-12-13 12:56:48 +01:00
Morris Jobke
4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
unknown
853373348c Slide duration set to 200ms for multiselect (same duration as user menu) 2013-12-05 15:46:13 -05:00
Morris Jobke
ec0aa6bb65 Revert "Merge pull request #6210 from owncloud/fix-5865" 
This reverts commit f12363d90b, reversing
changes made to eba35d28cd.
 2013-12-05 21:03:17 +01:00
unknown
fd3aae6691 Changed duration of slideDown, slideUp and fadeOut to 200ms 2013-12-05 13:15:52 -05:00
ganomi
33e77d34f4 Show stars as placeholder 2013-11-26 20:17:13 +01:00
Morris Jobke
81f6be92ef Translate reload message after update 
fixes #6064
 2013-11-26 16:22:01 +01:00
Simon Könnecke
243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +01:00
Bjoern Schiessle
7f3d717037 Check which permissions are possible to re-share a file 2013-11-18 11:58:42 +01:00
Vincent Petry
55355ba28e Fixed multiselect to not set the button's height on itself after select 
Fixes #5841
 2013-11-14 14:18:22 +01:00
Thomas Müller
3488202f67 Merge pull request #5582 from owncloud/files-previewcaching 
Append file etag to preview URLs
 2013-11-05 01:21:51 -08:00
Vincent Petry
28fbc1b3cc Fixed input field and tipsy positioning in singleselect 
If the user scrolls or the window is resized, the formerly cached offset
was wrong. This fix makes sure the offset is re-read before showing the
input field.
 2013-10-31 10:50:18 +01:00
Vincent Petry
9d230bcc75 Improve quota input field 
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
 2013-10-30 20:46:53 +01:00
Bjoern Schiessle
4c7082bf1d allow to share a file/folder as public link also if one of it parents was already shared as link 2013-10-30 17:03:53 +01:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Morris Jobke
b56c936212 also add new parameter to function calls 2013-10-29 14:22:24 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Arthur Schiwon
3248b0e2be Fix broken users page when a username consists of digits only, fixes #5560 2013-10-25 22:00:32 +02:00
Thomas Müller
535bc7b664 Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename 
prevent user from creating or renaming sth. to an existing filename
 2013-10-23 13:45:27 -07:00
Thomas Müller
291cdbdd98 Merge pull request #5497 from owncloud/ie8-placeholdershim 
Ie8 placeholdershim
 2013-10-23 13:18:37 -07:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Vincent Petry
086b82bd69 Fixed sharing dropdown placeholders in IE8/9 
Added jquery.placeholder shim to handle input field placeholders in IE8/9
 2013-10-23 18:51:25 +02:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Vincent Petry
88c2646f7e Fixed share dropdown checkbox wrapping 
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.

Added ellipsis to prevent long names to exceed the dropdown's width.
 2013-10-23 17:58:27 +02:00
Jan-Christoph Borchardt
a2e9c0f81a better wording for share input field and share link 2013-10-23 17:57:06 +03:00
Vincent Petry
9aa164f381 Renamed current placeholder jquery plugin to imageplaceholder 
This is to prevent conflicts with jquery libs that handle text
placeholders in IE8
 2013-10-23 16:47:25 +02:00
Jörn Friedrich Dreyer
c478a792fb add missing ; 2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
45e6d96702 prevent user from creating or renaming sth. to an existing filename 
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
 2013-10-22 18:11:03 +02:00
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
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
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
Jörn Friedrich Dreyer
f7800cd63e fix 'event is not defined' error 2013-09-19 09:47:51 +02:00
Jörn Friedrich Dreyer
72d53008cc indentation 2013-09-18 17:58:15 +02:00
Jörn Friedrich Dreyer
7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer
64cc13a8d3 allow passing classes to buttons 2013-09-18 17:13:07 +02:00
Jörn Friedrich Dreyer
342a420eba disable avatar loading on public guest page 2013-09-17 19:25:03 +02:00
Jörn Friedrich Dreyer
e43e961dcb we cannot load avatar on guest page 2013-09-17 19:20:16 +02:00
Jörn Friedrich Dreyer
3f7f6434d1 Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-17 19:11:47 +02:00
Jörn Friedrich Dreyer
b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Bjoern Schiessle
642b064c5b we can leave the loop if the permission of the link share was checked 2013-09-17 18:18:23 +02:00
Bjoern Schiessle
d6771502f2 check only permission from link-share to decide if public upload is enabled or disabled 2013-09-17 18:11:43 +02:00
Jörn Friedrich Dreyer
afe4f6a794 add exists method to jquery 2013-09-16 13:47:37 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00