summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1545 from owncloud/fix-oc_webrootThomas Müller2013-02-091-1/+3
|\
| * fix-oc_webrootBart Visscher2013-02-081-1/+3
* | attach handlers to document instead of filelist, minor whitespace cleanupsJörn Friedrich Dreyer2013-02-081-60/+71
|/
* Fill oc_webroot with the expected valueBart Visscher2013-02-071-0/+1
* Fix disabling setup form on submitBart Visscher2013-02-071-5/+3
* Define the variables that are expected to exist but won't be set in setupBart Visscher2013-02-071-0/+3
* Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-032-15/+15
|\
| * Merge branch 'master' into from_live_to_onThomas Mueller2013-01-311-0/+1
| |\
| * | attach to filelist which is present on .ready()Jörn Friedrich Dreyer2013-01-301-13/+13
| * | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-302-15/+15
* | | Password Toggle Support for Loginraghunayyar2013-02-031-0/+1
* | | fix breadcrumbs for gallery and texteditorRobin Appelman2013-02-011-1/+0
* | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-311-0/+1
|\ \ \ | | |/ | |/|
| * | use the same tooltip as for the password fieldBjörn Schießle2013-01-311-0/+1
| |/
* | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-301-12/+29
|\|
| * Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-9/+9
| |\
| | * use display name to show share_width and owner informationBjörn Schießle2013-01-251-9/+9
| * | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| * | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| * | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-283-4/+31
| |\ \
| * | | Permanently display shared status iconsMichael Gapczynski2013-01-261-3/+16
* | | | merge stylesJan-Christoph Borchardt2013-01-289-776/+14993
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into updater-CSPThomas Mueller2013-01-284-14/+52
| |\ \ \
| | * \ \ Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-3/+7
| | |\ \ \
| | | * | | Fix undefined variableLukas Reschke2013-01-261-3/+7
| | | |/ /
| | * / / Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-261-1/+1
| | |/ /
| | * | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-9/+44
| | |\ \
| | | * | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-191-2/+5
| | | * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-182-59/+181
| | | |\ \
| | | * | | displaying notification now centeredThomas Mueller2013-01-111-2/+2
| | | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-112-4/+11
| | | |\ \ \
| | | * | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| | | * | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| | | * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-061-3/+3
| | | |\ \ \ \
| | | * | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-041-0/+30
| * | | | | | | Move update inline JSLukas Reschke2013-01-251-0/+24
| |/ / / / / /
| * | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-251-0/+21
| |\ \ \ \ \ \
| | * | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
| | | |_|_|_|/ | | |/| | | |
| * | | | | | This breaks the installationLukas Reschke2013-01-251-4/+5
| * | | | | | update to jquery-ui 1.10.0Thomas Mueller2013-01-232-761/+14850
| * | | | | | Merge master...Lukas Reschke2013-01-231-1/+1
| |\| | | | |
| | * | | | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-221-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-071-1/+1
| | | | |/ / | | | |/| |
| * | | | | Move timezone check to external JSLukas Reschke2013-01-211-0/+4
| * | | | | Move requesttoken to oc-requesttoken.jsLukas Reschke2013-01-212-7/+5
| * | | | | Move config to core/js/config.phpLukas Reschke2013-01-211-0/+42
| |/ / / /
| * | | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-161-7/+2
* | | | | merge master into navigationJan-Christoph Borchardt2013-01-154-68/+215
|\| | | |
| * | | | Merge pull request #994 from owncloud/enhanced_multiSelectLukas Reschke2013-01-111-52/+179
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | multiSelect: Add sorting options.Thomas Tanghus2012-12-211-7/+42