summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20201 from owncloud/checkboxes-groups-enableThomas Müller2015-11-032-18/+10
|\
| * Merge branch 'master' into checkboxes-groups-enableRaghu Nayyar2015-11-0230-10/+90
| |\
| * | new checkbox style in app settingsHendrik Leppelsack2015-10-312-18/+10
* | | Merge pull request #20253 from owncloud/external-storage-wordingThomas Müller2015-11-031-1/+1
|\ \ \
| * | | fix external storage wording detail, ref #19858Jan-Christoph Borchardt2015-11-031-1/+1
* | | | Merge pull request #20256 from owncloud/fix-searchbox-iceweaselMorris Jobke2015-11-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | don't validate searchboxHendrik Leppelsack2015-11-031-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0312-6/+40
* | | Merge pull request #20232 from owncloud/error-button-colorThomas Müller2015-11-021-0/+3
|\ \ \
| * | | fix button text colorJan-Christoph Borchardt2015-11-021-0/+3
| |/ /
* | | Merge pull request #20045 from owncloud/dbal-2.5.2Thomas Müller2015-11-021-0/+0
|\ \ \
| * | | Bump 3rdparty for dbal-2.5.2Roeland Jago Douma2015-11-021-0/+0
|/ / /
* | | Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead...Thomas Müller2015-11-021-9/+9
|\ \ \
| * | | Use actual mimetype detection instead of extensionLukas Reschke2015-10-311-9/+9
* | | | Merge pull request #20191 from owncloud/fix-20151Thomas Müller2015-11-025-3/+167
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix-20151blizzz2015-11-0262-28/+248
| |\ \ \ \
| * | | | | add method to count users by loginname and use it for diagnose test, fixes #2...Arthur Schiwon2015-10-305-3/+167
| | |/ / / | |/| | |
* | | | | Merge pull request #20220 from owncloud/keep-search-openThomas Müller2015-11-022-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | keep searchbox open if it is in actionHendrik Leppelsack2015-11-022-2/+3
| | |/ / | |/| |
* | | | Merge pull request #20192 from owncloud/fix-20090Thomas Müller2015-11-022-0/+12
|\ \ \ \
| * | | | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-10-302-0/+12
| | |/ / | |/| |
* | | | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibnThomas Müller2015-11-021-1/+3
|\ \ \ \
| * | | | Fix scrollto= parameter in trashbin viewJoas Schilling2015-11-021-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclickThomas Müller2015-11-023-4/+3
|\ \ \ \
| * | | | Close the user menu when clicking it againJoas Schilling2015-11-023-4/+3
| |/ / /
* | | | Merge pull request #20181 from owncloud/files-fixdownloadspinnerThomas Müller2015-11-024-3/+101
|\ \ \ \
| * | | | Fix file action download spinnerVincent Petry2015-10-304-3/+101
* | | | | Merge pull request #20189 from owncloud/use-get-http-protocolThomas Müller2015-11-023-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use getHttpProtocol instead of $_SERVERLukas Reschke2015-10-303-6/+6
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0214-10/+38
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0116-0/+52
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3118-4/+24
* | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltipThomas Müller2015-10-311-0/+1
|\ \ \
| * | | add tooltip to ldap server wizardHendrik Leppelsack2015-10-291-0/+1
* | | | Merge pull request #20193 from owncloud/redis-passwordThomas Müller2015-10-302-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add support for Redis password authLukas Reschke2015-10-302-0/+8
|/ / /
* | | Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-307-39/+0
|\ \ \
| * | | remove unneeded icons from input fields to not distract from submit button, f...Jan-Christoph Borchardt2015-10-307-39/+0
* | | | Merge pull request #20169 from RealRancor/fix_contributing_linksThomas Müller2015-10-301-2/+2
|\ \ \ \
| * | | | Fix repo links in CONTRIBUTING.mdRealRancor2015-10-301-2/+2
* | | | | Merge pull request #20171 from owncloud/tags.js-remove-unneeded-varsThomas Müller2015-10-301-9/+0
|\ \ \ \ \
| * | | | | [tags] remove unneeded variablesMorris Jobke2015-10-301-9/+0
| |/ / / /
* | | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverviewThomas Müller2015-10-302-27/+11
|\ \ \ \ \
| * | | | | Bring back delete permission in share overviewVincent Petry2015-10-292-27/+11
| | |_|_|/ | |/| | |
* | | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrievalThomas Müller2015-10-306-8/+8
|\ \ \ \ \
| * | | | | Use proper statement to retrieve the IP of an docker instanceMorris Jobke2015-10-306-8/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #20170 from owncloud/remove-some-oc_config-callsThomas Müller2015-10-303-6/+7
|\ \ \ \ \
| * | | | | Replace some OC_Config calls with ILogger methodsMorris Jobke2015-10-303-6/+7
| |/ / / /
* | | | | Merge pull request #20156 from owncloud/files-filter-triger-onceRobin Appelman2015-10-301-2/+3
|\ \ \ \ \
| * | | | | dont trigger the scroll event of every single item we filter in the file listRobin Appelman2015-10-291-2/+3