Commit Graph

1595 Commits

Author SHA1 Message Date
Thomas Müller 07c6e523b1 Merge pull request #16565 from owncloud/add-urandom-check
Add check for availability of /dev/urandom
2015-05-26 16:53:11 +02:00
Lukas Reschke bc6d17ed74 Add check for availability of /dev/urandom
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:

1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()

An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.

One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.

Thanks to David Black from d1b.org for bringing this again to our attention.
2015-05-26 14:16:07 +02:00
Vincent Petry d7c18b04bd Merge pull request #16521 from owncloud/unbold-placeholder-image
use normal font weight instead of bold for image placeholders
2015-05-26 12:55:05 +02:00
Roeland Jago Douma 914c74ea9b Unit tests for #16511
Make sure that password is updated on focusout of the password field or
on pressing enter in the password field.
2015-05-22 15:09:21 +02:00
Jan-Christoph Borchardt 79c5790a72 use normal font weight instead of bold for image placeholders 2015-05-22 03:26:30 +02:00
Thomas Müller 54a6ba47c0 Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith
Remove hard coded limit of 15 from getShareWith
2015-05-19 12:40:37 +02:00
Morris Jobke 176b9674d2 Add hint about additional PHP database modules
* fixes #16391
2015-05-18 22:59:35 +02:00
Vincent Petry d15471abd4 Merge pull request #15738 from rullzer/fix_15611
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Roeland Jago Douma b090a32d23 Reset share dialog values so we start out clean
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma efd6fec57d Fix to make sure expiration date is properly set
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00
Thomas Müller 2cafbc803a Merge pull request #16242 from owncloud/use-oc-webroot
Use OC.webroot instead of calculating the URL
2015-05-15 18:10:18 +02:00
Craig Morrissey ca341a8d59 add support for limit request parameter to getShareWith 2015-05-15 18:03:18 +02:00
Lukas Reschke baa9503442 Use OC.webroot instead of calculating the URL
Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information.

Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
2015-05-11 17:01:57 +02:00
Morris Jobke de04501c97 add max-width of 600px to filepicker 2015-05-06 11:15:48 +02:00
Morris Jobke e0640a0232 Resize filepicker on window size change
* add 20 px space to each direction -> 10px padding to left, right, top and bottom
* fixes #16100
2015-05-06 11:00:23 +02:00
Morris Jobke c3fb021acf Merge pull request #16017 from owncloud/proper-update-notification
Use OC.Notification for update notifications
2015-05-06 09:28:42 +02:00
Joas Schilling 59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner
Do not restrict permissions for the original owner
2015-05-04 15:07:37 +02:00
Morris Jobke cd516eedcd Use OC.Notification for update notifications
* instead of a static rendering inside PHP use the
  JS OC.Notification.showTemporary to hide the
  notification after 7 seconds automatically
