Commit Graph

1602 Commits

Author SHA1 Message Date
Joas Schilling d273b55e98 Correctly set expiration dates when adding additional shares 2014-05-19 01:40:32 +02:00
Morris Jobke db9cfaa56d Merge pull request #8592 from owncloud/login-timezone
Disable login button until the timezone is set
2014-05-19 01:14:03 +02:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry 9d38e3602b Namespacing for FileList, FileActions and trashbin app
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
  reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
  "files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
  the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
Vincent Petry fb10bf4048 Files app navigation can now switch
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
  due to overrides
- added app.js as entry point for JS code (ideally all other files should
  only contain classes and not trigger anything)
2014-05-15 17:51:04 +02:00
Thomas Müller 48ee72732e Merge pull request #8567 from owncloud/test-ocshareunittests
Added ground work for OC.Share unit tests
2014-05-14 23:35:58 +02:00
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Vincent Petry 1de068b5cb Disable login button until the timezone is set
On slow computers it might happen that the user manages to login before
the timezone code has a chance to run, which then causes dates to appear
wrong in the UI.

This fix makes sure the login cannot happen until the timezone field is
set.

Note that it's not possible to run the timezone code outside of
document.ready() because at that time the DOM element doesn't exist yet.
2014-05-14 17:00:15 +02:00
icewind1991 4c19acf09b Merge pull request #8403 from owncloud/fix-oc-dialog
fix oc dialog because the body isn't 100% x 100% in dimensions anymore
2014-05-14 13:34:55 +02:00
Thomas Müller 7babd44dd0 Merge pull request #8524 from owncloud/prompt-dialog
Add prompt dialog to OC.dialogs
2014-05-13 17:32:06 +02:00
Bjoern Schiessle 737be1a10f move expire message to the bottom 2014-05-13 15:27:56 +02:00
Robin Appelman c85e6d919e Use jquery to get the window width 2014-05-13 13:00:46 +02:00
Bjoern Schiessle b985021082 hide default expire message if user sets expire date 2014-05-13 11:56:04 +02:00
Robin Appelman 46d6cb739d Don't set the dialog content height to a zero or negative value 2014-05-13 11:37:29 +02:00
Bjoern Schiessle d56d03e230 add information about default expire date to the share dialog 2014-05-13 11:28:25 +02:00
Vincent Petry 627eba5348 Added ground work for OC.Share unit tests 2014-05-13 11:15:06 +02:00
Thomas Müller 1c731aacaf fix style 2014-05-12 11:30:47 +02:00
Lukas Reschke 62364269c5 Fix Typo, define $ as global 2014-05-11 10:55:00 +02:00
Thomas Müller 78c0cc6089 escape display name and email 2014-05-09 23:12:26 +02:00
Robin Appelman 163a7a47f9 Add prompt dialog to OC.dialogs 2014-05-09 17:09:06 +02:00
Morris Jobke 14e568b13c fix oc dialog because the body isn't 100% x 100% in dimensions anymore 2014-04-29 15:34:48 +02:00
Vincent Petry 9c2fbea6a4 Fix file selection for infinite scrolling
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
2014-04-28 14:55:00 +02:00
Vincent Petry 9f62059efa Fix file summary to use the whole file list
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
2014-04-28 14:49:39 +02:00
Thomas Müller 032f38b230 Merge pull request #8213 from cbojar/master
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
2014-04-23 11:05:00 +02:00
Volkan Gezer ce835a3247 add uncompressed jquery files - fixes #8294 2014-04-23 00:07:00 +02:00
Lukas Reschke 381c1c8b6e Fix typo
to => too
2014-04-22 10:43:35 +02:00
Thomas Müller 29bc82be8d fixing typos 2014-04-22 09:54:25 +02:00
Thomas Müller 56bc5f8f43 fixing typo 2014-04-22 09:43:29 +02:00
Lukas Reschke 51eee3dec1 Fix JSDoc 2014-04-21 14:42:50 +02:00
Lukas Reschke 8fcffae1e2 Reuse selector 2014-04-21 14:28:54 +02:00
Lukas Reschke 539cecbd63 Use proper JSDoc documentation 2014-04-21 13:46:33 +02:00
cbojar 4a541e38e0 Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
Also used JSHint.com to find a few other issues.

-Strict comparisons (===)
-Fixed regex escaping errors
-Refactored OC.buildQueryString to use jQuery.map
-Missing semicolons
-Braces around if block

Left some of the mixed spaces/tabs as they are for alignment in comments.
2014-04-16 22:51:09 -04:00
Stefan 1d8eb44677 Fix javascript error in calendar app
Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.

License: WTFPL
2014-04-16 22:41:57 +02:00
Jan-Christoph Borchardt e68006c0ce Merge pull request #8157 from owncloud/share-expiration-smooth-hide
Expiration date is hidden smoothly
2014-04-16 17:10:14 +02:00
Thomas Müller 1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +02:00
Julian Müller 463df08088 Revert "close-button for share_dropdown"
This reverts commit 3bc3d4c9f3.
2014-04-14 18:40:24 +02:00
Julian Müller 3bc3d4c9f3 close-button for share_dropdown 2014-04-14 18:26:45 +02:00
Lukas Reschke 6e424eb990 Also encode > and ' 2014-04-13 15:24:35 +02:00
Thomas Müller dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master
introduce auto completion on share email - integrated with the contactsm...
2014-04-11 00:04:58 +02:00
Volkan Gezer 9e9c109390 Expiration date is hidden smoothly
From now on, it is hidden smoothly as the other fields do.
2014-04-10 21:54:25 +02:00
Vincent Petry f84d66a24f Moved SVGSupport call to use OC.Util.SVGSupport() 2014-04-09 15:23:09 +02:00
Morris Jobke d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Thomas Müller c86bda0325 Merge pull request #8065 from owncloud/avatar-highdpi
use high resolution avatars on highdpi screens
2014-04-07 20:36:15 +02:00
Thomas Müller 1e559f7239 Merge pull request #8088 from owncloud/fix-personal.js
reduce code duplication, fix parse error, prevent page reload on hitting...
2014-04-07 16:59:32 +02:00
Thomas Müller b2f8490be2 adding underscore.js 2014-04-07 14:05:58 +02:00
Thomas Müller 647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Jörn Friedrich Dreyer 779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +02:00
Jörn Friedrich Dreyer c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
Robin Appelman 3c35e82a37 use high resolution avatars on highdpi screens 2014-04-04 23:35:32 +02:00
Robin Appelman 01d93f81f6 Show higher resolution previews for high dpi screens 2014-04-04 17:10:46 +02:00
Vincent Petry d4f9cc567a Fix SVG close button of file picker 2014-04-04 11:52:15 +02:00
Vincent Petry 05a7bfed71 Fix file picker to correctly show SVG file icons 2014-04-04 11:44:11 +02:00
Vincent Petry a4eafca77f Moved code to replace svg with png to OC.Util
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
Vincent Petry 2b8bb01211 Fixed mime type attribute access in file overwrite dialog 2014-04-03 16:55:01 +02:00
Vincent Petry 0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
Vincent Petry 268206cec5 Fixed parseQueryString to handle empty values and plus signs
- now correctly parse query strings with '+' signs
- empty values are now parsed either as null or empty string
- added unit test for parseQueryString()
2014-04-01 23:02:34 +02:00
Vincent Petry be0660f84f Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
2014-04-01 12:57:16 +02:00
Rodrigo Hjort 51b727cfca Correction: failure on sharing when user ID was prefixed by zero 2014-03-28 15:08:59 -03:00
Morris Jobke 841069e8cb Merge pull request #7770 from jamesryanbell/master
SVG support detection
2014-03-28 15:14:12 +01:00
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
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +02:00
kondou c6ca9c1e9d Use shorter array-conversion 2013-09-06 13:33:17 +02:00
kondou 3774632ecc Clean up avatars and preliminary use JSON->rawlist.php 2013-09-05 23:12:52 +02:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update

