Commit Graph

942 Commits

Author SHA1 Message Date
Thomas Müller e3b951f412 Merge pull request #7724 from owncloud/mobile
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
VicDeo 86356db044 Merge pull request #7772 from owncloud/filter_more_jsconsole
Also replace console.time/timeEnd when not in DEBUG mode
2014-03-25 20:29:26 +02:00
Jan-Christoph Borchardt 89ee551158 mobile: adjust breakpoint in JS as well 2014-03-21 16:43:04 +01:00
Vincent Petry 6252c248c2 Merge pull request #7557 from owncloud/issue/7297
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
Joas Schilling 7ab2632085 Use tipsy to display error when selecting a date in the past 2014-03-19 12:11:14 +01:00
Vincent Petry 67b8cfedf9 Define _matchMedia wrapper earlier
The unit test stub didn't work because the _matchMedia wrapper
was defined too late.

This fix defines it earlier.
2014-03-18 16:02:13 +01:00
Vincent Petry cc6c152984 Fixed matchMedia usage to make unit tests work in PhantomJS
PhantomJS has a bug that makes it impossible to properly stub
window.matchMedia. This fix adds a wrapper as OC._matchMedia
that is used for unit tests
2014-03-18 15:52:06 +01:00
Vincent Petry fe04106e0f Add/remove main menu action when switching between desktop/mobile mode 2014-03-18 13:10:13 +01:00
Vincent Petry 872006da03 Only enable toggle for sidebar in mobile mode 2014-03-17 20:44:30 +01:00
Thomas Tanghus 413afab424 Replace console.time/timeEnd 2014-03-17 19:39:19 +01:00
jamesryanbell 4fc96ebb7b SVG support detection
The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
2014-03-17 16:11:49 +00:00
Jan-Christoph Borchardt ac48563efd add spans around replaced 'Shared' indicators to make text hide on mobile 2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt b37aae9925 mobile: menu togglable for mobile, use code by @PVince81 2014-03-14 10:33:19 +01:00
Thomas Tanghus 5e6f0dcc6d Fix copy/paste error 2014-03-10 16:26:07 +01:00
Thomas Tanghus 01bcdf5b53 Add function remove() to OC.localeStorage 2014-03-10 16:22:52 +01:00
Vincent Petry 536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Morris Jobke 256dca935b Revert "adding new javascript function OC.generateUrl(url, params)"
This reverts commit 8e667d1934.
2014-03-06 15:10:32 +01:00
Morris Jobke 5f0a22586f Merge pull request #7579 from owncloud/introduce-generateUrl-master
Introduce OC.generateUrl() in master
2014-03-06 15:07:28 +01:00
Vincent Petry e129f6845b Added testArea for JS Unit tests
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.

The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
  themselves
2014-03-06 12:50:18 +01:00
Thomas Müller b46517f012 adding js unit tests for OC.generateUrl() 2014-03-06 00:26:57 +01:00
Thomas Müller 8e667d1934 adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:17:48 +01:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Joas Schilling 80393d9c0f Do not allow setting an expiration date in the past
Fix #7297
2014-03-05 13:12:58 +01:00
Vincent Petry 6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling 4ee4f0c365 Fix position of eye icon on database password field
Fix #7304
2014-03-05 10:22:35 +01:00
Thomas Müller 33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Thomas Müller e1030c6b5f adding JSDoc + remove unused function 2014-03-02 23:15:37 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Thomas Müller 2f0db9af07 Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
2014-02-26 14:44:12 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
Joas Schilling cb14b1c58d Add owncloud version to JS scope
Fix #5361
2014-02-26 11:50:52 +01:00
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
icewind1991 ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars
Allow apps to add/modify config js output via hook.
2014-02-24 13:29:54 +01:00
Vincent Petry 80c61d480c Added oc_defaults stub in specHelper.js
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
2014-02-24 09:45:02 +01:00
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
2014-02-21 20:37:10 +01:00
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 2014-02-21 16:07:21 +01:00
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
fix thumbnail generation for subdirectories in the conflicts dialog
2014-02-21 15:33:13 +01:00
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport
fix viewport size on windows phone
2014-02-21 15:13:20 +01:00
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
	config/config.sample.php