* fixes #14811
2015-05-03 17:26:03 +02:00
Jan-Christoph Borchardt 4dd8a22e51 also add title to multiselect create new element, fix #15954 2015-05-01 13:47:37 -04:00
Jan-Christoph Borchardt 3dfa05c0d0 add title to multiselect list items so longer group names are visible, fix #15819 2015-04-29 13:53:29 -04:00
Vincent Petry 93cf51389a Added unit test for reshare by share owner 2015-04-29 10:34:37 +02:00
Joas Schilling 4d53706d4c Do not restrict permissions for the original owner 2015-04-29 10:34:36 +02:00
Roeland Jago Douma b971029652 Added unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma 595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Jan-Christoph Borchardt 04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Jan-Christoph Borchardt 9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Morris Jobke 59efcb63a3 fix filepicker
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Morris Jobke 473d3e14c8 more robust share dialog 2015-04-10 09:12:37 +02:00
Vincent Petry 10ffa3b770 Merge pull request #15512 from owncloud/autoclose-settings-menu
Don't stop event execution for menu item click
2015-04-09 19:53:43 +02:00
Morris Jobke 51e4633187 Don't stop event execution for menu item click
* fixes #12326 - the settings menu is closed now, because the event is executed
2015-04-09 18:32:33 +02:00
Morris Jobke b9eaa386c4 Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
2015-04-09 14:54:57 +02:00
Joas Schilling 6f51beac23 Correctly generate the doc link via go.php 2015-04-09 12:30:18 +02:00
Joas Schilling 4a01d5c588 Fix config usage 2015-04-09 12:19:42 +02:00
Jan-Christoph Borchardt 7f237223e5 fix remote share info icon for IE8 2015-04-09 12:11:42 +02:00
Jan-Christoph Borchardt 65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Jan-Christoph Borchardt 000b09ee7a add more present info about remote shares, fix layout of inputs 2015-04-09 10:16:29 +02:00
Morris Jobke 78ec7543d5 Fix maintenance refresh interval
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
2015-04-08 18:02:00 +02:00
Joas Schilling 81ec1c8a1a Remove hardcoded link to performance docs 2015-04-07 12:25:30 +02:00
Robin McCorkell 4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Lukas Reschke 397264f361 Add more spacing to the file picker dialog
Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
2015-03-28 14:19:27 +01:00
Lukas Reschke 65202d2a18 Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.

Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Morris Jobke 5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Morris Jobke a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jan-Christoph Borchardt 701cb27a9e fix scrutinizer issues 2015-03-27 09:38:41 +01:00
Jan-Christoph Borchardt d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Robin McCorkell c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Lukas Reschke 9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Jan-Christoph Borchardt 0d3bea37c3 correct remote share hint 2015-03-26 20:30:51 +01:00
Morris Jobke 0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00
Bjoern Schiessle aab5f6b6df add remote share status to the config 2015-03-26 18:32:46 +01:00
Jan-Christoph Borchardt d32e3870d2 add hint in Share placeholder on remote share syntax 2015-03-26 18:30:55 +01:00
Jan-Christoph Borchardt e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
Jan-Christoph Borchardt d1db727d1f mock up missing elements in the tests 2015-03-26 17:13:50 +01:00
Jan-Christoph Borchardt e7dcc01017 only move dropdown triangle when navigation is opened, fix timing bug 2015-03-26 17:01:35 +01:00
Jan-Christoph Borchardt f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Jan-Christoph Borchardt 30b745fc59 reintroduce quick animation for menus 2015-03-26 11:59:30 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Vincent Petry ca6b715b31 Added ext storage mount options GUI
Added option to disable autoscan of external storages
Mount option file system scan is now an int
Move priority field to avoid undefined field in storage options

All input elements inside the storage options block get parsed into
storage options.

Moving the priority field outside prevents it to appear in the storage
config, as expected. It is still parsed by special code.
2015-03-26 11:21:03 +01:00
Jan-Christoph Borchardt 07335c844a fix log in issue, fix arrow position, make dropdown work in Firefox 2015-03-26 11:12:02 +01:00
Jan-Christoph Borchardt d7414fbf0d move triangle of apps dropdown to align with app name triangle 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt 095197d1a7 popover style for apps and user dropdown menus 2015-03-26 00:40:30 +01:00
Daniel Hansson 8ee1fa98df Don't use hardcoded date and time
Use local time instead. http://momentjs.com/
2015-03-24 13:41:55 +01:00
Daniel Hansson 946a7c3a83 Use 24h format instead of 12h format
Use correct time format in WebUI
2015-03-24 11:20:20 +01:00
Vincent Petry ce5d2ab7db Revert "Change to 24H format instead of 12H format"
This reverts commit 8279dde97a.
2015-03-24 11:08:53 +01:00
Daniel Hansson 8279dde97a Change to 24H format instead of 12H format
Update how the time shows in WebUI.

