Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7409 from owncloud/issue/5361 | Thomas Müller | 2014-02-26 | 1 | -2/+4 |
|\ | | | | | Add owncloud version to JS scope | ||||
| * | Add owncloud version to JS scope | Joas Schilling | 2014-02-26 | 1 | -2/+4 |
| | | | | | | | | Fix #5361 | ||||
* | | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -0/+28 |
|\ \ | |/ |/| | Add option to change email settings in admin section | ||||
| * | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 1 | -2/+2 |
| | | | | | | | | Fix #7166 | ||||
| * | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 1 | -0/+28 |
| | | | | | | | | Fix issue #7166 | ||||
* | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 | Morris Jobke | 2014-02-24 | 2 | -0/+18 |
|\ \ | | | | | | | Update page title when navigating through directories (local) | ||||
| * | | Added oc_defaults stub in specHelper.js | Vincent Petry | 2014-02-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This is needed for JS Unit tests to run properly as they are expecting the new "oc_default" map to exist. | ||||
| * | | Merge branch 'master' into GuillaumeAmat-patch-1 | Robin Appelman | 2014-02-21 | 4 | -3/+32 |
| |\ \ | |||||
| * \ \ | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵ | Vincent Petry | 2014-02-20 | 1 | -0/+17 |
| |\ \ \ | | | | | | | | | | | | | | | | GuillaumeAmat-patch-1 | ||||
| | * | | | Adds OC_Defaults values in javascript config | Guillaume AMAT | 2014-02-13 | 1 | -0/+17 |
| | | |/ | | |/| | |||||
* | | | | Merge pull request #7344 from owncloud/add-js-config-vars | icewind1991 | 2014-02-24 | 1 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | Allow apps to add/modify config js output via hook. | ||||
| * \ \ \ | Merge branch 'master' into add-js-config-vars | Robin Appelman | 2014-02-21 | 3 | -3/+31 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Allow apps to add/modify config js output via hook. | ringmaster | 2014-02-20 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-php | Morris Jobke | 2014-02-21 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | No css js delivery via php | ||||
| * \ \ \ \ | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 3 | -3/+20 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php | ||||
| * | | | | | | fixing js syntax error | Thomas Müller | 2014-02-20 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs | Morris Jobke | 2014-02-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | fix thumbnail generation for subdirectories in the conflicts dialog | ||||
| * | | | | | use directory from original instead of current dir | Jörn Friedrich Dreyer | 2014-02-21 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #7336 from owncloud/IE-wipho-viewport | icewind1991 | 2014-02-21 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix viewport size on windows phone | ||||
| * | | | | fix viewport size on windows phone | Robin Appelman | 2014-02-20 | 1 | -0/+11 |
| |/ / / | |||||
* | | | | 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 |