2014-02-21 09:51:51 +01:00
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 2014-02-20 18:13:27 -05:00
Robin Appelman daf28225b7 fix viewport size on windows phone 2014-02-20 18:42:59 +01:00
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt 92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +01:00
Lukas Reschke 169f4cf7ff Fix typo 2014-02-20 12:51:15 +01:00
Thomas Müller 3ce77a35e5 fixing js syntax error 2014-02-20 10:42:54 +01:00
Lukas Reschke ba7a79372a Variable value is expected and not an echoed output 2014-02-20 10:28:11 +01:00
Lukas Reschke b61f0f11c5 Move oc_isadmin to the config JS script 2014-02-20 10:26:05 +01:00
Lukas Reschke 16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js
Fix issue #7166
2014-02-19 10:20:52 +01:00
Thomas Müller 92560c5b86 Merge pull request #7243 from owncloud/core-sessionlifetimedefault
Now using PHP session lifetime as default value for the JS config
2014-02-18 10:30:25 +01:00
Vincent Petry f9763e1fc5 Now using PHP session lifetime as default value for the JS config
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
2014-02-17 21:33:04 +01:00
Guillaume AMAT 01dee35ebe Adds OC_Defaults values in javascript config 2014-02-13 10:47:03 +01:00
Joas Schilling 145d9a09ab Do not select input for all text input fields
Fix issue #6920
2014-02-07 16:31:29 +01:00
Vincent Petry 3d88b10f20 Merge pull request #7067 from owncloud/core-sessionheartbeatconfig
Core sessionheartbeatconfig
2014-02-05 10:03:36 +01:00
Thomas Müller ced80c6f27 Merge pull request #6969 from owncloud/tests-morecoverage
Fixed unit test scripts + coverage
2014-02-04 12:21:13 -08:00
Thomas Müller 45ab9810c5 fixing typos 2014-02-04 20:58:06 +01:00
Vincent Petry e75f7e58e9 Added unit tests for session_keepalive / heartbeat 2014-02-04 13:56:41 +01:00
Vincent Petry 912da8d277 Added session_keepalive setting
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
2014-02-04 13:56:10 +01:00
Vincent Petry 63cca35baa Added core unit tests for basename and dirname
Note that it doesn't work 100% like the PHP functions so the tests
have TODO comments to fix those core functions eventually.
2014-01-30 13:22:16 +01:00
Vincent Petry f7ac9f8069 Fixed unit test scripts + coverage
Tried to add more apps (others break).
"preprocessors" is now populated automatically based on the tested apps.
2014-01-30 11:56:14 +01:00
Morris Jobke cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Vincent Petry 3bea9b8ddd Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
add expire date to link share if possible
2014-01-24 07:44:33 -08:00
Vincent Petry c6695bbd76 Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry 41b6d4b702 Added OC.buidQueryString() utility function
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
2014-01-24 12:44:31 +01:00
Bjoern Schiessle 77de47858b add expire date to link share if possible 2014-01-24 10:46:08 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Morris Jobke 903b330ccc Merge pull request #6721 from tsumi/patch-1
Added SVG fallback to apps settings popup
2014-01-18 08:34:45 -08:00
Vincent Petry 350214c609 Added Javascript unit tests
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
Morris Jobke 5c1a9f35f1 Indicate password strength using strengthify
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
tsumi f41255f652 Useless else removed
As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
2014-01-15 09:39:21 +01:00
tsumi 7c1649fc24 Added SVG fallback to apps settings popup
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
2014-01-10 21:19:30 +01:00
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 d4c0ac7790 introduce auto completion on share email - integrated with the contactsmanager api 2013-11-14 09:38:55 +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
Morris Jobke 58e6582056 Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
2013-09-15 03:07:11 -07:00
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
Bernhard Posselt a58e176852 Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
2013-09-14 16:00:36 -07:00
Thomas Müller a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
Thomas Tanghus dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 -07:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Vincent Petry 1304b511e9 Ajax calls for "files" and "files_trashbin" apps
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
kondou c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Thomas Tanghus b7205d97d7 Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
Thomas Tanghus 08225a60c8 Save two lines 2013-09-11 21:15:32 +02:00
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00
Thomas Tanghus 7a2b23a036 Fix double destroy on escape. 2013-09-11 17:13:39 +02:00
Pete McFarlane 15be3d85b6 no autoFocus if no users returned 2013-09-11 15:59:28 +01:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
Pete McFarlane 92b57c13c1 Added autoFocus to #shareWith autocomplete options 2013-09-11 11:45:32 +01:00
Thomas Tanghus fdfdd2e4e7 Remove console logging 2013-09-10 00:25:07 +02:00
Thomas Tanghus 51547c3316 Fix setting ocdialog options after initialization. 2013-09-10 00:21:42 +02:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +02:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +02:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +02:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00