summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Improved JS L10N bundle merging + testsVincent Petry2016-02-292-3/+9
| * | | | | | | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-262-8/+33
* | | | | | | | Merge pull request #22691 from owncloud/distributions-are-gone-insane-nobody-...Thomas Müller2016-03-011-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix wordingLukas Reschke2016-02-291-1/+1
| * | | | | | | Add question from where ownCloud was enabledLukas Reschke2016-02-271-0/+2
* | | | | | | | Merge pull request #22722 from owncloud/fix-personal-pageThomas Müller2016-03-012-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | fix personal page layout for LDAP users, fix #22272Jan-Christoph Borchardt2016-02-292-2/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #22725 from owncloud/app-bannersThomas Müller2016-03-013-163/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | compress app banners on personal pageJan-Christoph Borchardt2016-02-293-163/+3
* | | | | | | | | Merge pull request #22727 from owncloud/decrypt_all_master_keyThomas Müller2016-03-013-27/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make decrypt all work with the master keyBjoern Schiessle2016-02-293-27/+46
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22733 from owncloud/size-propagation-new-fileThomas Müller2016-03-011-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix size propagation for new filesRobin Appelman2016-02-291-1/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22736 from owncloud/propagation-ignore-encryptionThomas Müller2016-03-012-0/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ignore encryption keys for propagationRobin Appelman2016-02-292-0/+68
| |/ / / / / / / /
* | | | | | | | | Merge pull request #22740 from owncloud/fix_resare_updatesThomas Müller2016-03-013-0/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check correct permissions when resharingRoeland Jago Douma2016-02-293-0/+41
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0124-6/+108
* | | | | | | | | Merge pull request #22707 from owncloud/use-our-public-apiThomas Müller2016-03-0115-69/+76
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*Joas Schilling2016-02-2915-69/+76
* | | | | | | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-externalThomas Müller2016-02-291-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Print docker logs to the console fro debuggingThomas Müller2016-02-241-0/+2
* | | | | | | | | | Merge pull request #22701 from owncloud/input-telThomas Müller2016-02-291-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | style telephone inputs like other typesHendrik Leppelsack2016-02-291-0/+4
* | | | | | | | | | Merge pull request #22663 from owncloud/sidebar-mobileThomas Müller2016-02-292-5/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | do not expand sidebar to full width on mobile, but up the min-width, fix #19915Jan-Christoph Borchardt2016-02-252-5/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22662 from owncloud/comments-countThomas Müller2016-02-292-5/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove comments count because it is not that relevant to show directlyJan-Christoph Borchardt2016-02-252-5/+3
* | | | | | | | | | Merge pull request #22713 from owncloud/fix-since-version-on-commentsveventThomas Müller2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix since versionJoas Schilling2016-02-291-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #22638 from owncloud/comments-db-indexesThomas Müller2016-02-292-11/+48
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | exchange user_id_key for a unique one.Arthur Schiwon2016-02-262-8/+14
| * | | | | | | | | add index definitions for comments tablesArthur Schiwon2016-02-242-11/+42
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22683 from owncloud/fix_22682Thomas Müller2016-02-293-2/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Relax rootfolder checkRoeland Jago Douma2016-02-263-2/+25
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2916-0/+34
* | | | | | | | | | Merge pull request #22673 from owncloud/fix_enforced_expire_date_settingThomas Müller2016-02-292-1/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Expiration date can only be enforced if default is enabledRoeland Jago Douma2016-02-262-1/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2864-36/+654
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2768-44/+90
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #22669 from owncloud/fix-email-formThomas Müller2016-02-261-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Email endpoint is controlled by the username setting, not passwordJoas Schilling2016-02-261-1/+1
| * | | | | | Correctly indent uneditable email/display name fieldsJoas Schilling2016-02-261-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #22660 from owncloud/fix_22656Thomas Müller2016-02-263-0/+42
|\ \ \ \ \ \
| * | | | | | Do not allow sharing of the root folderRoeland Jago Douma2016-02-253-0/+42
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \ \ \ \ \
| * | | | | | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-262-22/+43
|\ \ \ \ \ \
| * | | | | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-252-22/+43
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ \ \ \