summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-2949-938/+938
* Merge branch 'master' into updater-CSPThomas Mueller2013-01-2816-135/+277
|\
| * Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-3/+7
| |\
| | * Fix undefined variableLukas Reschke2013-01-261-3/+7
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+20
| * | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
| |\ \
| | * | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | |/
| * / [tx-robot] updated from transifexJenkins for ownCloud2013-01-276-79/+148
| |/
| * Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-263-11/+50
| |\
| | * 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-1867-361/+322
| | |\
| | * | pin notification to the topThomas Mueller2013-01-111-1/+1
| | * | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| | * | displaying notification now centeredThomas Mueller2013-01-113-4/+8
| | * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1121-124/+143
| | |\ \
| | * | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-1/+100
| | |\ \ \
| | * | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| | * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-065-7/+134
| | |\ \ \ \
| | * | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-041-0/+30
| * | | | | | Merge pull request #1306 from owncloud/smart-app-bannerThomas Müller2013-01-262-0/+2
| |\ \ \ \ \ \
| | * | | | | | add smart app banner to promote ios appGeorg Ehrke2013-01-252-0/+2
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-262-39/+48
* | | | | | | | Move update inline JSLukas Reschke2013-01-252-27/+25
|/ / / / / / /
* | | | | | | Use black background imagesLukas Reschke2013-01-251-1/+1
* | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-252-1/+28
|\ \ \ \ \ \ \
| * | | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
| |/ / / / / /
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-241-1/+7
* | | | | | | This breaks the installationLukas Reschke2013-01-251-4/+5
* | | | | | | update to jquery-ui 1.10.0Thomas Mueller2013-01-2317-1123/+16024
* | | | | | | Fix merge conflictLukas Reschke2013-01-231-12/+0
* | | | | | | Fix merge conflictLukas Reschke2013-01-231-8/+0
* | | | | | | Merge master...Lukas Reschke2013-01-236-3/+55
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-233-2/+34
| * | | | | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-223-3/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-072-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-073-3/+1
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-224-4/+8
|\| | | | | | |
| * | | | | | | Fix scrolling of leftcontentRobin Appelman2013-01-211-1/+1
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-203-3/+7
* | | | | | | | Move timezone check to external JSLukas Reschke2013-01-212-6/+5
* | | | | | | | Move requesttoken to oc-requesttoken.jsLukas Reschke2013-01-212-7/+5
* | | | | | | | Move config to core/js/config.phpLukas Reschke2013-01-214-34/+45
* | | | | | | | Add a route to the JS configLukas Reschke2013-01-201-0/+3
|/ / / / / / /
* | | | | | / Sanitize the exceptionLukas Reschke2013-01-191-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-182-2/+4
* | | | | | dont show horizontal scrollbarBernhard Posselt2013-01-161-1/+1
* | | | | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-163-10/+8
* | | | | | Spaces to tabsBart Visscher2013-01-161-43/+43
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-162-1/+15