Conflicts:
	lib/util.php
2013-09-05 13:39:45 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
kondou 6db96603a0 Have login-checks and CSRF checks 2013-09-05 00:04:31 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
kondou 820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
Morris Jobke 6435e18e95 Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
2013-09-03 22:35:58 -07:00
kondou 6d42f51d0c Fix unwanted caching in IE8 2013-09-03 18:34:40 +02:00
kondou ce263df4c7 Don't use HTML5 <header> to support avatars in IE8 2013-09-03 16:52:15 +02:00
Christopher c2eaf7589d Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
use on to add event listener instead of deprecated jquery bind
2013-09-03 06:27:08 -07:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
2013-09-03 05:38:59 -07:00
Bjoern Schiessle fd7469db9e coding-style fixes 2013-09-03 13:37:06 +02:00
Jörn Friedrich Dreyer b0c6f990e4 use on to add event listener instead of deprecated jquery bind 2013-09-03 13:12:19 +02:00
Morris Jobke 2da6f6b4ce Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
2013-09-03 02:18:39 -07:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
Jan-Christoph Borchardt 9eeb27c91a placeholder.js: fix typo 2013-09-02 18:29:16 +02:00
Jan-Christoph Borchardt 57a1219ca0 placeholder.js: adjust saturation and lightness values 2013-09-02 18:20:18 +02:00
Morris Jobke e7a14ea32d RGB -> HSL 2013-09-02 16:41:18 +02:00
kondou f44cd944e0 Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback() 2013-09-01 16:04:39 +02:00
kondou 8de9e3d85e Add a description for $.avatar() and remove TODOs @raghunayyar fixed 2013-08-31 23:41:49 +02:00
kondou 385de45ed9 Deal with OC.Router.generate() 2013-08-31 19:05:53 +02:00
kondou aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 2013-08-31 18:27:28 +02:00
Bjoern Schiessle 65ddefc89d set sendMail status back to false 2013-08-30 16:29:22 +02:00
Bjoern Schiessle 10cf1b3a4e return mailSend status in getItems() 2013-08-30 15:39:43 +02:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
kondou ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
kondou 0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Morris Jobke f0ea23891a Merge pull request #4618 from owncloud/visualize-js
visualize
2013-08-28 14:17:50 -07:00
Thomas Müller 6502a148ec fixing typo 2013-08-28 23:04:55 +02:00
Morris Jobke 067815099f calculate fontsize and line-height 2013-08-28 21:54:20 +02:00
Morris Jobke 584857de69 Merge pull request #4627 from owncloud/trashbin-tipsy
change orientation for delete tooltip to left, fix #4589
2013-08-28 09:09:40 -07:00
Jan-Christoph Borchardt e7b40983e4 change orientation for delete tooltip to left, fix #4589 2013-08-28 17:58:23 +02:00
Morris Jobke ed2fa06a26 reviewers comments 2013-08-28 16:52:12 +02:00
Morris Jobke 4a00b26029 add visualize 2013-08-28 16:29:27 +02:00
Jan-Christoph Borchardt c6eda25d50 remove show password toggle from log in page, ref #4577 #4580 2013-08-28 13:58:49 +02:00
Thomas Tanghus 9843c8e838 Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
Thomas Tanghus 776d64f804 Cache Object.keys(this.vars) 2013-08-28 12:50:05 +02:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Christopher 90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Owen Winkler 1793ec1d5d Fixed inconsistent spacing. 2013-08-18 05:17:28 -04:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Thomas Müller 15c9a0f405 fixing undefined js error 2013-08-17 19:24:06 +02:00
kondou 2ee8425295 Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +02:00
Jörn Friedrich Dreyer 5b8d30c6b6 refactor OC.Breadcrumbs, allow injection of container to allow rendering crumbs into full screen editor 2013-08-16 17:20:49 +02:00
Jörn Friedrich Dreyer f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jan-Christoph Borchardt d2767faf61 Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Morris Jobke 5fb7aab7a0 remove jPlayer css rules from core css file 2013-08-15 16:08:49 +02:00
Thomas Tanghus ca495758bd Fix octemplate string escaping. 2013-08-14 23:06:43 +02:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals
Use plural translations
2013-08-14 10:23:19 -07:00
Jörn Friedrich Dreyer 9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Jörn Friedrich Dreyer e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
Jörn Friedrich Dreyer 11a404b90b comment clarification 2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer ca95a475d5 use edit & reshare permission as default 2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer 5660f99592 add PERMISSIONS_ALL summary 2013-08-13 22:58:27 +02:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Owen Winkler a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations
Plural translations
2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer ff67f115d4 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-08 13:50:04 +02:00
Thomas Müller d97e3c3571 adding proper evaluation of plural form - uses LGPL licensed code of jsgettext 2013-08-03 23:31:49 +02:00
Jörn Friedrich Dreyer f8bb4e10ae use fixed OC.Breadcrumb.push() 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer b12c1cb325 add OC.Breadcrumb.show(dir, filename, link) 2013-08-02 11:46:44 +02:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
Robin Appelman 44594fb41c make sure the first breadcrumb item is inserted before any other elements in the topbar 2013-08-01 16:46:01 +02:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jörn Friedrich Dreyer 284fb86258 show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids 2013-07-24 19:56:57 +02:00
Thomas Müller 2a42021815 Merge branch 'master' into delete-fix
Conflicts:
	core/css/styles.css
2013-07-23 16:24:34 +02:00
Victor Dubiniuk ab997bdc68 Create an array entry before filling it 2013-07-23 14:57:58 +03:00
Victor Dubiniuk 5160ea6063 Show generic error when there is no error 2013-07-22 21:02:18 +03:00
Thomas Müller 934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Jan-Christoph Borchardt 48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Jan-Christoph Borchardt 8a25d1ad06 remove unnecessary tipsy for Files delete 2013-07-18 18:41:01 +02:00
Jakob Sack bb0c5bff5f Add multiple plural forms to the php part 2013-07-16 22:16:53 +02:00
Thomas Müller fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Thomas Müller d18bd17eb7 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
Jörn Friedrich Dreyer 5513e30752 Merge pull request #3920 from owncloud/Fixing_search_ie8
[ie8] Fix lazy CSS loading and missing borders in search dropdown
2013-07-09 05:29:18 -07:00
Jakob Sack 4e214883d6 Partly integrate plural translations into js 2013-07-07 20:26:09 +02:00
Thomas Müller 18b11f76b1 fixing === and ident 2013-07-05 15:27:14 +02:00
Thomas Müller 59b700a550 Merge branch 'master' into fixing-3934-master
Conflicts:
	core/js/share.js
