summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1154 from owncloud/remove-uneededFileFrank Karlitschek2013-01-111-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove uneeded fileLukas Reschke2013-01-111-1/+0
|/ / / / /
* / / / / Correct link to the bugtracker in exception.phpLukas Reschke2013-01-111-1/+1
|/ / / /
* | | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-102-113/+519
|\ \ \ \
| * | | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-092-113/+519
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1162-593/+792
* | | | | Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-103-0/+79
|\ \ \ \ \
| * | | | | webdav returns "503 Service Unavailable" in case the ownCloud server is curre...Thomas Mueller2013-01-093-0/+79
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-10144-523/+1543
* | | | | | Merge pull request #1131 from owncloud/more_translationsLukas Reschke2013-01-092-5/+6
|\ \ \ \ \ \
| * | | | | | more translationsJörn Friedrich Dreyer2013-01-092-5/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1124 from schiesbn/sabredav2Lukas Reschke2013-01-092-174/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Upstream merged my patch to add additional ssl root certificates to the webda...Björn Schießle2013-01-082-174/+1
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-09132-2707/+2951
* | | | | Merge pull request #938 from owncloud/fix_minor_files_annoyancesThomas Tanghus2013-01-087-57/+84
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fixing string concatenation in javascriptThomas Mueller2013-01-081-1/+1
| * | | | ie8 ignores rgba, show button border in ie8 by adding second border css rowJörn Friedrich Dreyer2013-01-071-1/+1
| * | | | attach max upload tipsy to div instead of a to fix tooltip not showing due to...Jörn Friedrich Dreyer2013-01-073-4/+8
| * | | | remove aborted uploadsJörn Friedrich Dreyer2013-01-071-0/+3