summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-242-0/+18
|\
| * Added oc_defaults stub in specHelper.jsVincent Petry2014-02-241-0/+1
| * Merge branch 'master' into GuillaumeAmat-patch-1Robin Appelman2014-02-214-3/+32
| |\
| * \ Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa...Vincent Petry2014-02-201-0/+17
| |\ \
| | * | 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
|\ \ \ \
| * \ \ \ 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
|\ \ \ \ \
| * \ \ \ \ 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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 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 configVincent Petry2014-02-171-1/+1
| |/
* / Do not select input for all text input fieldsJoas Schilling2014-02-071-4/+0
|/
* Merge pull request #7067 from owncloud/core-sessionheartbeatconfigVincent Petry2014-02-054-16/+135
|\
| * 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
* | Merge pull request #6969 from owncloud/tests-morecoverageThomas Müller2014-02-042-24/+118
|\ \ | |/ |/|
| * Added core unit tests for basename and dirnameVincent Petry2014-01-301-0/+99
| * Fixed unit test scripts + coverageVincent Petry2014-01-301-24/+19
* | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlinkMorris Jobke2014-01-292-0/+71
|\ \
| * | Fixed download URL in public pageVincent Petry2014-01-241-0/+6
| * | Added OC.buidQueryString() utility functionVincent Petry2014-01-242-0/+65
| |/
* | Merge pull request #6905 from owncloud/add_expiredate_to_linkshareVincent Petry2014-01-241-1/+5
|\ \ | |/ |/|
| * 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 testsVincent Petry2014-01-165-2/+4482
* | Merge pull request #6721 from tsumi/patch-1Morris Jobke2014-01-181-0/+3
|\ \
| * | Useless else removedtsumi2014-01-151-2/+0
| * | Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
* | | Indicate password strength using strengthifyMorris Jobke2014-01-151-6/+16
| |/ |/|
* | Fixed various file name escaping issues in core appsVincent Petry2014-01-101-3/+7
|/
* Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-051-1/+4
|\
| * spaces to tabsSimon Könnecke2013-12-181-1/+1
| * No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-251-1/+4
* | Merge pull request #6431 from owncloud/core-pluraltranslationsfixThomas Müller2013-12-181-4/+8
|\ \
| * | Fixed JS plural function to be per appVincent Petry2013-12-161-4/+8