summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14582 from rullzer/avatar_fixesMorris Jobke2015-03-043-31/+63
|\ | | | | Avatars in share dialog fixes
| * Avatars in share dialog fixesRoeland Jago Douma2015-03-033-31/+63
| | | | | | | | | | | | | | * Avatar for "xxxx share with you..." to the left * Avatars for groups and remote shares (use default placeholder) * Modified and added unit tests * Use the same css for all the avatars in the dropdown
* | Added missing done() calls for async testsVincent Petry2015-03-031-20/+31
| |
* | Let users configure security headers in their WebserverLukas Reschke2015-03-024-1/+430
|/ | | | | | | | | | Doing this in the PHP code is not the right approach for multiple reasons: 1. A bug in the PHP code prevents them from being added to the response. 2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud) 3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations. This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
* Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| | | | | | Otherwise problems arrive when a username contains characters such as an `@` Fixes https://github.com/owncloud/user_shibboleth/issues/38
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-271-28/+5
|\ | | | | Revert "Updating license headers"
| * Revert "Updating license headers"Morris Jobke2015-02-261-28/+5
| | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | Merge pull request #14208 from owncloud/oc-msg-remove-object-dependencyMorris Jobke2015-02-261-36/+71
|\ \ | |/ |/| Remove dependency from arbitrary data object structure for easier usage
| * Remove dependency from arbitrary data object structure for easier usageJoas Schilling2015-02-201-36/+71
| |
* | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-251-3/+3
|\ \ | | | | | | Message clean-up
| * | Update setupchecks.jscmeh2015-02-161-1/+1
| | | | | | | | | Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
| * | Message clean-upcmeh2015-02-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | *Changes:* * "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up"). * "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59. * Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components. * "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]). * Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either".
* | | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-241-0/+3
| | |
* | | Updating license headersJenkins for ownCloud2015-02-231-5/+28
| | |
* | | Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ \ \ | | | | | | | | Encode requesttoken
| * | | Encode requesttokenLukas Reschke2015-02-161-1/+1
| | |/ | |/| | | | | | | One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
* | | Merge pull request #12213 from sebomoto/add-loadfeedbackJan-Christoph Borchardt2015-02-181-0/+4
|\ \ \ | | | | | | | | Add loadfeedback
| * | | changed image to classed div for spinner animationSebastian Bolt2015-02-041-0/+4
| | | |
* | | | Encode parameters in `OC.generateUrl` by itselfLukas Reschke2015-02-172-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is often used in a wrong and potential dangerous way... Thus we should escape the URL per default and offer developers to disable the automatic escaping via an option parameter if they really want that behaviour. Might break some things, however, those things are then easy to fix and we really have a ton of bugs caused by this... Fixes https://github.com/owncloud/core/issues/14228
* | | | Merge pull request #13866 from rullzer/avatar_share_dialogVincent Petry2015-02-174-3/+111
|\ \ \ \ | |_|/ / |/| | | Avatars in share dialog
| * | | Extended avatar unit testsRoeland Jago Douma2015-02-131-14/+61
| | | |
| * | | Added config checkRoeland Jago Douma2015-02-132-8/+19
| | | |
| * | | Small unit test rewriteRoeland Jago Douma2015-02-121-1/+1
| | | |
| * | | Added unit testRoeland Jago Douma2015-02-122-2/+37
| | | |
| * | | Added dependancy for the JS unit testsRoeland Jago Douma2015-02-121-1/+2
| | | | | | | | | | | | | | | | Still not correct but it is a small step
| * | | Display user avatar in share dialogRoeland Jago Douma2015-02-121-2/+16
| | | |
* | | | Merge pull request #13771 from owncloud/fix-humanfileSizeLukas Reschke2015-02-122-1/+3
|\ \ \ \ | |/ / / |/| | | generate valid human readable text for 0
| * | | generate valid human readable text for 0 - fixed #9342Thomas Müller2015-01-292-1/+3
| | |/ | |/|
* / | Second parameter is optionalLukas Reschke2015-02-111-1/+1
|/ / | | | | | | Makes my IDE happier.
* | Indicate that the share owner is remote in the filelistJoas Schilling2015-01-272-3/+6
| |
* | Merge pull request #13323 from owncloud/move-searchLukas Reschke2015-01-152-2/+2
|\ \ | | | | | | Move search to core/search
| * | adjust paths for searchMorris Jobke2015-01-142-2/+2
| | |
* | | Read version and product name from update templateVincent Petry2015-01-141-4/+8
|/ / | | | | | | | | | | During upgrade, the config settings aren't always available due to base.php changes. This fix makes the update info page read the product name and version from the update template, which already had them.
* | Fix reshare permission issueVincent Petry2015-01-092-0/+158
| | | | | | | | | | The actual share permissions sent to the server on reshare are now based on possiblePermissions + permissions inherited from parent share
* | Add timeout for notificationsMorris Jobke2015-01-082-0/+134
| | | | | | | | | | | | | | | | * options for timeout in seconds and if it contains HTML * if timeout is 0 it will show the message permanently * removes the notification after a given (default: 5 seconds) timeframe * based on work by @brantje * provide JS unit tests for notifications
* | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-073-15/+43
|\ \ | | | | | | Auto escape t placeholders
| * | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-073-15/+43
| | | | | | | | | | | | | | | | | | | | | * add disableEscape parameter to disable this functionality * drop usage of escapeHTML() that is now done inside t() * add unit test for escaped and not escaped placeholder * proper JSDoc
* | | make OCA.Search.Files available in tests and for other appsJörn Friedrich Dreyer2015-01-021-1/+2
| | |
* | | move search results below filelist, show hint when results are off screen, ↵Jörn Friedrich Dreyer2015-01-021-36/+1
| | | | | | | | | | | | use js plugin mechanism
* | | add paged providerJörn Friedrich Dreyer2015-01-021-1/+1
| | |
* | | move code from js.js to search.js in the search appJörn Friedrich Dreyer2015-01-021-58/+3
| | |
* | | new OC.Search, add search result formatters and handlers, use full content ↵Jörn Friedrich Dreyer2015-01-021-20/+57
|/ / | | | | | | width for results
* | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-191-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
* | Merge pull request #12948 from owncloud/wordingJörn Friedrich Dreyer2014-12-191-2/+2
|\ \ | | | | | | Wording fixes for sharing dialog
| * | change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438Jan-Christoph Borchardt2014-12-181-1/+1
| | |
| * | change 'update' to more understandable 'change', fix #10408Jan-Christoph Borchardt2014-12-181-1/+1
| | |
* | | Merge pull request #12941 from owncloud/wave-accessibility-complianceMorris Jobke2014-12-191-1/+5
|\ \ \ | | | | | | | | Wave accessibility compliance
| * | | get rid of unnecessary alt and title attributesJan-Christoph Borchardt2014-12-181-1/+1
| | | |
| * | | add missing input labels for Share dialogJan-Christoph Borchardt2014-12-181-0/+4
| |/ /
* / / load showpassord.js conditionally in the template only if neededThomas Müller2014-12-162-29/+5
|/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 17:38:43 +0000