summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7409 from owncloud/issue/5361Thomas Müller2014-02-261-2/+4
|\ | | | | Add owncloud version to JS scope
| * Add owncloud version to JS scopeJoas Schilling2014-02-261-2/+4
| | | | | | | | Fix #5361
* | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-0/+28
|\ \ | |/ |/| Add option to change email settings in admin section
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-2/+2
| | | | | | | | Fix #7166
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-0/+28
| | | | | | | | Fix issue #7166
* | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-242-0/+18
|\ \ | | | | | | Update page title when navigating through directories (local)
| * | Added oc_defaults stub in specHelper.jsVincent Petry2014-02-241-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-1Robin Appelman2014-02-214-3/+32
| |\ \
| * \ \ Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵Vincent Petry2014-02-201-0/+17
| |\ \ \ | | | | | | | | | | | | | | | GuillaumeAmat-patch-1
| | * | | Adds OC_Defaults values in javascript configGuillaume AMAT2014-02-131-0/+17
| | | |/ | | |/|
* | | | Merge pull request #7344 from owncloud/add-js-config-varsicewind19912014-02-241-3/+6
|\ \ \ \ | | | | | | | | | | Allow apps to add/modify config js output via hook.
| * \ \ \ Merge branch 'master' into add-js-config-varsRobin Appelman2014-02-213-3/+31
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Allow apps to add/modify config js output via hook.ringmaster2014-02-201-3/+6
| | | | |
* | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-phpMorris Jobke2014-02-211-3/+3
|\ \ \ \ \ | | | | | | | | | | | | No css js delivery via php
| * \ \ \ \ Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-213-3/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-211-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php
| * | | | | | fixing js syntax errorThomas Müller2014-02-201-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirsMorris Jobke2014-02-211-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fix thumbnail generation for subdirectories in the conflicts dialog
| * | | | | use directory from original instead of current dirJörn Friedrich Dreyer2014-02-211-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #7336 from owncloud/IE-wipho-viewporticewind19912014-02-211-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | fix viewport size on windows phone
| * | | | fix viewport size on windows phoneRobin Appelman2014-02-201-0/+11
| |/ / /
* | | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-211-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix typoLukas Reschke2014-02-201-1/+1
| | | |
| * | | Variable value is expected and not an echoed outputLukas Reschke2014-02-201-1/+1
| | | |
| * | | Move oc_isadmin to the config JS scriptLukas Reschke2014-02-202-1/+1
| | | |
| * | | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-191-0/+1
| |/ /
* | | do not show display name on mobile when profile picture is presentJan-Christoph Borchardt2014-02-202-2/+17
| | |
* | | move avatar into clickable area of user menuJan-Christoph Borchardt2014-02-201-1/+3
|/ /
* | Merge pull request #7243 from owncloud/core-sessionlifetimedefaultThomas Müller2014-02-181-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 configVincent Petry2014-02-171-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 fieldsJoas Schilling2014-02-071-4/+0
|/ | | | Fix issue #6920
* Merge pull request #7067 from owncloud/core-sessionheartbeatconfigVincent Petry2014-02-054-16/+135
|\ | | | | Core sessionheartbeatconfig
| * fixing typosThomas Müller2014-02-041-2/+2
| |
| * Added unit tests for session_keepalive / heartbeatVincent Petry2014-02-042-1/+91
| |
| * Added session_keepalive settingVincent Petry2014-02-042-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-morecoverageThomas Müller2014-02-042-24/+118
|\ \ | |/ |/| Fixed unit test scripts + coverage
| * Added core unit tests for basename and dirnameVincent Petry2014-01-301-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 + coverageVincent Petry2014-01-301-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-fixfiledownloadlinkMorris Jobke2014-01-292-0/+71
|\ \ | | | | | | Sharing fixfiledownloadlink
| * | Fixed download URL in public pageVincent Petry2014-01-241-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 functionVincent Petry2014-01-242-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_linkshareVincent Petry2014-01-241-1/+5
|\ \ | |/ |/| add expire date to link share if possible
| * add expire date to link share if possibleBjoern Schiessle2014-01-241-1/+5
| |
* | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-235-2/+4482
|\ \ | |/ |/| Added Javascript unit tests
| * Added Javascript unit testsVincent Petry2014-01-165-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-1Morris Jobke2014-01-181-0/+3
|\ \ | | | | | | Added SVG fallback to apps settings popup
| * | Useless else removedtsumi2014-01-151-2/+0
| | | | | | | | | As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
| * | Added SVG fallback to apps settings popuptsumi2014-01-101-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 strengthifyMorris Jobke2014-01-151-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 appsVincent Petry2014-01-101-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