2013-07-05 13:52:33 +02:00
Thomas Müller 27c0cc7fda no anonymous upload on read-only folders 2013-07-05 11:23:08 +02:00
Thomas Müller 13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
Victor Dubiniuk 16e5a1b100 Fix lazy styles loading in IE8 2013-07-02 18:44:10 +03:00
Morris Jobke b19033b353 Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
Lukas Reschke 0217315a24 Escape dropdown
Fixes #3241
2013-06-29 13:24:05 +02:00
Jörn Friedrich Dreyer 7d3490036c Merge pull request #3838 from rgeber/master
Public Upload Feature
2013-06-28 07:30:41 -07:00
Thomas Tanghus be22d28eb9 Merge pull request #3576 from owncloud/jquery.multiselect-1.13
Update to jquery.multiselect 1.13
2013-06-27 07:50:47 -07:00
Thomas Mueller e6c1db7a3f move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853 2013-06-26 11:23:21 +02:00
Roman Geber ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Morris Jobke e0547a25ab if rename of file fails, the rename is undone in the view - #fix 2820
Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
Jan-Christoph Borchardt 0bcb04398d multiselect: fixed 'add group' interface a bit 2013-06-11 18:21:13 +02:00
Thomas Tanghus 46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +02:00
Thomas Tanghus 5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +02:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Thomas Tanghus 3fe46706af Update to jquery.multiselect 1.13 2013-06-02 19:53:18 +02:00
Thomas Tanghus bfcf113ce7 Forgot typeof condition 2013-06-01 16:47:34 +02:00
Thomas Tanghus 64c9fdcc28 Speed up octemplate rendering. 2013-06-01 16:38:35 +02:00
kondou 3001db6b50 Update jquery to 1.10.0 & add jquery-migrate 1.2.1 2013-05-27 20:13:13 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +02:00
Jörn Friedrich Dreyer 800c39fef1 cleanup after people who don't test in ie 2013-05-17 12:47:32 +02:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +02:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +02:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +02:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +02:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jörn Friedrich Dreyer 591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Lukas Reschke 337e3ed61f Typo 2013-05-12 10:51:21 +02:00
Lukas Reschke 63d51980e1 Get config from template 2013-05-12 10:51:21 +02:00
Thomas Tanghus 048569754a Add compatibility function for outerHTML 2013-04-29 22:35:37 +02:00
Bart Visscher 26e2672a5a Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
kondou e8bb998ecc Fix #3095. 2013-04-24 11:13:12 +02:00
Morris Jobke 938b12236a modify password clone to password type right on submit to prevent the browser remind the content 2013-04-19 10:06:18 +02:00
Thomas Tanghus 3f7643ef46 Merge pull request #2769 from owncloud/octemplate
Add octemplate jQuery plugin
2013-04-15 13:42:35 -07:00
Thomas Tanghus 155582ab70 Updated docs. 2013-04-15 22:10:29 +02:00
raghunayyar 59be6a910c Implements Toggle for Database Password. 2013-04-13 09:45:30 +05:30
Bernhard Posselt 18c873d1e5 Merge pull request #2554 from owncloud/hide-toggle-checkbox
Implements Hide / Display for the Password Toggle Button
2013-04-11 01:18:40 -07:00
Bart Visscher 51e07a90b7 Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
kondou 5f89812a9b Fix #2730
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
kondou e44cc8ea57 Fix OC.dialogs.form()
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
kondou 9c53f35d9a Remove manual mimetype checking. 2013-04-08 23:00:02 +02:00
Morris Jobke 38941a61bf turn off autocompletion for password field
refs #2632
2013-04-07 21:51:10 +02:00
Thomas Tanghus 870b73ce5a Add octemplate jQuery plugin 2013-04-06 23:24:43 +02:00
Thomas Tanghus 75af38c1bd Move compatibility functions to compatibility.js and add two more. 2013-04-06 22:37:15 +02:00
kondou 275badaf76 Make files _and_ directorys selectable/browsable.
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
kondou d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +02:00
kondou 3e185911f1 Fix repeating directory names.
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
kondou fba6681f71 Make directories show at top. 2013-04-06 14:42:56 +02:00
kondou 6231e5be39 Make directories clickable.
A bit bugged though ...
2013-04-06 14:17:47 +02:00
kondou 1919acd68f Small fixes
* escapeHTML(everything)
 * curly braces for if
 * camelcase function_to_call
 * add missing semicolae (?)
2013-04-06 12:16:55 +02:00
kondou 0be80abe70 Refactor OCdialogs.
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +02:00
root 74b02db337 Fixed things in alert-messages
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Bernhard Posselt 86ac30c596 Merge pull request #2516 from kabum/master
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Arthur Schiwon c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
Arthur Schiwon 3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
raghunayyar 8d7aa42b9a Removes the setTimeout() method. 2013-03-26 23:32:26 +05:30
raghunayyar 25a8690318 Fixes autofill for display / hide toggle button, a better function name. 2013-03-25 16:09:35 +05:30
raghunayyar d9cd9875e0 Initial Commit : Password Toggle Button hides if no input present 2013-03-25 04:30:09 +05:30
Morris Jobke 79d99b9c96 use simple markup to highlight groups in share autocomplete 2013-03-22 10:00:43 +01:00
Morris Jobke 8871629db5 replace hardcoded css style with css class - ref owncloud/core#173 2013-03-21 23:19:59 +01:00
Morris Jobke a1a6ef9409 share autocomplete - improve group appearance
highlight groups with markup (bold font) instead of "(group)" postfix

ref owncloud/core#173
2013-03-21 22:45:36 +01:00
Doug Neiner b8c1a4da3e Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms 2013-03-17 22:21:34 -05:00
Bernhard Posselt 9ad03b61a3 Update share.js
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski 6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Georg Ehrke a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Thomas Tanghus e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +01:00
Lukas Reschke 577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Michael Gapczynski 0488968443 Merge pull request #2034 from owncloud/fix_bug47
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Georg Ehrke 620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke 22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Georg Ehrke ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Bart Visscher 294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Thomas Müller 58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt f36d92bbc1 Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
Bernhard Posselt a65b16f3e7 generate url only once 2013-02-26 20:45:25 +01:00
Bernhard Posselt 81bb4363a2 use 15 min instead of 15 sec timeout 2013-02-26 20:25:07 +01:00
Bernhard Posselt 4e55348054 implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout 2013-02-26 19:34:46 +01:00
Michael Gapczynski 5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Thomas Müller 6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Thomas Müller 7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465
Fix 1465
2013-02-25 04:34:13 -08:00
Thomas Mueller 9898ba4daf Merge branch 'master' into master-sqlserver
Conflicts:
	core/templates/installation.php
