Commit Graph

1167 Commits

Author SHA1 Message Date
Morris Jobke a183b5d7e2 Merge pull request #14208 from owncloud/oc-msg-remove-object-dependency
Remove dependency from arbitrary data object structure for easier usage
2015-02-26 14:57:21 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Lukas Reschke 921a76ae2e Merge pull request #14245 from cmeh/master
Message clean-up
2015-02-25 17:46:41 +01:00
Thomas Müller bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Joas Schilling c201bc01bb Remove dependency from arbitrary data object structure for easier usage 2015-02-20 10:43:39 +01:00
Thomas Müller 767dd4bde7 Merge pull request #14267 from owncloud/encode-eventsource
Encode requesttoken
2015-02-19 16:21:12 +01:00
Jan-Christoph Borchardt 83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
2015-02-18 19:42:18 +01:00
Lukas Reschke 27c1409be5 Encode parameters in `OC.generateUrl` by itself
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
2015-02-17 14:41:06 +01:00
Vincent Petry e8f16db49d Merge pull request #13866 from rullzer/avatar_share_dialog
Avatars in share dialog
2015-02-17 10:17:36 +01:00
Lukas Reschke 912a536c17 Encode requesttoken
One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
2015-02-16 20:28:30 +01:00
cmeh 09a0bf22df Update setupchecks.js
Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
2015-02-16 10:25:01 +01:00
cmeh d89cf737ae Message clean-up
*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".
2015-02-16 09:59:41 +01:00
Roeland Jago Douma 9a6da8e6e2 Extended avatar unit tests 2015-02-13 12:57:24 +01:00
Roeland Jago Douma 90218dcd4c Added config check 2015-02-13 12:17:22 +01:00
Lukas Reschke dfcd4acd5a Merge pull request #13771 from owncloud/fix-humanfileSize
generate valid human readable text for 0
2015-02-12 18:34:54 +01:00
Roeland Jago Douma ecb7d44775 Small unit test rewrite 2015-02-12 17:05:59 +01:00
Roeland Jago Douma e952687dcd Added unit test 2015-02-12 16:50:14 +01:00
Roeland Jago Douma 47b96c9fa1 Added dependancy for the JS unit tests
Still not correct but it is a small step
2015-02-12 16:50:14 +01:00
Roeland Jago Douma 639a634cfd Display user avatar in share dialog 2015-02-12 16:50:14 +01:00
Lukas Reschke 0119d429fc Second parameter is optional
Makes my IDE happier.
2015-02-11 14:01:22 +01:00
Sebastian Bolt 7ffd2557ff changed image to classed div for spinner animation 2015-02-04 22:27:38 +01:00
Thomas Müller ccc1f09627 generate valid human readable text for 0 - fixed #9342 2015-01-29 17:27:28 +01:00
Joas Schilling 3f8e850dc6 Indicate that the share owner is remote in the filelist 2015-01-27 12:32:32 +01:00
Lukas Reschke 1b671afa17 Merge pull request #13323 from owncloud/move-search
Move search to core/search
2015-01-15 20:41:57 +01:00
Morris Jobke dc17019536 adjust paths for search 2015-01-14 15:15:39 +01:00
Vincent Petry 99304be4ef Read version and product name from update template
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.
2015-01-14 11:31:42 +01:00
Vincent Petry c897a14d56 Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
2015-01-09 15:19:53 +01:00
Morris Jobke 8e1904386f Add timeout for notifications
* 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
2015-01-08 13:06:45 +01:00
Morris Jobke 5ce295907f Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke bfdf0db7c0 Autoescape of placeholders in t() and p() - for JS
* 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
2015-01-07 12:56:32 +01:00
Jörn Friedrich Dreyer 9e3f4e043f make OCA.Search.Files available in tests and for other apps 2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer 606f802b7b move search results below filelist, show hint when results are off screen, use js plugin mechanism 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer c738359a11 add paged provider 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer 088323aad5 move code from js.js to search.js in the search app 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer d3662722f6 new OC.Search, add search result formatters and handlers, use full content width for results 2015-01-02 10:28:41 +01:00
Bjoern Schiessle 24993280ed Next step in server-to-server sharing next generation, see #12285
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.
2014-12-19 15:20:24 +01:00
Jörn Friedrich Dreyer 587bdd9a74 Merge pull request #12948 from owncloud/wording
Wording fixes for sharing dialog
2014-12-19 09:48:19 +01:00
Morris Jobke 3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Jan-Christoph Borchardt 4f616a481c change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438 2014-12-18 22:39:32 +01:00
Jan-Christoph Borchardt 5aae796d3d change 'update' to more understandable 'change', fix #10408 2014-12-18 22:35:34 +01:00
Jan-Christoph Borchardt 96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt 7e5fbde4cd add missing input labels for Share dialog 2014-12-18 15:37:46 +01:00
Thomas Müller 51a22431ee load showpassord.js conditionally in the template only if needed 2014-12-16 18:45:37 +01:00
Lukas Reschke be3d4fd303 Merge pull request #12360 from owncloud/files-tags
Add favorites to files app
2014-12-15 19:55:18 +01:00
Jörn Friedrich Dreyer 6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Vincent Petry 20c30ac79a Load handlebars in core 2014-12-15 12:43:05 +01:00
Vincent Petry a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Morris Jobke edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke 29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges
Move file thumbnail element into the label tag
2014-12-13 09:00:43 +01:00
Robin Appelman 3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem
Simple Plugin system for Javascript
2014-12-12 11:43:31 +01:00
Morris Jobke e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Vincent Petry 81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01:00
Jörn Friedrich Dreyer c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Jörn Friedrich Dreyer 1d490b559c introduce inApps[] filter for search via ajax query, make file results show up in files app only
use more flexible return type

