Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22700 from owncloud/only_1_linkshare | Thomas Müller | 2016-03-01 | 3 | -0/+41 |
|\ | |||||
| * | Intergration tests | Roeland Jago Douma | 2016-03-01 | 2 | -0/+32 |
| * | For now only allow 1 link share per file/folder | Roeland Jago Douma | 2016-03-01 | 1 | -0/+9 |
* | | Merge pull request #22731 from owncloud/hide-nodes-from-listening | Thomas Müller | 2016-03-01 | 8 | -3/+499 |
|\ \ | |||||
| * | | Hides nodes from listing that the user has no access to | Lukas Reschke | 2016-02-29 | 8 | -3/+499 |
* | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset | Thomas Müller | 2016-03-01 | 9 | -22/+157 |
|\ \ \ | |||||
| * | | | Return -3 for unlimited quota | Vincent Petry | 2016-02-29 | 9 | -22/+157 |
* | | | | Merge pull request #22667 from owncloud/scrollbar | Thomas Müller | 2016-03-01 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | make scrollbar less obnoxious: tad narrower, rounded corners | Jan-Christoph Borchardt | 2016-02-26 | 1 | -1/+2 |
* | | | | | Merge pull request #22677 from owncloud/allow-to-overwrite-single-l10n-string... | Thomas Müller | 2016-03-01 | 3 | -8/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Improved JS L10N bundle merging + tests | Vincent Petry | 2016-02-29 | 2 | -3/+9 |
| * | | | | | Allow to overwrite a single language string via the theme folder | Joas Schilling | 2016-02-26 | 2 | -8/+33 |
* | | | | | | Merge pull request #22691 from owncloud/distributions-are-gone-insane-nobody-... | Thomas Müller | 2016-03-01 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix wording | Lukas Reschke | 2016-02-29 | 1 | -1/+1 |
| * | | | | | Add question from where ownCloud was enabled | Lukas Reschke | 2016-02-27 | 1 | -0/+2 |
* | | | | | | Merge pull request #22722 from owncloud/fix-personal-page | Thomas Müller | 2016-03-01 | 2 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix personal page layout for LDAP users, fix #22272 | Jan-Christoph Borchardt | 2016-02-29 | 2 | -2/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | 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 |
| |/ / / / / |/| | | | | |