2013-02-22 22:59:09 +01:00
Bart Visscher 1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Jörn Friedrich Dreyer 0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
raghunayyar 6ecc3d7ee1 Reduced email input width by 10% to increase space. 2013-02-20 23:08:21 +05:30
raghunayyar d8e8dab006 Fixes the Email Button and the email input Width. 2013-02-20 21:37:23 +05:30
Thomas Tanghus 5a8e0f2048 Extra position check for multiselect dropdown. Fix app/issues/575 2013-02-16 19:56:56 +01:00
Thomas Mueller 4b80466880 Merge branch 'master' into master-sqlserver
Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
2013-02-14 22:54:48 +01:00
Bernhard Posselt db30f94fc8 Merge pull request #1697 from owncloud/navigation-details
Navigation details
2013-02-14 08:39:17 -08:00
Jan-Christoph Borchardt 3f09cc139f double speed for user menu slide 2013-02-14 17:13:50 +01:00
Thomas Mueller e643742eb3 adding prototype trim as fallback for IE8 2013-02-14 12:59:26 +01:00
Thomas Mueller 8065c73339 fixing eventsource.js for IE8 2013-02-14 12:20:22 +01:00
Thomas Mueller 8877087b57 adding a compatibility.js as a single source to define all fallback function declarations 2013-02-14 12:20:04 +01:00
Thomas Mueller 76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01:00
Björn Schießle 45ed0c6010 if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's 2013-02-11 15:37:01 +01:00
Administrator 41ec976fd7 Bugfixes and cleanup MS SQL Server installation 2013-02-10 13:07:59 +01:00
Frank Karlitschek 316807e0d3 Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
Robin Appelman e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt 1ba44a3325 Merge pull request #1538 from raghunayyar/admin-password-toggle
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Thomas Müller 800609aaeb Merge pull request #1545 from owncloud/fix-oc_webroot
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
Bart Visscher d5f98a82aa fix-oc_webroot 2013-02-08 18:44:52 +01:00
raghunayyar b356b7065f Password Toggle Works on Installation as well. 2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer 43ffb5945c attach handlers to document instead of filelist, minor whitespace cleanups 2013-02-08 11:05:56 +01:00
Tobias Ramforth d577f790c8 Added MS SQL Server support 2013-02-08 00:00:51 +01:00
Bart Visscher a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +01:00
Bart Visscher 458ba4b55c Fix disabling setup form on submit 2013-02-07 08:12:09 +01:00
Bart Visscher c0b370f6cf Define the variables that are expected to exist but won't be set in setup 2013-02-07 08:11:18 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
raghunayyar 3bcf3c91e1 Password Toggle Support for Login 2013-02-03 11:56:00 +01:00
Robin Appelman 5dd2c9152e fix breadcrumbs for gallery and texteditor 2013-02-01 00:14:39 +01:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Björn Schießle 9cd692a6d0 use the same tooltip as for the password field 2013-01-31 17:00:05 +01:00
Jörn Friedrich Dreyer d7823adb07 attach to filelist which is present on .ready() 2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Michael Gapczynski ed2ee8c411 Change file action text for files inside shared folders as well 2013-01-28 23:16:29 -05:00
Michael Gapczynski ede7fccb00 Change file action text to 'Shared' 2013-01-28 23:13:38 -05:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski 0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski 31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00
Lukas Reschke 7f0a3018b6 Fix undefined variable 2013-01-26 13:46:00 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Lukas Reschke dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Björn Schießle a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Thomas Tanghus 936e991394 Add js linkToRemote and linkToRemoteBase 2013-01-25 16:00:26 +01:00
Lukas Reschke ff4d62132a This breaks the installation
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.

JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
Thomas Mueller b4c3dd84b4 update to jquery-ui 1.10.0 2013-01-23 11:37:52 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Michael Gapczynski 9eecb91338 Merge pull request #1113 from owncloud/fix-issue-1085
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Lukas Reschke 39da6f8166 Move timezone check to external JS 2013-01-21 21:10:44 +01:00
Lukas Reschke 8ca78fcf3f Move requesttoken to oc-requesttoken.js 2013-01-21 20:24:18 +01:00
Lukas Reschke 5fff57339f Move config to core/js/config.php 2013-01-21 00:10:47 +01:00
Thomas Mueller 1dd70ac506 update used space percent after each ajax call and display the notification 2013-01-19 00:31:49 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Bernhard Posselt b7f507b925 dont resize content div with javascript but use css box-sizing to do it 2013-01-16 19:38:19 +01:00
Jan-Christoph Borchardt 6182b1353b merge master into navigation 2013-01-15 20:40:38 +07:00
Lukas Reschke 954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Thomas Mueller 508b6a9fc7 displaying notification now centered
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller bfc55fef89 bring back L250 as spotted by @tanghus - THX 2013-01-08 00:24:35 +01:00
Michael Gapczynski d39655e126 Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
Jörn Friedrich Dreyer 3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Thomas Mueller 9671ace32e Merge branch 'master' into fix_minor_files_annoyances
Conflicts:
	apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller a867b36e7f js optimisations and style fixes 2013-01-06 10:41:07 +01:00