My first PR to core, woha. :)
2015-03-23 22:05:44 +01:00
Morris Jobke 10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold
unbold share email sent notification
2015-03-23 18:57:20 +01:00
Jan-Christoph Borchardt fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Jan-Christoph Borchardt 5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Vincent Petry e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework
Cleanup ext storage CRUD code, introduce storage config id
2015-03-20 14:17:32 +01:00
Joas Schilling 5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Vincent Petry ce94a998dd Use storage id + appframework for ext storage CRUD
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
2015-03-12 18:51:02 +01:00
Morris Jobke f507601e25 Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
2015-03-04 10:30:09 +01:00
Roeland Jago Douma c9272be0b9 Avatars in share dialog fixes
* 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
2015-03-03 20:57:50 +01:00
Vincent Petry b4cfc79b5a Added missing done() calls for async tests 2015-03-03 13:59:03 +01:00
Lukas Reschke bbd5f28415 Let users configure security headers in their Webserver
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.
2015-03-02 19:07:46 +01:00
Lukas Reschke 92b5517229 Use custom attribute instead of the div identifier
Otherwise problems arrive when a username contains characters such as an `@`

Fixes https://github.com/owncloud/user_shibboleth/issues/38
2015-02-27 17:38:59 +01:00
Thomas Müller f72f9e0159 Merge pull request #14530 from owncloud/revert-14403
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
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
Vincent Petry ca6f296ae0 Prevent monkey clicking on labels
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
2014-09-26 17:07:14 +02:00
Lukas Reschke 08287e2880 Add ID to markup to have the checkboxes in the right position 2014-09-26 13:46:22 +02:00
Vincent Petry 16cad5862a Added spinners in share dropdown
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
2014-09-26 13:46:22 +02:00
Vincent Petry 89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Vincent Petry e65ceb08fc Moved WebDAV and internet checks to client side JS
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server
2014-09-23 11:16:14 +02:00
Thomas Müller bb18fe1384 send browsers timezone back tp the server on login 2014-09-22 14:01:45 +02:00
Lukas Reschke fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2
Use select2 for the groups excluded from sharing in admin page
2014-09-19 16:50:56 +02:00
Lukas Reschke d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Robin McCorkell 99d41bec5d Show original path information in trashbin and sharing views
Path will only be shown if in subdirectory, not in root.
2014-09-11 15:45:42 +01:00
Vincent Petry 412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
kondou 69f2c0544e Refresh if maintenance mode is over
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.

Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Thomas Müller fd92fc7c47 Merge pull request #9753 from owncloud/filepath-css
Remove special case for css in OC.filePath
2014-09-09 13:59:19 +02:00
Lukas Reschke e3c99a8505 Add beforeeach and aftereach 2014-09-09 13:08:50 +02:00
Lukas Reschke cabd70148f Add unittest for filePath 2014-09-09 12:05:19 +02:00
Lukas Reschke e9a3b280c0 Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install
allow . in dbname on web install
2014-09-09 09:36:16 +02:00
Jörn Friedrich Dreyer d12a74e299 allow . in dbname on web install 2014-09-08 13:41:23 +02:00
kondou 2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
kondou 0f2ad9862e Initial work on shorter links 2014-09-04 15:23:53 +02:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Thomas Müller 1793e4e22b Merge pull request #10701 from owncloud/tests-momentjsinclude
Include momentjs for unit tests
2014-08-29 11:40:19 +02:00
Thomas Müller ed2424c382 Merge pull request #10637 from owncloud/fixing-js-issues
Init vars with a value if none is provided
2014-08-29 10:16:29 +02:00
Vincent Petry 8fdcbce200 Include momentjs for unit tests 2014-08-29 10:04:03 +02:00
Clark Tomlinson ba0e65753b Init vars with a value if none is provided 2014-08-28 13:53:45 -04:00
Clark Tomlinson 92685acf60 Implementing moment.js
Updating Usages

Removing unused method

