Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 1 | -0/+1 |
|\ | |||||
| * | Fix typo | Lukas Reschke | 2014-02-20 | 1 | -1/+1 |
| | | |||||
| * | Variable value is expected and not an echoed output | Lukas Reschke | 2014-02-20 | 1 | -1/+1 |
| | | |||||
| * | Move oc_isadmin to the config JS script | Lukas Reschke | 2014-02-20 | 2 | -1/+1 |
| | | |||||
| * | Move isadmin to template and rename it to oc_isadmin | Lukas Reschke | 2014-02-19 | 1 | -0/+1 |
| | | |||||
* | | do not show display name on mobile when profile picture is present | Jan-Christoph Borchardt | 2014-02-20 | 2 | -2/+17 |
| | | |||||
* | | move avatar into clickable area of user menu | Jan-Christoph Borchardt | 2014-02-20 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #7243 from owncloud/core-sessionlifetimedefault | Thomas Müller | 2014-02-18 | 1 | -1/+1 |
|\ | | | | | Now using PHP session lifetime as default value for the JS config | ||||
| * | Now using PHP session lifetime as default value for the JS config | Vincent Petry | 2014-02-17 | 1 | -1/+1 |
| | | | | | | | | | | This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly. | ||||
* | | Do not select input for all text input fields | Joas Schilling | 2014-02-07 | 1 | -4/+0 |
|/ | | | | Fix issue #6920 | ||||
* | Merge pull request #7067 from owncloud/core-sessionheartbeatconfig | Vincent Petry | 2014-02-05 | 4 | -16/+135 |
|\ | | | | | Core sessionheartbeatconfig | ||||
| * | fixing typos | Thomas Müller | 2014-02-04 | 1 | -2/+2 |
| | | |||||
| * | Added unit tests for session_keepalive / heartbeat | Vincent Petry | 2014-02-04 | 2 | -1/+91 |
| | | |||||
| * | Added session_keepalive setting | Vincent Petry | 2014-02-04 | 2 | -15/+44 |
| | | | | | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value. | ||||
* | | Merge pull request #6969 from owncloud/tests-morecoverage | Thomas Müller | 2014-02-04 | 2 | -24/+118 |
|\ \ | |/ |/| | Fixed unit test scripts + coverage | ||||
| * | Added core unit tests for basename and dirname | Vincent Petry | 2014-01-30 | 1 | -0/+99 |
| | | | | | | | | | | Note that it doesn't work 100% like the PHP functions so the tests have TODO comments to fix those core functions eventually. | ||||
| * | Fixed unit test scripts + coverage | Vincent Petry | 2014-01-30 | 1 | -24/+19 |
| | | | | | | | | | | Tried to add more apps (others break). "preprocessors" is now populated automatically based on the tested apps. | ||||
* | | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink | Morris Jobke | 2014-01-29 | 2 | -0/+71 |
|\ \ | | | | | | | Sharing fixfiledownloadlink | ||||
| * | | Fixed download URL in public page | Vincent Petry | 2014-01-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | - Refactored download URL building to make it overridable - Added download URL override in public page - Added JS unit tests for download URL - Added OC.redirect() method to facilitate unit testing | ||||
| * | | Added OC.buidQueryString() utility function | Vincent Petry | 2014-01-24 | 2 | -0/+65 |
| |/ | | | | | | | | | Makes it possible to create query strings by passing a JavaScript hash map and automatically encodes the keys and values. | ||||
* | | Merge pull request #6905 from owncloud/add_expiredate_to_linkshare | Vincent Petry | 2014-01-24 | 1 | -1/+5 |
|\ \ | |/ |/| | add expire date to link share if possible | ||||
| * | add expire date to link share if possible | Bjoern Schiessle | 2014-01-24 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #6736 from owncloud/tests-jsunittests | Thomas Müller | 2014-01-23 | 5 | -2/+4482 |
|\ \ | |/ |/| | Added Javascript unit tests | ||||
| * | Added Javascript unit tests | Vincent Petry | 2014-01-16 | 5 | -2/+4482 |
| | | | | | | | | | | | | | | - added karma utility to run jasmine unit tests - added Sinon library (for stubs/mocks/fakeserver) - added a few unit tests for core and files - added autotest-js.sh script | ||||
* | | Merge pull request #6721 from tsumi/patch-1 | Morris Jobke | 2014-01-18 | 1 | -0/+3 |
|\ \ | | | | | | | Added SVG fallback to apps settings popup | ||||
| * | | Useless else removed | tsumi | 2014-01-15 | 1 | -2/+0 |
| | | | | | | | | | As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922 | ||||
| * | | Added SVG fallback to apps settings popup | tsumi | 2014-01-10 | 1 | -0/+5 |
| | | | | | | | | | | | | This fix issue of calendar app with IE8, see issue report for details: https://github.com/owncloud/calendar/issues/291 | ||||
* | | | Indicate password strength using strengthify | Morris Jobke | 2014-01-15 | 1 | -6/+16 |
| |/ |/| | | | | | | | | | | | | | | | | | | | * uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29 | ||||
* | | Fixed various file name escaping issues in core apps | Vincent Petry | 2014-01-10 | 1 | -3/+7 |
|/ | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes | ||||
* | Merge pull request #6031 from s0taka/master | Morris Jobke | 2014-01-05 | 1 | -1/+4 |
|\ | | | | | No decimal points for Kilobyte and Byte #5371. | ||||
| * | spaces to tabs | Simon Könnecke | 2013-12-18 | 1 | -1/+1 |
| | | |||||
| * | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #6431 from owncloud/core-pluraltranslationsfix | Thomas Müller | 2013-12-18 | 1 | -4/+8 |
|\ \ | | | | | | | Added plural translation fallback | ||||
| * | | Fixed JS plural function to be per app | Vincent Petry | 2013-12-16 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | Some apps might not define the same "nplural" value. To avoid conflicts, the plural function is now generated per app. Fixes #6427 | ||||
* | | | Merge pull request #6386 from ↵ | Frank Karlitschek | 2013-12-17 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb | ||||
| * | | always show home breadcrumb in files view | Bjoern Schiessle | 2013-12-16 | 1 | -4/+4 |
| | | | |||||
* | | | Fix webroot for update page | Vincent Petry | 2013-12-13 | 1 | -1/+8 |
|/ / | | | | | | | | | | | | | | | | | On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere. | ||||
* | | fix plural translation - fixes #6226 | Morris Jobke | 2013-12-07 | 1 | -1/+1 |
| | | |||||
* | | Slide duration set to 200ms for multiselect (same duration as user menu) | unknown | 2013-12-05 | 1 | -6/+7 |
| | | |||||
* | | Revert "Merge pull request #6210 from owncloud/fix-5865" | Morris Jobke | 2013-12-05 | 1 | -14/+13 |
| | | | | | | | | | | This reverts commit f12363d90b31e03a9f2e95911dda54af728a2df6, reversing changes made to eba35d28cd974507f9e81e15430d3d33dbbd9973. | ||||
* | | Changed duration of slideDown, slideUp and fadeOut to 200ms | unknown | 2013-12-05 | 1 | -13/+14 |
| | | |||||
* | | Show stars as placeholder | ganomi | 2013-11-26 | 1 | -1/+1 |
| | | |||||
* | | Translate reload message after update | Morris Jobke | 2013-11-26 | 1 | -1/+1 |
|/ | | | | fixes #6064 | ||||
* | Check which permissions are possible to re-share a file | Bjoern Schiessle | 2013-11-18 | 1 | -1/+16 |
| | |||||
* | Fixed multiselect to not set the button's height on itself after select | Vincent Petry | 2013-11-14 | 1 | -2/+0 |
| | | | | Fixes #5841 | ||||
* | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 1 | -3/+3 |
|\ | | | | | Append file etag to preview URLs | ||||
| * | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -3/+3 |
| | | | | | | | | Fixes #5534 | ||||
* | | Fixed input field and tipsy positioning in singleselect | Vincent Petry | 2013-10-31 | 1 | -4/+3 |
| | | | | | | | | | | | | If the user scrolls or the window is resized, the formerly cached offset was wrong. This fix makes sure the offset is re-read before showing the input field. | ||||
* | | Improve quota input field | Vincent Petry | 2013-10-30 | 1 | -1/+14 |
| | | | | | | | | | | | | - Added tooltip with examples - The quota value returned by the server is now displayed after update - Fixes #5346 | ||||
* | | allow to share a file/folder as public link also if one of it parents was ↵ | Bjoern Schiessle | 2013-10-30 | 1 | -2/+4 |
| | | | | | | | | already shared as link |