Thomas Mueller 6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Thomas Mueller ba475d4862 javascript notification functions have been moved to js.js for common use 2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer fe4f056a23 use jQuery.parseJSON fallback for IE6/7/8 2013-01-02 17:13:23 +01:00
Jörn Friedrich Dreyer 4a7604daa2 remove , at end of js. IE8 chokes on this 2013-01-02 17:02:06 +01:00
Jörn Friedrich Dreyer 5b07e722cb combine ie8 fix with debug check 2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer e998da06d1 fix broken console.log in ie8 2013-01-02 12:13:07 +01:00
Thomas Tanghus c317da7814 multiSelect: Add sorting options. 2012-12-21 06:18:10 +01:00
Thomas Tanghus 689edc2534 multiSelect: Make sure up/down classes are removed on close. 2012-12-21 06:17:13 +01:00
Thomas Tanghus 63fa943a52 multiSelect: Don't force popup above if there's no room for it there. 2012-12-21 00:53:23 +01:00
Thomas Tanghus 73b186cc60 Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect 2012-12-21 00:52:29 +01:00
Jan-Christoph Borchardt 586cc9a83b merge master into navigation 2012-12-18 15:41:58 +01:00
Björn Schießle 3adfb91ad8 call the password input field by name 2012-12-18 13:40:19 +01:00
Björn Schießle d873f0da35 autofocus to password input after clicking the checkbox; code restructured; debug output added 2012-12-18 13:39:52 +01:00
Björn Schießle c457e15b20 some more usability improvements:
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
2012-12-18 13:39:37 +01:00
Björn Schießle 1dd79cc8e1 set password for shared links when the user press enter and when he leaves the password field 2012-12-18 13:39:09 +01:00
Thomas Mueller c938a4f791 feedback to the user while request is being processed 2012-12-12 12:34:28 +01:00
Thomas Mueller 162a2c0fba moving sharing email code to core 2012-12-10 23:22:42 +01:00
Thomas Mueller 45074d5023 restoring feature to send sharing link via email 2012-12-10 18:41:08 +01:00
Jörn Friedrich Dreyer 80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Thomas Tanghus 6d643f9e74 multiSelect.js: Give each select a unique msid to prevent double adding in users.js 2012-12-04 21:21:54 +01:00
Thomas Tanghus feeaaf2d29 multiSelect: Make sure last added entry is selected and some code cleanup. 2012-12-04 18:00:14 +01:00
Thomas Tanghus daf452b4ba Added some missing type checks. 2012-12-04 18:00:13 +01:00
Thomas Tanghus 9ddd754bce Enhanced multiSelect jquery plugin. 2012-12-04 18:00:13 +01:00
Jörn Friedrich Dreyer e72f95f643 merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay 2012-12-04 13:32:55 +01:00
Jörn Friedrich Dreyer 3e519945c3 replace minified infieldlabel with dcneiners version 2012-12-04 13:30:13 +01:00
Thomas Tanghus 5c9faf396a Sharing: Fix false positived v. 2 2012-11-27 23:01:26 +01:00
Jörn Friedrich Dreyer 71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
2012-11-26 07:42:53 -08:00
Arthur Schiwon 4c707d1b1f remove debug output 2012-11-26 14:35:02 +01:00
Arthur Schiwon e5ad774ab0 coding style 2012-11-26 14:34:51 +01:00
Arthur Schiwon 4764876192 check whether to join url with ? or & 2012-11-26 14:34:41 +01:00
Arthur Schiwon 776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Jörn Friedrich Dreyer 995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Thomas Müller f3ae43d94a Merge pull request #420 from libasys/bugfix-share
If you using the sharing by link the array monthNames don't exist and ca...
2012-11-17 14:47:24 -08:00
Thomas Müller d1c0f2a739 Merge pull request #454 from Raydiation/master
Routing fixes
2012-11-15 15:15:07 -08:00
Thomas Tanghus b51b9539d0 Very simple js console switcher. 2012-11-15 19:43:10 +01:00
Bernhard Posselt defdbe3c10 removed unneeded callback checks in routes_request that could potentially fail 2012-11-15 15:07:01 +01:00
Bernhard Posselt 25e4a071ef fixed: this.routes_request is a deferred/promise 2012-11-15 15:01:21 +01:00
Bernhard Posselt bf20021b62 instead of warning via popup, write to console.warn 2012-11-15 14:48:18 +01:00
Bernhard Posselt ad87bc4645 Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-15 14:48:18 +01:00
Bernhard Posselt 14d4af24a2 Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading"
This reverts commit 9b8375cf2c.
2012-11-14 23:09:15 +01:00
Bernhard Posselt 9b8375cf2c Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-14 22:37:21 +01:00
libasys 493ae19bca If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined! 2012-11-14 16:47:52 +01:00
Alessandro Cosentino 7d01342bab fix translation issues with previous commit 2012-11-13 19:32:26 -05:00
Alessandro Cosentino aa917cfb18 uncomment hours entries in relative date functions 2012-11-13 19:18:26 -05:00
Thomas Tanghus 972ba89bc2 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-07 15:33:21 +01:00
Alessandro Cosentino 50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer c2d6ac53b2 fix human filesize column header 2012-11-06 11:08:02 +01:00
Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Lukas Reschke 8c4c74b23f Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus 4648dcfa46 VCategories: Use correct variable. 2012-11-04 12:09:04 +01:00
Jan-Christoph Borchardt 01bd0efc36 Merge branch 'master' into navigation 2012-11-01 16:58:06 +01:00
Jan-Christoph Borchardt f50c043cfb Merge branch 'navigation' of github.com:owncloud/core into navigation 2012-10-31 18:52:13 +01:00
Lukas Reschke 393d2517ee Change the requesttoken back to OC.EventSource.requesttoken 2012-10-31 18:43:16 +01:00
Lukas Reschke 7a7f12a0c1 Create only one CSRF token per session
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)

