summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-183-0/+33
* Merge pull request #420 from libasys/bugfix-shareThomas Müller2012-11-171-1/+3
|\
| * If you using the sharing by link the array monthNames don't exist and causes ...libasys2012-11-141-1/+3
* | Merge pull request #495 from owncloud/fix_issue_262Thomas Müller2012-11-171-1/+1
|\ \
| * | Fix lostpassword url generationBart Visscher2012-11-161-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-175-17/+66
|/ /
* | Merge pull request #454 from Raydiation/masterThomas Müller2012-11-151-2/+7
|\ \
| * | removed unneeded callback checks in routes_request that could potentially failBernhard Posselt2012-11-151-4/+0
| * | fixed: this.routes_request is a deferred/promiseBernhard Posselt2012-11-151-5/+1
| * | instead of warning via popup, write to console.warnBernhard Posselt2012-11-151-1/+1
| * | Prevent ajax race conditions when using routes by offering a callback that is...Bernhard Posselt2012-11-151-2/+15
* | | Merge pull request #458 from owncloud/js_console_switchThomas Tanghus2012-11-154-0/+19
|\ \ \
| * | | Very simple js console switcher.Thomas Tanghus2012-11-154-0/+19
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2012-11-168-0/+64
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1549-97/+50
* | Revert "Prevent ajax race conditions when using routes by offering a callback...Bernhard Posselt2012-11-141-15/+2
* | Prevent ajax race conditions when using routes by offering a callback that is...Bernhard Posselt2012-11-141-2/+15
|/
* Merge pull request #402 from zimba12/masterThomas Müller2012-11-141-6/+7
|\
| * fix translation issues with previous commitAlessandro Cosentino2012-11-131-3/+3
| * uncomment hours entries in relative date functionsAlessandro Cosentino2012-11-131-6/+7
* | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
* | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
|/
* Merge pull request #41 from owncloud/vcategories_dbThomas Tanghus2012-11-139-67/+293
|\
| * Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-132-4/+4
| |\
| * \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-121-0/+53
| |\ \
| * \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1145-5/+487
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-072-1/+26
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-061-0/+2
| |\ \ \ \ \
| * | | | | | VCategories: Closing brace must be on a line by itself.Thomas Tanghus2012-11-051-2/+2
| * | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+4
| * | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+3
| * | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-058-105/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-048-4/+31
| |\ \ \ \ \ \ \
| * | | | | | | | VCategories: Use correct variable.Thomas Tanghus2012-11-041-1/+1
| * | | | | | | | Update vcategories ajax scripts.Thomas Tanghus2012-11-013-9/+2
| * | | | | | | | Add routes for vcategory favorites.Thomas Tanghus2012-11-011-0/+6
| * | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-315-18/+71
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3077-424/+438
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2558-0/+518
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2461-646/+820
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-234-2/+141
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2215-35/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added type and callback arguments to most methods.Thomas Tanghus2012-10-221-46/+95
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-1912-3/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add wait state to category dialog while processing.Thomas Tanghus2012-10-191-11/+39
| * | | | | | | | | | | | | | | app !== typeThomas Tanghus2012-10-191-1/+0
| * | | | | | | | | | | | | | | More js updates for app/type in OCCategoriesThomas Tanghus2012-10-191-11/+11
| * | | | | | | | | | | | | | | Use get for loading dialog.Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-1930-133/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Updated category js for handling favorites and use post instead of get.Thomas Tanghus2012-10-191-18/+43