summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| * | | | | | | | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| * | | | | | | | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| * | | | | | | | update share ownerThomas Müller2014-02-201-0/+8
| * | | | | | | | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| * | | | | | | | adding share owner information to the file listThomas Müller2014-02-202-5/+8
* | | | | | | | | Merge pull request #7554 from owncloud/issue/7304Morris Jobke2014-03-052-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix position of eye icon on database password fieldJoas Schilling2014-03-052-2/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7521 from owncloud/docstrings_2_kondouThomas Müller2014-03-052-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix some more docstringskondou2014-03-032-2/+2
* | | | | | | | | | Merge pull request #7508 from owncloud/ldap-configkeycasingVincent Petry2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed configkey casing for PostgreSQLVincent Petry2014-03-031-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuserTom Needham2014-03-041-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return 101 if user doesnt existtomneedham2014-02-181-2/+6
| * | | | | | | | | | Add displayname for adminstomneedham2014-02-181-2/+10
* | | | | | | | | | | Merge pull request #7481 from tripflex/fix_downloadlink_spacesVincent Petry2014-03-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | move replace to inside issetMyles McNamara2014-02-281-2/+2
| * | | | | | | | | | | replace spaces in download link without encoding entire URLMyles McNamara2014-02-281-0/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1
* | | | | | | | | | | | Merge pull request #7522 from owncloud/email-field-wordingRaghu Nayyar2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update wording of email fieldMorris Jobke2014-03-041-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #7497 from owncloud/add-.scrutinizer.ymlThomas Müller2014-03-031-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove duplicate rowThomas Müller2014-03-031-1/+0
| * | | | | | | | | | | | add .scrutinizer.ymlThomas Müller2014-03-031-0/+24
* | | | | | | | | | | | | Merge pull request #7453 from owncloud/preview-fileinfoVincent Petry2014-03-031-115/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cache the fileinfo in OC\PreviewRobin Appelman2014-02-271-115/+126
* | | | | | | | | | | | | | Merge pull request #7511 from owncloud/emailtemplatefixVincent Petry2014-03-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix mail template to use p() for colorsVincent Petry2014-03-031-4/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #7500 from owncloud/theme-mailtemplateFrank Karlitschek2014-03-033-9/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | make mail notification header color themableJan-Christoph Borchardt2014-03-032-2/+16
| * | | | | | | | | | | | | compress mail notification logoJan-Christoph Borchardt2014-03-031-0/+0
| * | | | | | | | | | | | | mail template: remove off-white background color to better blend into mail cl...Jan-Christoph Borchardt2014-03-031-7/+7
* | | | | | | | | | | | | | Merge pull request #7502 from jbtbnl/masterJan-Christoph Borchardt2014-03-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do not override button background imagejbtbnl2014-03-031-4/+4
* | | | | | | | | | | | | | | Merge pull request #7506 from owncloud/master-update3rdpartysubmoduleforlibxm...Vincent Petry2014-03-031-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update 3rdparty submodule pointer to include libxml fixesVincent Petry2014-03-031-0/+0
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Allow XML entity loader for MDB2 schema loaderVincent Petry2014-03-031-0/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #7482 from owncloud/reset-3rdparty-submoduleVincent Petry2014-03-031-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update 3rdparty submoduleThomas Müller2014-02-281-0/+0
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | remove remaining testing artefactArthur Schiwon2014-03-031-1/+1
* | | | | | | | | | | | intendetion. where did the whitespaces come from?Arthur Schiwon2014-03-031-2/+2
* | | | | | | | | | | | LDAP: let proxy for multiple server access methods from AccessArthur Schiwon2014-03-031-4/+13
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #7486 from owncloud/l10n_docstringsMorris Jobke2014-03-011-13/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix some docstrings in l10n.phpkondou2014-03-011-13/+15
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #7433 from owncloud/config_basic_authThomas Tanghus2014-03-012-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Config to disable basic_auth username chackingkondou2014-02-262-1/+5
* | | | | | | | | | | Merge pull request #7480 from owncloud/sabredav-1.7.11Vincent Petry2014-02-281-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update SabreDAV to 1.7.11Thomas Müller2014-02-281-0/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #7444 from owncloud/fix/7443Thomas Müller2014-02-282-23/+9
|\ \ \ \ \ \ \ \ \ \