With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus 5fc0c89a73 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-31 16:09:11 +01:00
Thomas Tanghus 3813ee78c3 Merge pull request #112 from libasys/Fix-strange-Isue-IE8
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
libasys b095e32227 UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample 2012-10-31 09:42:26 +01:00
Jan-Christoph Borchardt 3db43a9980 Merge branch 'master' into navigation 2012-10-30 14:23:38 +01:00
Thomas Tanghus 5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Bart Visscher ed7accd237 Change search to use routing 2012-10-29 15:04:55 +01:00
Bernhard Posselt c4b8bb1041 added old functions again to not break apps, but show a deprecation warning 2012-10-29 01:14:07 +01:00
Michael Gapczynski e5a74903e4 Try to fix shared status icons again 2012-10-28 16:36:17 -04:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt d7abd44dea merge breadcrumb root into navigation 2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt 99ba05e766 Merge branch 'navigation' of github.com:owncloud/core into navigation 2012-10-28 16:48:30 +01:00
Jan-Christoph Borchardt 71435ac1cc improve user menu 2012-10-28 16:47:25 +01:00
Björn Schießle f2f2b8ba3b added some visual feedback is password was set 2012-10-28 14:57:36 +01:00
Björn Schießle a4a1dad831 set password if user leaves password field (issue #57) 2012-10-28 14:31:34 +01:00
Bernhard Posselt a6f3a570c6 dont resize content div with javascript but use css box-sizing to do it 2012-10-27 19:42:25 +02:00
Bart Visscher 939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Jan-Christoph Borchardt 46871e9b2e update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin 2012-10-26 21:47:05 +02:00
Thomas Müller 628c7ca9cf closes #113 2012-10-26 21:18:03 +02:00
libasys 0cf1fef3fa Fix for problems using for() function instead of $.each for arrays with IE8 2012-10-26 20:34:04 +02:00
Thomas Tanghus 675a56c5ed Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-10-24 21:55:25 +02:00
Lukas Reschke b1150f6a7f Urlencode the share URL
Fixes #63
2012-10-23 17:55:49 +02:00
Thomas Tanghus 273fdb7b64 Added type and callback arguments to most methods. 2012-10-22 15:40:08 +02:00
scambra 41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Thomas Tanghus fdf3ec1027 Add wait state to category dialog while processing. 2012-10-19 02:25:39 +02:00
Thomas Tanghus 81536a81e3 More js updates for app/type in OCCategories 2012-10-19 00:39:09 +02:00
Thomas Tanghus 97c884c548 Updated category js for handling favorites and use post instead of get. 2012-10-19 00:09:07 +02:00
Bart Visscher 6081bfa2bc Merge branch 'master' into routing
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
2012-10-17 16:38:11 +02:00
scambra c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
Lukas Reschke cdd30216b1 escapeHTML function 2012-10-12 14:10:11 +02:00
Thomas Müller a0c53619ff Merge pull request #24 from owncloud/js_variable_interpolation
A suggestion for simple, yet efficient variable interpolation in js translations
2012-10-10 00:40:47 -07:00
Victor Dubiniuk 71ff6382b5 Prevent closing sharing dialog on picking the date 2012-10-08 22:38:14 +03:00
Victor Dubiniuk 06d00af9f8 Prevent closing sharing dialog on month adjustment. Fixes oc-1884 2012-10-08 22:03:16 +03:00
Bart Visscher f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Thomas Tanghus bb345770af Suggestion for simple, yet efficient variable interpolation in js translations. 2012-10-05 03:33:46 +02:00
Björn Schießle 16eade5a3b share.expiration is null if no expiration date is set. 2012-10-04 11:18:37 +02:00
Michael Gapczynski 7bee735877 Show correct public link url for folders 2012-10-03 16:17:36 -04:00
Bart Visscher de1bfe9d6b Make the core ajax calls use the router 2012-10-02 21:58:42 +02:00
Bart Visscher bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Georg Ehrke 43c85248d4 Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871 2012-10-01 16:04:20 +02:00
Bart Visscher a33dda3c65 Fix double url decoding in fileDownloadPath function 2012-09-29 18:10:23 +02:00
Thomas Müller 7f6a984e57 Merge pull request #20 from scambra/undo-l10n
undo interpolation in js for 4.5
2012-09-28 14:32:44 -07:00
Bart Visscher c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
scambra 8f27881770 undo interpolation in js for 4.5 2012-09-28 19:53:18 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
Christian Reiner 743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Michael Gapczynski b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski 00103d730f Show share expiration date set for shared item 2012-09-26 00:04:27 -04:00
Michael Gapczynski 2bdf89f4d4 Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773 2012-09-25 23:18:36 -04:00
Robin Appelman a22a5d6807 some js style fixes 2012-09-23 03:16:52 +02:00
scambra d5211f9615 some characters in comments avoid finding some strings to translate 2012-09-21 12:05:01 +02:00
scambra 0f15bc881f fix translating dialog buttons, they are translated in core not dialogs app 2012-09-21 11:48:57 +02:00
scambra 22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Björn Schießle b1c60841e8 float right element needs to be the first element, otherwise firefox will move it to a new line 2012-09-20 10:31:23 +02:00
Michael Gapczynski 518ca0ac58 Fix changing of share status icons, bug fix for oc-1631 2012-09-19 01:44:15 -04:00
Michael Gapczynski 1e1e8ae3b5 Don't show the expiration option until a share occurs, bug fix for oc-1724 2012-09-19 01:02:57 -04:00
Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration
Conflicts:
	core/js/share.js
	lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski 54d4e556fe Add lock and clock icon for sharing 2012-09-12 01:02:08 -04:00
Michael Gapczynski 8f0354bcdd Temporarily disable sharing with contacts and emails, will come in next release 2012-09-12 01:02:08 -04:00
Michael Gapczynski 6c17a4cb77 Don't display actions for children in shared collections, show the parent collection the child is shared in 2012-09-09 14:44:08 -04:00
Robin Appelman 0b2633a787 add breadcrumb controll to js 2012-09-09 03:00:01 +02:00
Robin Appelman 9beb958845 forgot a , 2012-09-09 00:35:02 +02:00
Robin Appelman b14265b5c3 add js versions of basename and dirname 2012-09-08 23:59:02 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Bart Visscher e0db35fac0 Fix name for OCCategories 2012-09-05 22:26:09 +02:00
Bart Visscher a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +02:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Bart Visscher f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Michael Gapczynski 6c29334b48 Add support for share expiration 2012-09-01 18:53:48 -04:00
Michael Gapczynski 5a9a795cd5 Fix check in Javascript for password protected link 2012-09-01 13:52:12 -04:00
Jörn Friedrich Dreyer ca8120e9f4 unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer 3ba27e624f unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer 61a3e5f96b unify permissions (1/3): add permission conastants to javascript OC 2012-08-31 01:11:10 +02:00
Bart Visscher b483f2aab8 Merge branch 'master' into routing
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
2012-08-30 21:49:28 +02:00
Robin Appelman 8990855f88 add OC.get and OC.set to get/set variables by name in javascript 2012-08-30 03:02:29 +02:00
Michael Gapczynski 3828d86191 Remove old Javascript code 2012-08-29 14:37:36 -04:00
Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Michael Gapczynski 76bc4753e9 Fix displaying if a link is password protected 2012-08-29 14:06:55 -04:00
Michael Gapczynski 0788c6e968 Hide link password controls if link is removed 2012-08-29 14:06:55 -04:00
Michael Gapczynski 26501a0bc8 Delete old link if user sets a password 2012-08-29 14:06:55 -04:00
Michael Gapczynski 9fcb916057 Fix toggling of password protection in sharing dropdown 2012-08-29 11:54:49 -04:00
Robin Appelman 92c782c1b0 return the jQuery deferred object when using OC.loadScript 2012-08-29 01:57:59 +02:00
Michael Gapczynski 2aac6f02a0 Reimplement links support for sharing and add password protection option 2012-08-27 20:37:38 -04:00
Michael Gapczynski 0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Michael Gapczynski 545812f589 Move additional jquery.inview files 2012-08-26 18:50:20 -04:00
Michael Gapczynski d6bb04a74e Move jquery.inview from contacts app to core 2012-08-26 17:55:51 -04:00
Jörn Friedrich Dreyer fd5af9aff4 Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer c8255a170c Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski d84b1adf34 Dynamically update shared status icon 2012-08-24 15:32:06 -04:00
Michael Gapczynski 7168fa4b05 Add padding to the reshared text 2012-08-24 15:12:16 -04:00
Michael Gapczynski fedb3641f9 Determine if reshare needs to be checked 2012-08-24 15:12:16 -04:00
Michael Gapczynski 36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
Michael Gapczynski cfec290ad9 Prevent resharing in UI if share permission not granted 2012-08-24 10:05:37 -04:00
Arthur Schiwon a3b4cb205c Show Login-Button when user+pw are autocompleted, fixes oc-1068 2012-08-24 14:54:16 +02:00
Thomas Tanghus aefa52018d Use right variable name. 2012-08-23 05:02:30 +02:00
Michael Gapczynski 885b8c481b Check if files_sharing app is enabled, move file specific javascript to files_sharing app 2012-08-22 12:32:07 -04:00
Michael Gapczynski 9699ff03bd Revert using item name, no longer allowing the same item source exist for a user 2012-08-22 11:57:58 -04:00
Michael Gapczynski 09e851a9c4 Fix share ajax calls to use itemName/itemSource, show who shared a file with you 2012-08-20 21:22:22 -04:00
Michael Gapczynski 82d81e8d39 Merge branch 'share_api'
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
2012-08-19 22:29:01 -04:00
Anders Nor Berle b6a3bf154d Comment out javascript that hides login button
It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
2012-08-16 20:55:10 +00:00
Michael Gapczynski df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Bart Visscher 63af75586b Merge branch 'master' into routing 2012-08-15 17:39:00 +02:00
Bart Visscher 4954e46bb2 Use core routes in js too 2012-08-15 17:38:55 +02:00
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Thomas Tanghus eb516b79b6 Position appsettings fixed and load it in dynamically added element. 2012-08-12 18:42:54 +02:00
Jakob Sack 7fa896971f JavaScript file for activating web cron 2012-08-09 00:58:54 +02:00
Michael Gapczynski d02b0e39b2 Fix issues with hiding and showing dropdown 2012-08-08 17:50:09 -04:00
Michael Gapczynski a22f30fb78 Reset item shares variable, fixes autocomplete not showing people 2012-08-08 11:39:00 -04:00
Michael Gapczynski b1a7e30819 Actually change background image of shared items 2012-08-07 21:23:55 -04:00
Michael Gapczynski 51ddc44b62 Somewhat fixes dropdown display issues in the contacts app 2012-08-06 15:43:20 -04:00
Michael Gapczynski 6f83540dd6 Remove person from array after unshare, so name appears in autocomplete again 2012-08-06 14:45:45 -04:00
Michael Gapczynski ea23854328 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
Michael Gapczynski 4f10574065 Don't load item if it doesn't have it status set 2012-08-06 13:30:44 -04:00
Michael Gapczynski 3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Arthur Schiwon c5d5ca88a8 Show Login-Button when user+pw are autocompleted, fixes oc-1068 2012-08-03 13:15:15 +02:00
Michael Gapczynski 26e406c3c0 Hide 'can edit' if not checked 2012-08-01 18:03:00 -04:00
Michael Gapczynski 4933128850 Throw exceptions in share API for UI to display 2012-08-01 17:52:29 -04:00
Thomas Tanghus 98f37b93f6 Propagate exceptions in OC.appSettings. 2012-08-01 16:24:02 +02:00
Michael Gapczynski 83b935a1c2 Prevent up and down arrow from changing the share with input value 2012-07-31 21:31:59 -04:00
Michael Gapczynski 269922543e Give share with search focus when sharing dropdown appears 2012-07-31 14:48:19 -04:00
Jörn Friedrich Dreyer 795e78809f add oracle to install & setup 2012-07-31 19:34:30 +02:00
Michael Gapczynski 8d01e1a355 Don't show self or already shared with users and groups in the share with search 2012-07-31 13:06:32 -04:00
Michael Gapczynski 8729119d4b Add suggestion to share with search for sharing via email 2012-07-31 10:18:26 -04:00
Thomas Tanghus 6df95db8e8 Forgot to also use the options I added :-P 2012-07-31 16:05:58 +02:00
Thomas Tanghus 8837576ce7 Added some more options to OC.appSettings(). 2012-07-31 16:03:08 +02:00
Thomas Tanghus fb14cb87bd Made the parameter for OC.appSettings() an object to be able to extend it. 2012-07-31 14:17:28 +02:00
Thomas Tanghus 084866cb1e White space 2012-07-31 14:06:44 +02:00
Thomas Tanghus 553773f2e1 Popup for app specific settings. 2012-07-31 12:23:22 +02:00
Michael Gapczynski ed71343df8 Autocomplete for share with search in sharing dropdown 2012-07-30 15:30:21 -04:00
Michael Gapczynski db72ce398b Add support for configuring which permissions are possible for items 2012-07-27 10:13:23 -04:00
Michael Gapczynski cb21406e18 Implement CRUDS in share dropdown, and some clean-up 2012-07-26 21:56:22 -04:00
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Robin Appelman b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski cbf851de69 Show private link in dropdown 2012-07-11 12:21:30 -04:00
Michael Gapczynski ccb5e99395 Generate random token for private links (more entropy than past private links) 2012-07-11 12:18:59 -04:00
Michael Gapczynski 7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00
Michael Gapczynski 0045e64041 Fix time formatting for minutes, prepend 0 if minutes is less than 10 2012-07-06 16:49:15 -04:00
Michael Gapczynski 90e4af312a Fix time formatting for minutes, prepend 0 if minutes is less than 10 2012-07-06 16:38:54 -04:00
Brice Maron 799e34acd4 Add slash to app url if not set fix oc-1169 2012-07-03 21:58:36 +00:00
Michael Gapczynski 1ad5e3e39f Add parameter to showDropDown to not show private link UI, only files can be shared as private links 2012-07-03 17:00:23 -04:00
Michael Gapczynski db33765e36 Add share with to list in dropdown after sharing 2012-07-03 16:52:53 -04:00
Michael Gapczynski 5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Michael Gapczynski dd7d34a40e Prevent adding a duplicate to a multiselect 2012-07-01 11:36:44 -04:00
Michael Gapczynski 949cab7ea1 Add new group to other user's group select forms 2012-07-01 11:36:31 -04:00
Michael Gapczynski f456cee9d8 Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app 2012-06-30 21:06:04 -04:00
Michael Gapczynski 8e4832bd12 Prevent adding a duplicate to a multiselect 2012-06-29 16:44:08 -04:00
Michael Gapczynski 05cb94801a Add new group to other user's group select forms 2012-06-29 16:29:58 -04:00
Michael Gapczynski cb19fdd55b Show users and groups shared with in dropdown 2012-06-27 01:05:37 +02:00
Michael Gapczynski b5961635ea Fix ajax share file and replace 'User or Group' select form with a textbox 2012-06-27 01:05:36 +02:00
Michael Gapczynski f21fdf14f9 Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead 2012-06-27 01:05:36 +02:00
Michael Gapczynski bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski 945565f420 Move ajax and js files to core 2012-06-27 01:05:36 +02:00
Bjoern Schiessle 595ff468f5 typo in js statement fixed 2012-06-26 10:36:33 +02:00
Bjoern Schiessle 18d5420744 typo in js statement fixed 2012-06-26 10:35:19 +02:00
Brice Maron df60d6d5d2 Fixes for multi app dir :
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Robin Appelman 8f616ecf76 fix potential xss in multiselect 2012-06-09 15:08:05 +02:00
Robin Appelman cfe219fbb9 fix potential xss in multiselect 2012-06-09 15:07:16 +02:00
Brice Maron 5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Robin Appelman 58adeaa80a only check our own input fields when determining to show the login button
fixes a problem with browser plugins adding hidden inputs
2012-05-17 01:17:44 +02:00
Robin Appelman 9eb91a111d update to jquery 1.7.2 2012-05-12 00:37:19 +02:00
Michael Gapczynski 59a2616105 Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links 2012-05-10 23:04:27 -04:00
Michael Gapczynski 52d113b9e1 Prevent extra '/' from being added to url if app is not defined 2012-05-07 12:35:02 -04:00
Simon Birnbach df6b15445d Fix bug on browsers like rekonq which stopped execution of javascript 2012-05-07 17:35:23 +02:00
Georg Ehrke 936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Thomas Tanghus 2580d8540d Dialogs: Clean indentation. Add some missing brackets. 2012-05-05 13:49:47 +02:00
Thomas Tanghus 27da29525a Made the global settings icon accessable via keyboard.
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
Thomas Tanghus 8d1754041e VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls. 2012-05-04 01:33:47 +02:00
Thomas Tanghus a4a3d62a55 Check for callback in OC.dialogs.alert. 2012-05-04 00:13:35 +02:00
Bartek Przybylski 5611e6c9d3 fix incorrect dialog computing in ff 2012-05-03 12:32:37 +02:00
unknown 98e0db15a2 correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details)

