Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22725 from owncloud/app-banners | Thomas Müller | 2016-03-01 | 3 | -163/+3 |
|\ | |||||
| * | compress app banners on personal page | Jan-Christoph Borchardt | 2016-02-29 | 3 | -163/+3 |
* | | Merge pull request #22727 from owncloud/decrypt_all_master_key | Thomas Müller | 2016-03-01 | 3 | -27/+46 |
|\ \ | |||||
| * | | make decrypt all work with the master key | Bjoern Schiessle | 2016-02-29 | 3 | -27/+46 |
* | | | Merge pull request #22733 from owncloud/size-propagation-new-file | Thomas Müller | 2016-03-01 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | fix size propagation for new files | Robin Appelman | 2016-02-29 | 1 | -1/+5 |
* | | | | Merge pull request #22736 from owncloud/propagation-ignore-encryption | Thomas Müller | 2016-03-01 | 2 | -0/+68 |
|\ \ \ \ | |||||
| * | | | | ignore encryption keys for propagation | Robin Appelman | 2016-02-29 | 2 | -0/+68 |
| |/ / / | |||||
* | | | | Merge pull request #22740 from owncloud/fix_resare_updates | Thomas Müller | 2016-03-01 | 3 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | Check correct permissions when resharing | Roeland Jago Douma | 2016-02-29 | 3 | -0/+41 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-01 | 24 | -6/+108 |
* | | | | Merge pull request #22707 from owncloud/use-our-public-api | Thomas Müller | 2016-03-01 | 15 | -69/+76 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* | Joas Schilling | 2016-02-29 | 15 | -69/+76 |
* | | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-external | Thomas Müller | 2016-02-29 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Print docker logs to the console fro debugging | Thomas Müller | 2016-02-24 | 1 | -0/+2 |
* | | | | | Merge pull request #22701 from owncloud/input-tel | Thomas Müller | 2016-02-29 | 1 | -0/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | style telephone inputs like other types | Hendrik Leppelsack | 2016-02-29 | 1 | -0/+4 |
* | | | | | Merge pull request #22663 from owncloud/sidebar-mobile | Thomas Müller | 2016-02-29 | 2 | -5/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | do not expand sidebar to full width on mobile, but up the min-width, fix #19915 | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+1 |
* | | | | | Merge pull request #22662 from owncloud/comments-count | Thomas Müller | 2016-02-29 | 2 | -5/+3 |
|\ \ \ \ \ | |||||
| * | | | | | remove comments count because it is not that relevant to show directly | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+3 |
* | | | | | | Merge pull request #22713 from owncloud/fix-since-version-on-commentsvevent | Thomas Müller | 2016-02-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix since version | Joas Schilling | 2016-02-29 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #22638 from owncloud/comments-db-indexes | Thomas Müller | 2016-02-29 | 2 | -11/+48 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | exchange user_id_key for a unique one. | Arthur Schiwon | 2016-02-26 | 2 | -8/+14 |
| * | | | | | add index definitions for comments tables | Arthur Schiwon | 2016-02-24 | 2 | -11/+42 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #22683 from owncloud/fix_22682 | Thomas Müller | 2016-02-29 | 3 | -2/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Relax rootfolder check | Roeland Jago Douma | 2016-02-26 | 3 | -2/+25 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-29 | 16 | -0/+34 |
* | | | | | | Merge pull request #22673 from owncloud/fix_enforced_expire_date_setting | Thomas Müller | 2016-02-29 | 2 | -1/+17 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Expiration date can only be enforced if default is enabled | Roeland Jago Douma | 2016-02-26 | 2 | -1/+17 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-28 | 64 | -36/+654 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-27 | 68 | -44/+90 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #22669 from owncloud/fix-email-form | Thomas Müller | 2016-02-26 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Email endpoint is controlled by the username setting, not password | Joas Schilling | 2016-02-26 | 1 | -1/+1 |
| * | | | | Correctly indent uneditable email/display name fields | Joas Schilling | 2016-02-26 | 1 | -2/+2 |
* | | | | | Merge pull request #22660 from owncloud/fix_22656 | Thomas Müller | 2016-02-26 | 3 | -0/+42 |
|\ \ \ \ \ | |||||
| * | | | | | Do not allow sharing of the root folder | Roeland Jago Douma | 2016-02-25 | 3 | -0/+42 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #22671 from owncloud/issue-22670 | Thomas Müller | 2016-02-26 | 2 | -26/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Move the tag filter at the end for now | Joas Schilling | 2016-02-26 | 2 | -26/+26 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22646 from owncloud/fix_22642 | Thomas Müller | 2016-02-26 | 2 | -22/+43 |
|\ \ \ \ \ | |||||
| * | | | | | Set default expiration date if none given on share creation | Roeland Jago Douma | 2016-02-25 | 2 | -22/+43 |
* | | | | | | Merge pull request #22640 from owncloud/fix_22587 | Thomas Müller | 2016-02-26 | 2 | -0/+129 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove delete permissions for read-only federated reshares | Roeland Jago Douma | 2016-02-25 | 2 | -0/+129 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22608 from owncloud/collaborative-tags | Thomas Müller | 2016-02-26 | 3 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename system tags app to collaborative tags | Joas Schilling | 2016-02-26 | 3 | -4/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22461 from owncloud/fix_6773 | Thomas Müller | 2016-02-26 | 16 | -77/+166 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix favorite icon unit test for icon image | Vincent Petry | 2016-02-25 | 1 | -2/+4 |
| * | | | | | | Make more action icons themable + style fixes | Vincent Petry | 2016-02-25 | 6 | -24/+25 |
| * | | | | | | Close class | Roeland Jago Douma | 2016-02-25 | 1 | -1/+1 |