Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19058 from owncloud/multiselect-bar-style | Thomas Müller | 2015-09-18 | 1 | -1/+1 |
|\ | |||||
| * | adjust multiselect bar to controls bar, fix #18989 | Jan-Christoph Borchardt | 2015-09-15 | 1 | -1/+1 |
* | | Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db | Thomas Müller | 2015-09-18 | 8 | -1/+245 |
|\ \ | |||||
| * | | Log deleted files | Victor Dubiniuk | 2015-09-16 | 1 | -0/+4 |
| * | | Add PHPDoc | Lukas Reschke | 2015-09-16 | 2 | -2/+16 |
| * | | Updates according to review | Victor Dubiniuk | 2015-09-16 | 2 | -11/+23 |
| * | | Fix tests | Victor Dubiniuk | 2015-09-16 | 1 | -3/+6 |
| * | | Add expiration cronjob | Victor Dubiniuk | 2015-09-16 | 8 | -1/+212 |
* | | | Merge pull request #18983 from owncloud/fix_18926 | Thomas Müller | 2015-09-18 | 3 | -5/+71 |
|\ \ \ | |||||
| * | | | check for the right user if we can change his password | Bjoern Schiessle | 2015-09-14 | 3 | -5/+71 |
* | | | | Merge pull request #18679 from owncloud/add-reshare-activities | Thomas Müller | 2015-09-18 | 1 | -4/+38 |
|\ \ \ \ | |||||
| * | | | | Add reshare activities for the parent sharee and the original file owner | Joas Schilling | 2015-09-15 | 1 | -4/+38 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #18986 from owncloud/federated_capabilities | Thomas Müller | 2015-09-18 | 2 | -0/+42 |
|\ \ \ \ | |||||
| * | | | | Expose federated sharing capabilities to authenticated users | Roeland Jago Douma | 2015-09-15 | 2 | -0/+42 |
* | | | | | Merge pull request #19087 from owncloud/disable-remote-share-notifications-fo... | Thomas Müller | 2015-09-18 | 3 | -7/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Disable the remote sharing notifications until they work properly | Joas Schilling | 2015-09-17 | 3 | -2/+8 |
| * | | | | | Change the order of the buttons | Joas Schilling | 2015-09-17 | 1 | -5/+5 |
* | | | | | | Merge pull request #18724 from owncloud/expiration-cronjob | Thomas Müller | 2015-09-18 | 6 | -1/+171 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct method title. Add docblock | Victor Dubiniuk | 2015-09-16 | 2 | -2/+6 |
| * | | | | | | Postrebase cleanup | Victor Dubiniuk | 2015-09-15 | 2 | -16/+3 |
| * | | | | | | Add expiration for versions older than max | Victor Dubiniuk | 2015-09-15 | 6 | -1/+180 |
* | | | | | | | Merge pull request #19069 from owncloud/ext-s3-ceph | Thomas Müller | 2015-09-18 | 4 | -4/+124 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make AmazonS3 path style actually work | Robin McCorkell | 2015-09-16 | 1 | -1/+4 |
| * | | | | | | | AmazonS3 Ceph tests | Robin McCorkell | 2015-09-16 | 3 | -3/+120 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-18 | 10 | -0/+12 |
* | | | | | | | Merge pull request #19090 from owncloud/ext-priority-logic | Thomas Müller | 2015-09-17 | 3 | -3/+136 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Unit tests for UserGlobalStoragesService::getUniqueStorages() | Robin McCorkell | 2015-09-16 | 1 | -2/+78 |
| * | | | | | | | Fix external storage priority logic | Robin McCorkell | 2015-09-16 | 2 | -1/+58 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #19121 from owncloud/sidebar-design-details | Thomas Müller | 2015-09-17 | 3 | -23/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix sidebar Sharing layout a bit | Jan-Christoph Borchardt | 2015-09-17 | 1 | -11/+13 |
| * | | | | | | | fix sidebar Versions layout | Jan-Christoph Borchardt | 2015-09-17 | 2 | -12/+6 |
| |/ / / / / / | |||||
* | | | | | | | Add a Sabre plugin that emits an event for apps | Joas Schilling | 2015-09-17 | 2 | -2/+4 |
* | | | | | | | Merge pull request #19046 from owncloud/issue-18924-throw-error-on-invalid-page | Thomas Müller | 2015-09-17 | 2 | -30/+96 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix status code | Joas Schilling | 2015-09-15 | 2 | -18/+16 |
| * | | | | | | Throw an error when the page count or perPage setting is invalid | Joas Schilling | 2015-09-15 | 2 | -28/+96 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19108 from owncloud/ext-smb-storageconfig | Thomas Müller | 2015-09-17 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct manipulateStorageConfig parameter | Robin McCorkell | 2015-09-17 | 1 | -0/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-17 | 24 | -14/+94 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-17 | 152 | -256/+296 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #18473 from owncloud/smb-workgroup | Thomas Müller | 2015-09-16 | 1 | -0/+12 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge branch 'master' into smb-workgroup | Robin McCorkell | 2015-09-15 | 951 | -9458/+14483 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Allow domain to be specified for SMB | Robin McCorkell | 2015-08-21 | 1 | -0/+12 |
* | | | | | | Merge pull request #19048 from owncloud/details-icon | Thomas Müller | 2015-09-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add details icon for details menu item | Vincent Petry | 2015-09-15 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #19066 from owncloud/fix-new-menu-mobile | Thomas Müller | 2015-09-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix new menu not showing on mobile, fix #18879 | Jan-Christoph Borchardt | 2015-09-16 | 1 | -0/+1 |
* | | | | | | | fix accessibility of New button, use alt text instead of tooltip | Jan-Christoph Borchardt | 2015-09-16 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #18185 from owncloud/share-dialog-files-sidebar | Thomas Müller | 2015-09-16 | 6 | -137/+238 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly show sidebar when clicking on share button | Vincent Petry | 2015-09-16 | 1 | -0/+1 |
| * | | | | | | More unit tests for share dialog | Vincent Petry | 2015-09-16 | 1 | -8/+1 |