check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Jan-Christoph Borchardt 5c36b0bf5d improve update error page: remove box, make link visible, insert missing space, remove line break 2014-12-10 13:30:28 +01:00
Joas Schilling 539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users
Fix #10836
2014-12-09 11:32:39 +01:00
Lukas Reschke 2b76227180 Check for working .htaccess via AJAX
Fixes https://github.com/owncloud/core/issues/12650
2014-12-06 15:34:53 +01:00
Arthur Schiwon ee168a121d Forward port of #12493
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
2014-12-04 19:02:09 +01:00
Vincent Petry c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Morris Jobke 48f00df08e move jstz to bower management 2014-12-01 10:40:31 +01:00
Thomas Müller e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change
Use `/` as redirect location if webroot is set to an empty value
2014-11-24 11:09:17 +01:00
Lukas Reschke 8c2aeb9b21 Add OCS API header per default
Relieve @PVince from having to write it all the time ;-)
2014-11-21 19:54:19 +01:00
Lukas Reschke 0fa8b449b2 Use `/` as redirect location if webroot is set to an empty value
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
2014-11-21 15:38:36 +01:00
Vincent Petry 10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs
Added function to load translations from JS
2014-11-20 10:53:46 +01:00
Vincent Petry ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Vincent Petry 1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Vincent Petry cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Vincent Petry 152da9796b Added function to load translations from JS
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
2014-11-18 12:20:01 +01:00
Lukas Reschke 9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Lukas Reschke f530865b3d Hide submit button after password change
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
2014-11-17 17:50:20 +01:00
Lukas Reschke 1b50d4f7ce Warn for password reset when files_encryption is enabled
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.

Furthermore I updated the code to use our new classes and added some unit tests for it 👯

Fixes https://github.com/owncloud/core/issues/11438
2014-11-17 17:50:19 +01:00
Morris Jobke b564192ba2 Merge pull request #12158 from owncloud/drop-snapjs
remove unneeded snap.js - followup to #11985 - ref #12156
2014-11-13 16:03:11 +01:00
blizzz 559b34e53d Merge pull request #12005 from owncloud/bower-multiselect
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Morris Jobke 42793534d4 remove unneeded snap.js - followup to #11985 - ref #12156 2014-11-13 13:20:37 +01:00
Vincent Petry 5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Morris Jobke f39cb3fbc9 Migrate multiselect to user_ldap 2014-11-13 00:47:14 +01:00
Jan-Christoph Borchardt 3ecb3f16bf Merge pull request #11929 from owncloud/fix-db-center
fixes not centered database chooser on setup page
2014-11-11 17:12:17 +01:00
Morris Jobke f816f3df03 bower zxcvbn 2014-11-06 11:55:57 +01:00
Morris Jobke 226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Morris Jobke 957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Morris Jobke 02c7fb8445 bower handlebars 2014-11-05 16:47:46 +01:00
Lukas Reschke 4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
2014-11-05 16:43:24 +01:00
Morris Jobke 4fa3a5034b drop unused jquery.placeholder 2014-11-05 13:41:11 +01:00
Morris Jobke a857bf1d50 drop jquery.inview as it is unused 2014-11-05 12:57:18 +01:00
Morris Jobke 5a6cbea261 drop listview.js
* isn't used in core and isn't mentioned in documentation
2014-11-04 17:28:35 +01:00
Morris Jobke 74d375d8ea migrate jQuery to bower 2014-11-04 14:28:29 +01:00
Morris Jobke 32de664c03 fixes not centered database chooser on setup page
* fixes #11927
2014-11-03 22:01:32 +01:00
Morris Jobke 1a405e56f5 replace moment.js with bower version
* fix JS unit tests
2014-11-03 20:54:50 +01:00
Vincent Petry 0f3e6cb50a Improved Javascript docs for JSDoc
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Vincent Petry d71cd680dd Include core translations
Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
Vincent Petry ec1a73fab9 Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Vincent Petry aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
Lukas Reschke 2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
kondou 729dffed5e Load avatar in header via PHP
* fix #7484
* use UID, css, and div instead of span
2014-10-23 23:17:18 +02:00
Clark Tomlinson ca5abe5744 Setting moment locale based on user selection 2014-10-23 10:32:47 -04:00
Thomas Müller c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Craig Morrissey 446cebf492 adjust autocomplete behavior for sharing menu 2014-10-17 11:55:32 -04:00
Bjoern Schiessle d18da08a1a set password field placeholder back if passward was disabled 2014-10-15 12:30:31 +02:00
Bjoern Schiessle 94a9ff1cd8 make sure that the notification gets shown again after a second try 2014-10-07 12:02:58 +02:00