summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-153-34/+100
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use core routes in js tooBart Visscher2012-08-151-2/+2
| | * | | | | | | | | Routing: Add some core routesBart Visscher2012-08-121-0/+19
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-271-3/+15
| * | | | | | | | | | update infieldlabel script from @zawaideh to fix autofill overlap, https://gi...Jan-Christoph Borchardt2012-10-262-140/+12
| * | | | | | | | | | closes #113Thomas Müller2012-10-261-12/+0
| * | | | | | | | | | show/hide navigation entries after enabling/disabling appRobin Appelman2012-10-261-0/+22
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-264-8/+28
* | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2558-0/+518
|\| | | | | | | | |
| * | | | | | | | | Fix not defined JS variablesLukas Reschke2012-10-251-0/+3
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2557-0/+515
* | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2461-646/+820
|\| | | | | | | | |
| * | | | | | | | | Place the brackets in the first lineLukas Reschke2012-10-243-167/+155