Adding JS Doc
2014-08-28 09:28:45 -04:00
Georg Ehrke f82b788ba5 add moment.js 2014-08-26 17:39:15 +02:00
Vincent Petry 98d06094e7 Fix share dropdown when links are not allowed
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
2014-08-21 13:49:02 +02:00
Vincent Petry a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix
Fixed default quota field on user management page
2014-08-18 18:50:43 +02:00
Morris Jobke 5498186333 Merge pull request #10447 from owncloud/share-foldericonfix
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Vincent Petry 607ea636be Fixed folder icon update routine when share owner exists
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Vincent Petry 3c7fbbef22 Do not close container/slider when clicking on single select field 2014-08-15 12:44:00 +02:00
Thomas Müller 561f5d2d45 Adding handlebars.js 2014-08-14 10:43:10 +02:00
Arthur Schiwon 4220e0c7da it does not affect gravity on planet earth, but only for tipsy 2014-08-13 14:20:14 +02:00
Arthur Schiwon 288b6d4071 make singleselect check for gravity wish, and make it south for default quota 2014-08-12 18:04:52 +02:00
Vincent Petry 997653fd09 Replaced spaces with tabs in apps.js 2014-08-12 12:00:34 +02:00
Vincent Petry e1a47683ef Trigger events when app-settings visibility changes 2014-08-12 12:00:34 +02:00
Bjoern Schiessle 54b5cecfb8 remove 'no people found' entry 2014-08-11 16:03:47 +02:00
Vincent Petry f2001a48a4 Fixed sort algo for additional cases 2014-08-11 13:28:53 +02:00
Vincent Petry 173059f6d0 Fixed file list sorting
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Bjoern Schiessle 76ab097ee2 update unit test, min date should be always today + 1 2014-08-08 13:58:56 +02:00
Bjoern Schiessle 55a17a2b23 set minDate always to today + one day 2014-08-08 11:09:41 +02:00
Morris Jobke 8cd6f9a113 Merge pull request #10172 from owncloud/fix-8802
Use relative, human readable dates in OC.filePickers - Fixes #8802
2014-08-07 16:14:30 +02:00
Tom Needham 93ba64a69f Use human readable relative date for oc-dialog-filepickers 2014-08-07 13:40:52 +01:00
Bjoern Schiessle 41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Jan-Christoph Borchardt 79305a0476 also fix filepicker for smaller screen sizes 2014-07-31 17:35:32 +02:00
Jan-Christoph Borchardt a6484fbda9 fix yellow notification style 2014-07-30 18:02:53 +02:00
Björn Schießle 0dc649f391 Merge pull request #9758 from owncloud/share-expdatefix
Fix enforced share expiration date to be based on share time
2014-07-28 17:58:26 +02:00
Matthias Rieber 764e695cb6 use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation 2014-07-21 15:39:46 +02:00
Vincent Petry 4fea521102 Fix enforced share expiration date to be based on share time 2014-07-21 15:01:20 +02:00
Robin Appelman e7e5333b12 Remove special case for css in OC.filePath 2014-07-21 13:03:14 +02:00
Thomas Müller 7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00
Robin Appelman 6962505095 debounce the search function 2014-07-08 15:42:58 +02:00
Vincent Petry 71fe5d672e Fixed dialogs styling, reversed buttons
Default dialog button is now on the right, other one on the left.
2014-07-07 15:56:42 +02:00
Morris Jobke ae8e27cc42 fix loading spinner on ctrl click a app entry- fixes #9063 2014-07-07 10:39:48 +02:00
Jan-Christoph Borchardt a6fb8c16e6 Merge pull request #9446 from owncloud/fix-strengthify
also make strengthify transparent on setup submit - fixes #9436
2014-07-05 09:50:51 +02:00
Thomas Müller f1901cab0a update snap.js to v2.0.0-rc1 2014-07-04 15:38:35 +02:00
Morris Jobke 807766729d also make strengthify transparent on setup submit - fixes #9436 2014-07-04 14:29:12 +02:00
Jan-Christoph Borchardt fc417465c0 Merge pull request #9410 from owncloud/shareownernamewidth
Improved remote share owner display
2014-07-03 23:45:06 +02:00
Vincent Petry 91cb0a6ead Merge pull request #9402 from owncloud/sharing_improved_dialog
only show message if default expire date is enforced
2014-07-03 18:15:02 +02:00
Vincent Petry 5e4835f9e9 Improved remote share owner display
The parts of the remote share owner name is now split between user name,
domain name and root so they can be formatted / displayed differently.

