summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | | | | | | Added ajax files for favorite category handling.Thomas Tanghus2012-10-193-0/+113
| * | | | | | | | | | | | | | | | Updated category ajax files to use type instead of app and add callCheck.Thomas Tanghus2012-10-193-25/+35
* | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-141-10/+10
* | | | | | | | | | | | | | | | | Use util function to protect datadirectory in setupBart Visscher2012-11-131-3/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-132-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #157 from owncloud/setupBart Visscher2012-11-121-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Separate control code from class definitionBart Visscher2012-10-301-0/+53
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-112-5/+9
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-102-0/+11
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-091-1/+55
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0943-0/+409
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-081-0/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Moved relative_modified_date from file/js to core/jsAlessandro Cosentino2012-11-061-0/+24
* | | | | | | | | | | | | fix human filesize column headerJörn Friedrich Dreyer2012-11-061-1/+1
* | | | | | | | | | | | | Merge pull request #265 from owncloud/fix-button-img-cursorThomas Müller2012-11-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |