summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-058-105/+11
|\
| * Merge pull request #238 from fmms/checkstyle04Thomas Müller2012-11-041-3/+3
| |\
| | * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-041-3/+3
| * | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSessionLukas Reschke2012-11-047-102/+8
| |\ \ | | |/ | |/|
| | * Change the requesttoken back to OC.EventSource.requesttokenLukas Reschke2012-10-311-1/+1
| | * Create only one CSRF token per sessionLukas Reschke2012-10-316-101/+7
* | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-048-4/+31
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-043-1/+17
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-022-3/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-014-0/+11
* | | 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 pull request #112 from libasys/Fix-strange-Isue-IE8Thomas Tanghus2012-10-311-17/+21
| |\ \
| | * | UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form...libasys2012-10-311-4/+4
| | * | Fix for problems using for() function instead of $.each for arrays with IE8libasys2012-10-261-15/+19
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-314-1/+50
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3077-424/+438
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-306-2/+17
| | |/ | |/|
| * | Move loading setting routing to OC_RouterBart Visscher2012-10-291-2/+0
| * | Change search to use routingBart Visscher2012-10-292-1/+4
| * | Move and fix app setting navigation detectBart Visscher2012-10-291-22/+0
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2911-2/+39
| * | Try to fix shared status icons againMichael Gapczynski2012-10-281-10/+5
| * | Fix shared status iconsMichael Gapczynski2012-10-281-7/+33
| * | added some visual feedback is password was setBjörn Schießle2012-10-281-0/+1
| * | set password if user leaves password field (issue #57)Björn Schießle2012-10-281-9/+7
| * | deny the usage of dots in database nameGeorg Ehrke2012-10-281-1/+1
| * | use css to show/hide fileactionsRobin Appelman2012-10-281-3/+4
| * | ->l expects two parametersLukas Reschke2012-10-282-3/+4
| * | Revert "Fix a typo"Lukas Reschke2012-10-282-2/+2
| * | Fix a typoLukas Reschke2012-10-282-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2855-154/+48
| * | Load all apps in core share ajax file for apps to register their share backendsMichael Gapczynski2012-10-271-0/+1
| * | Fix introduced style errorsBart Visscher2012-10-272-5/+9
| * | Fix download url generationBart Visscher2012-10-271-1/+1
| * | Merge branch 'routing'Bart Visscher2012-10-2715-79/+229
| |\ \
| | * | Resetting the password should also invalidate the token login cookiesBart Visscher2012-10-171-0/+1
| | * | Change the lostpassword flow to a controllerBart Visscher2012-10-176-67/+101
| | * | Merge branch 'master' into routingBart Visscher2012-10-1753-113/+792
| | |\ \
| | * | | Implement routing on javascript sideBart Visscher2012-10-052-0/+76
| | * | | Make the core ajax calls use the routerBart Visscher2012-10-029-10/+22
| | * | | Make the settings ajax calls use the routerBart Visscher2012-10-022-14/+7
| | * | | Convert menu entries of settings pages to use routerBart Visscher2012-09-281-0/+15
| | * | | Merge branch 'master' into routingBart Visscher2012-09-284-8/+99
| | |\ \ \
| | * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-2864-233/+981
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-09-0767-181/+238
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-3013-70/+352
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2972-25/+631
| | |\ \ \ \ \ \ \