summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Fix copy/paste errorThomas Tanghus2014-03-101-1/+1
* Add function remove() to OC.localeStorageThomas Tanghus2014-03-101-0/+3
* Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-061-0/+7
|\
| * Added testArea for JS Unit testsVincent Petry2014-03-061-0/+7
* | Revert "adding new javascript function OC.generateUrl(url, params)"Morris Jobke2014-03-061-24/+0
* | Merge pull request #7579 from owncloud/introduce-generateUrl-masterMorris Jobke2014-03-062-0/+33
|\ \
| * | adding js unit tests for OC.generateUrl()Thomas Müller2014-03-061-0/+9
| * | adding new javascript function OC.generateUrl(url, params)Thomas Müller2014-03-061-0/+24
| |/
* | Merge branch 'master' into fix-7307Thomas Müller2014-03-062-2/+4
|\|
| * fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-052-15/+15
| * Fix position of eye icon on database password fieldJoas Schilling2014-03-051-0/+2
* | Removed obsolete OC.Router stubs in specHelperVincent Petry2014-03-051-10/+0
* | fixing js unit testsThomas Müller2014-03-053-11/+5
* | adding JSDoc + remove unused functionThomas Müller2014-03-021-5/+8
* | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-024-116/+55
|/
* Merge pull request #7409 from owncloud/issue/5361Thomas Müller2014-02-261-2/+4
|\
| * Add owncloud version to JS scopeJoas Schilling2014-02-261-2/+4
* | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-0/+28
|\ \ | |/ |/|
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-2/+2
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-0/+28
* | 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