summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionSam Tuke2013-01-22331-3181/+3552
|\
| * Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-14429-5960/+7494
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2013-01-1416-45/+59
| | * [tx-robot] updated from transifexJenkins for ownCloud2013-01-1320-53/+81
| | * Correct the linkLukas Reschke2013-01-121-1/+1
| | * Merge pull request #1160 from owncloud/updateContribLukas Reschke2013-01-122-4/+55
| | |\
| | | * Updated browser logLukas Reschke2013-01-121-4/+5
| | | * Adding database to server configThomas Müller2013-01-121-1/+5
| | | * TyposLukas Reschke2013-01-111-2/+2
| | | * Add server operating system to templateLukas Reschke2013-01-111-1/+1
| | | * Add the correct link to the apps repositoryLukas Reschke2013-01-111-1/+1
| | | * Add a space behind the ####Lukas Reschke2013-01-111-4/+4
| | | * Uneeded newlineLukas Reschke2013-01-111-2/+0
| | | * Remove :Lukas Reschke2013-01-111-4/+4
| | | * Add ownCloud versionLukas Reschke2013-01-111-0/+2
| | | * Add templateLukas Reschke2013-01-111-4/+3
| | | * Create issue_template.mdLukas Reschke2013-01-111-0/+41
| | | * Fix a typoLukas Reschke2013-01-111-1/+1
| | | * Update CONTRIBUTING.mdLukas Reschke2013-01-111-5/+11
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-12263-2111/+1537
| | * | Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-112-20/+0
| | |\ \ | | | |/ | | |/|
| | | * Remove OpenID from the routerLukas Reschke2013-01-111-5/+1
| | | * Move to apps repoLukas Reschke2013-01-111-16/+0
| | * | Remove uneeded linkLukas Reschke2013-01-111-1/+0
| | * | Merge pull request #1159 from LukasReschke/masterLukas Reschke2013-01-111-0/+33
| | |\ \
| | | * | Added links to app + mirall repoLukas Reschke2013-01-111-1/+1
| | | * | Update CONTRIBUTING.mdLukas Reschke2013-01-111-5/+6
| | | * | Create CONTRIBUTING.mdLukas Reschke2013-01-111-0/+32
| | * | | Merge pull request #994 from owncloud/enhanced_multiSelectLukas Reschke2013-01-113-58/+205
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Users: Show selected groups first in list.Thomas Tanghus2012-12-211-0/+1
| | | * | multiSelect: Add sorting options.Thomas Tanghus2012-12-211-7/+42
| | | * | multiSelect: Make sure up/down classes are removed on close.Thomas Tanghus2012-12-211-4/+4
| | | * | multiSelect: Modified users.js to only update other multiSelects.Thomas Tanghus2012-12-211-2/+2
| | | * | multiSelect: Don't force popup above if there's no room for it there.Thomas Tanghus2012-12-211-1/+3
| | | * | Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_mult...Thomas Tanghus2012-12-212-55/+164
| | | |\ \
| | | | * | multiSelect.js: Give each select a unique msid to prevent double adding in us...Thomas Tanghus2012-12-042-12/+21
| | | | * | Merge branch 'fix_multiSelect' of github.com:owncloud/core into fix_multiSelectThomas Tanghus2012-12-040-0/+0
| | | | |\ \
| | | | | * | multiSelect: Added scrollbar if longer than 20em. Ref #720Thomas Tanghus2012-12-041-0/+2
| | | | | * | multiSelect: Make sure last added entry is selected and some code cleanup.Thomas Tanghus2012-12-041-31/+44
| | | | | * | Added some missing type checks.Thomas Tanghus2012-12-031-2/+2
| | | | | * | Enhanced multiSelect jquery plugin.Thomas Tanghus2012-12-032-37/+122
| | | | * | | multiSelect: Added scrollbar if longer than 20em. Ref #720Thomas Tanghus2012-12-041-0/+2
| | | | * | | multiSelect: Make sure last added entry is selected and some code cleanup.Thomas Tanghus2012-12-041-31/+44
| | | | * | | Added some missing type checks.Thomas Tanghus2012-12-041-2/+2
| | | | * | | Enhanced multiSelect jquery plugin.Thomas Tanghus2012-12-042-37/+122
| | * | | | | Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-115-0/+56
| | |\ \ \ \ \
| | | * | | | | Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
| | | * | | | | Add security section to admin menuLukas Reschke2013-01-115-0/+56
| | * | | | | | Merge pull request #1155 from owncloud/remove-setContentTypeHeaderLukas Reschke2013-01-112-2/+0
| | |\ \ \ \ \ \
| | | * | | | | | Remove setContentTypeHeader()Lukas Reschke2013-01-112-2/+0
| | | | |_|_|_|/ | | | |/| | | |