The user name + domain name are displayed in the tooltip.
2014-07-03 14:15:25 +02:00
Bjoern Schiessle 79e54994f9 only show message if default expire date is enforced 2014-07-03 10:52:27 +02:00
Vincent Petry 8ef8ef1096 Fix JSHint errors in EventSource class 2014-07-02 21:35:03 +02:00
Vincent Petry 012abbad44 Fixed event source fallback after close 2014-07-02 21:34:43 +02:00
Vincent Petry 025b71d068 Use fileActionsReady to re-render sharing icons
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Jan-Christoph Borchardt 63e6495e82 make expiration message grey, less present in dropdown 2014-06-30 14:08:36 +02:00
Vincent Petry d9d816bd98 Unit tests for share dropdown with nested link share 2014-06-27 18:21:02 +02:00
Vincent Petry 0bd17eff42 Use file_source to find matching share for nested link shares 2014-06-27 17:56:09 +02:00
Jan-Christoph Borchardt b975f0e718 Merge pull request #9174 from owncloud/breadcrumbfix
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Jan-Christoph Borchardt 1dc6e1767c Merge pull request #9211 from owncloud/fix-hidden-share-button
Fix hidden share button and checkbox layout
2014-06-26 16:23:39 +02:00
Morris Jobke 3da9003426 Fix hidden share button and checkbox layout
fixes #9101
2014-06-25 16:32:24 +02:00
Vincent Petry 9de3d8225b Fix parsing URL hash when no "?" was specified 2014-06-25 12:37:11 +02:00
Vincent Petry a7e7e86df0 Test runner now loads CSS and hides testArea
- serve CSS and font files properly to make sure that measurements are
  correct for the tests that need them (breadcrumb)
- added opacity to testArea to make sure nothing is visible during
  testing
2014-06-24 16:32:18 +02:00
Vincent Petry 763d9ded1d Prevent showing the file picker twice
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +02:00
Lukas Reschke 35740cf941 Do even more sanitization 2014-06-14 20:56:54 +02:00
Morris Jobke ebbf228309 remove whitespace at end of line 2014-06-13 16:03:13 +02:00
Morris Jobke a53cfcb9d1 Migrate ´ to ' 2014-06-13 16:02:41 +02:00
Morris Jobke cedca03ef5 Remove infield label, add password icon, fix layout 2014-06-13 15:56:21 +02:00
Victor Dubiniuk 4b359ad20c Change routes. Update templates 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 218d0add36 Changes according to review 2014-06-13 15:34:52 +02:00
Victor Dubiniuk a7fbd91e53 Use appframework 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 23ed038a27 Basics 2014-06-13 15:34:51 +02:00
Vincent Petry 6a0f5cfc61 Added unit tests for heartbeat interval min/max values 2014-06-12 18:42:09 +02:00
Vincent Petry ce168c286a Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.

This fix adds a maximum ping interval of 24 hours.

Forward port of 00ec5fc193 from stable6.
2014-06-12 18:41:19 +02:00
Vincent Petry 015c5062e5 Disable snapper init for IE <= 9
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
2014-06-10 17:14:49 +02:00
Bjoern Schiessle 9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Bjoern Schiessle f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Jan-Christoph Borchardt 933c05566e Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Vincent Petry 5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt a6f9dd9c4b fix apps without app-navigation 2014-06-06 12:22:31 +02:00
Jörn Friedrich Dreyer 7c29645f22 allow apps to add translation for search result typeid 2014-06-06 11:28:43 +02:00
Vincent Petry d764aaa427 Fixed Snap mock
Also fixed JSHint errors
2014-06-06 09:55:32 +02:00
Vincent Petry b8ab77a475 Added debounce on resize 2014-06-06 09:50:46 +02:00
Morris Jobke 584c47b433 Disable snapper on bigger screens and on public/login page 2014-06-06 01:32:33 +02:00
Jan-Christoph Borchardt 9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Jan-Christoph Borchardt 96278e0201 close sidebar when switching navigation entry, except on add or change settings 2014-06-05 17:06:21 +02:00
Jan-Christoph Borchardt 86a9cb2a6b add app sidebar toggle and swipe on mobile 2014-06-05 13:19:56 +02:00
Jan-Christoph Borchardt 9e56acbdc9 add snap.js script 2014-06-05 11:52:17 +02:00
Thomas Müller 1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Vincent Petry 71b86136c2 Merge pull request #8878 from owncloud/update-checkmigrationforapps
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
Morris Jobke e186871996 fix unit test template 2014-06-05 09:46:19 +02:00
Morris Jobke e3cbcadbd8 fix first failing test 2014-06-05 00:40:15 +02:00
Vincent Petry 5b97369b00 Simulate apps database schema update on upgrade
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
2014-06-04 17:16:44 +02:00
Morris Jobke ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt 26bf64631d better loading feedback for app start, move from JS to CSS 2014-06-04 15:07:15 +02:00
Jan-Christoph Borchardt e291a04dee show loading feedback 2014-06-04 14:38:25 +02:00
Vincent Petry 52d9e313d1 Remove obsoleted code to trigger navigation menu
Now that the navigation menu is always togglable, the media query
dependent code can be removed.
2014-06-04 14:38:24 +02:00
Jan-Christoph Borchardt 19d7d87964 toggle the navigation on desktop, not only on mobile 2014-06-04 14:29:46 +02:00
Bernhard Posselt ade6ed3797 Merge pull request #8701 from owncloud/slide-up-toggle
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
Vincent Petry 07f1b263c9 Use recipient display names when updating shares in the UI
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Jan-Christoph Borchardt 6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels
Remove infieldlabels
2014-06-04 09:28:20 +02:00
icewind1991 cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Morris Jobke cea7d4961e move to updated version of placeholder 2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt 4ca665ac10 infield label removal: remove JS file and references to it 2014-06-03 15:30:09 +02:00
Thomas Müller a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
Thomas Müller 79b3558c6d Merge pull request #7151 from owncloud/user-jquery
Continuing the New User management
2014-06-03 15:04:30 +02:00
Thomas Müller d60e4b9efa remove +3 in multiselect.js 2014-06-03 12:42:36 +02:00
Robin Appelman bf9b634fd8 Trigger change event on multiselect change 2014-06-03 12:42:35 +02:00
Vincent Petry 1297b2b883 Multiple fixes to sharing overview
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Morris Jobke 5add56b6ca Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondou
Scrutinizer cleanup
2014-06-03 07:44:52 +02:00
Morris Jobke a4dd4cbb8f add info about sqlite on setup apge 2014-06-02 22:56:50 +02:00
kondou af32c67923 Fix a typo 2014-06-02 22:06:50 +02:00
Frank Karlitschek f12a5248a3 Merge pull request #8820 from owncloud/design-details
Design details
2014-06-02 21:26:43 +02:00
kondou 4257d10c2b Add some more spaces for operators 2014-06-02 21:09:41 +02:00
kondou 770382aea9 Some readability improvements 2014-06-02 21:09:41 +02:00
kondou 9bc3f3cf30 Scrutinizer cleanup 2014-06-02 21:09:41 +02:00
Morris Jobke fbe42a771f fix unit tests after introduction of animations - adds delays for click trigger 2014-06-02 18:09:41 +02:00
Vincent Petry 0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Morris Jobke dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment
Improve aligment of file size
2014-06-02 17:37:53 +02:00
Vincent Petry d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Morris Jobke de23ae735b add OC.menuSpeed to control the animation speed of menu toggle 2014-06-02 15:34:42 +02:00
Morris Jobke 5d457dafc1 display "<1 kB" for really small files
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
2014-06-02 15:33:09 +02:00
raghunayyar 72ba396905 Adds Animation to Toggling Navigation on < 768px widths 2014-06-02 15:30:39 +02:00
Arthur Schiwon 7b63c2c036 cleanup 2014-06-02 12:53:59 +02:00
Arthur Schiwon b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
Arthur Schiwon 57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
Vincent Petry 7961d4a87e Update share action text to display owner/recipients
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Vincent Petry f931df2dac Merge pull request #8718 from owncloud/share_icons_for_shared_by
add share icons for folders shared by the current user
2014-06-02 12:03:22 +02:00
Morris Jobke 27c8c87e94 Merge pull request #8187 from owncloud/escape-more-character
Also encode > and '
2014-06-02 10:59:47 +02:00
Lukas Reschke 603b6c13b4 Fix typo 2014-05-31 21:11:29 +02:00
Vincent Petry a0987ebf59 Fix undefined JS on login/setup page 2014-05-30 19:02:19 +02:00
Bjoern Schiessle 717eff22d4 add share icons for folders shared by the current user 2014-05-30 15:14:01 +02:00
Vincent Petry 66afd1aa39 Fix fileList fallback in OC.Share for outside files app
OC.Share can be used in non-files apps, so the fileList callback needs
to support that as well.
2014-05-30 10:06:30 +02:00
Vincent Petry 1d9129eac3 Sharing overview fixes and unit tests
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry c9d05c66de Fix IE8 issue when icon is not defined
Sometimes no icon file is passed to replaceSVGIcon(), it showed an error
in IE8 and broke the code flow.

This fix adds a check whether the file name is set.
2014-05-30 10:06:29 +02:00
Vincent Petry 60bcdc550e Fixed file actions for sharing views
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.

Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry 6ebc436505 Added sharing overview page (WIP)
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Lukas Reschke 705242d390 Merge pull request #8727 from owncloud/upgrade-overview
Added update overview page
2014-05-29 21:28:47 +02:00
Lukas Reschke c8b32f4309 Remove deprecated functions
This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7.

Ref c4b8bb1041
2014-05-29 17:01:30 +02:00
Lukas Reschke 360a79b8f4 Add unit tests for escapeHTML 2014-05-28 22:14:05 +02:00
Vincent Petry 7e055a9404 Fixed DOM elements, styling and code style issues
- Reduced number of DOM elements
- Also added mention of "config" backup.
2014-05-28 11:29:22 +02:00
Volkan Gezer 9c5fdc5005 add title property to share dialog 2014-05-27 22:09:55 +02:00
Vincent Petry 146583a98d Added update overview page 2014-05-27 14:53:08 +02:00
Bernhard Posselt daecf4b2c1 disable dynamic slide toggle by default and offer a way to enable it 2014-05-26 18:06:47 +02:00
Bernhard Posselt c2330e558e rename to apps.js 2014-05-26 17:31:41 +02:00
Bernhard Posselt 9112386cbf query buttons on every click to not worry about weird edge case scenarios 2014-05-24 14:28:24 +02:00
Bernhard Posselt 8a30fe8ce3 use different ns 2014-05-24 14:24:46 +02:00
Bernhard Posselt 11c5ded96c allow apps to add buttons on runtime without negatively impacting performance 2014-05-24 14:23:44 +02:00
Bernhard Posselt 41b7e4b8b8 add ; to make jshint happy 2014-05-23 21:28:34 +02:00
Bernhard Posselt 044ba97263 remove unecessary parenths 2014-05-23 19:14:28 +02:00
Bernhard Posselt db1511a11d add a slideup mechanism 2014-05-23 18:49:16 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
libasys 9e1d47bd90 Add generic 'share by link' URL generator in share.js
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
2014-05-19 13:12:59 +02:00
Morris Jobke 48977c8579 Merge pull request #7286 from owncloud/issue/4823
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Morris Jobke f633fb537f fix wrong conflict resolution 2014-05-19 01:53:20 +02:00
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