solved

Signed-off-by: bourgeoa
2012-05-01 23:46:51 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Thomas Tanghus 9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke 0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke d6346b5b0b fix OC.filePath in main js 2012-04-24 21:54:09 +02:00
Georg Ehrke 684007bbae fix pathes in contacts 2012-04-24 21:33:34 +02:00
Georg Ehrke 6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke 9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Georg Ehrke 12ef2f5054 modify OC.filepath for movable apps 2012-04-20 22:35:12 +02:00
Jan-Christoph Borchardt e5cda3abcd tooltip for delete shows up to the left 2012-04-15 17:49:54 +02:00
Jan-Christoph Borchardt 7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Jan-Christoph Borchardt 5868199e85 fixed settings hover, now whole row sensitive and fading not jerky 2012-04-15 13:34:30 +02:00
Bart Visscher 30498fd6f8 Use offset function to position block elements 2012-04-14 18:31:41 +02:00
Bart Visscher b8466d362e Fix rescan "File not Found" error handling in oc-vcategories.js 2012-04-13 21:13:58 +02:00
Jan-Christoph Borchardt eea0d2e096 fixing delete tooltip 2012-04-13 18:28:17 +02:00
Jan-Christoph Borchardt 31df4c00ec adding tipsy tooltips for file actions 2012-04-13 17:22:23 +02:00
Bart Visscher bc81179163 Fix categories delete fallback when there is no app specific ajax categories delete function 2012-04-12 23:10:49 +02:00
unknown 2f3c0a6d80 wrong defaultValue definition in OC.AppConfig.getValue
done
2012-04-12 19:14:25 +02:00
Bart Visscher 9f547a1b39 VCategories: fix function names to coding standard 2012-04-10 21:53:51 +02:00
Thomas Tanghus d1ae6512cc Contacts: Misc. cleanup tweaks. 2012-04-07 16:03:43 +02:00
Bartek Przybylski 96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Bartek Przybylski 5b4a303672 loading screen for filepicker 2012-04-05 21:29:54 +02:00
Bartek Przybylski cd05dfb943 adding icons to filepicker 2012-04-03 22:18:03 +02:00
Bartek Przybylski ff5dbc52b8 multiselect handle for filepicker 2012-04-02 21:32:35 +02:00
Bartek Przybylski f21d6d4f9f dialogs filepicker first draft 2012-04-02 19:39:24 +02:00
Bartek Przybylski 4e327295c6 adding callback when ok click on alert dialog 2012-04-01 00:30:52 +02:00
Robin Appelman 2f68b08491 fix eventsource for ie 2012-03-31 16:40:42 +02:00
Robin Appelman ad495a9218 fix potential problem when using multiply eventsource's 2012-03-31 16:10:29 +02:00
Bartek Przybylski 6b704a780d select field added to oc.dialogs.form, gallery ported to use it 2012-03-30 22:50:57 +02:00
Thomas Tanghus 0a07e5fdaa Added some documentation. 2012-03-27 12:30:20 +02:00
Bartek Przybylski cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
Thomas Tanghus 03eb5197b6 Added category editor for apps using OC_VObjects. 2012-03-12 14:13:03 +01:00
Bartek Przybylski c411826fe5 moving gallery op to one file, migrate gallery dialogs to oc dialogs 2012-03-04 00:35:37 +01:00
Bartek Przybylski 2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Roland van Laar 2a351f4456 Fixed off by one bug. List length is 1 larger than the index of the last
element.
2012-02-26 22:09:21 +01:00
Robin Appelman 3d0d47957e improved humanFileSize for js 2012-02-26 14:12:50 +01:00
Robin Appelman a5e892505e more robust png fallback 2012-02-26 03:10:29 +01:00
Robin Appelman 797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Robin Appelman 8b93a9a237 add javascript bindings for OC_AppConfig 2012-02-25 16:35:40 +01:00
Robin Appelman 862f824d64 some multiselect improvements 2012-02-25 16:35:40 +01:00
Marvin Thomas Rabe b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Robin Appelman fdf3df3de5 add option to send get data along with an eventsource request 2012-01-31 16:35:47 +01:00
Robin Appelman 6a1121ab2e provide server side close option for EventStream 2012-01-30 23:19:58 +01:00
Robin Appelman 45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Robin Appelman 039bbfde2d automatically show advanced options when no sqlite is available 2012-01-29 18:00:55 +01:00
Robin Appelman b366b0eb52 quick fix for javascript translations 2012-01-16 00:09:43 +01:00
Robin Appelman a883fcca3c add user and instance awere localstorage to prevent collisions when using localstorage 2012-01-15 19:22:32 +01:00
Robin Appelman 872d301af3 fix inconsitent behaviour when trying to remove yourself from the admin group 2012-01-15 00:50:01 +01:00
Robin Appelman 0ac9e56da9 small fix for server svg mimetype detection 2012-01-14 23:41:48 +01:00
Robin Appelman 5eb6071b04 make the minimum width of the multiselect configurable 2012-01-14 23:10:14 +01:00
Tom Needham 6dcabdc61c Fixed merge conflict in /files/ajax/move.php 2012-01-04 16:31:06 +00:00
Georg Ehrke a1af757ef6 Fix whitespace username in the installation form 2012-01-02 14:21:46 +01:00
Robin Appelman 1415cb8d19 add infieldlabel source 2012-01-01 23:48:38 +01:00
Tom Needham 5ebf8a87f2 Removed old jquery-ui css and js 2011-12-30 23:08:44 +00:00
Tom Needham 39e67707d7 Updated jquery ui js and css. Improved color scheme. 2011-12-30 22:47:39 +00:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Robin Appelman 2c68aab198 Merge branch 'master' into newbutton 2011-11-04 03:00:03 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Robin Appelman d46288b0ab 'New' button, needs some css work 2011-10-23 11:40:40 +02:00
Bart Visscher 92fa6f0a48 Fix size calculation with css styling of tipsy popup 2011-10-21 22:08:55 +02:00
Marvin Thomas Rabe de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00
Marvin Thomas Rabe 6d8985ceb2 added infield labels. readded fade in of login button. updated label on install page. 2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe 481a37fcf3 Show database only in advanced 2011-10-03 13:32:16 +02:00
Marvin Thomas Rabe 41dfce150d problem with previous selected groups fixed 2011-10-02 15:38:07 +02:00
Marvin Thomas Rabe ccfa2dd24c Error when only oc_remember_login cookie set fixed.
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
Bart Visscher 3fcc7b5949 Use correct name for function state for addScript/addStyle in js 2011-09-26 21:18:56 +02:00