Age | Commit message (Expand) | Author |
---|---|---|
2018-12-03 | Test: fix compilaiton after merge | Olivier Goffart |
2018-12-03 | Merge branch 'readonly-restore-context-6252' into 'master' | Olivier Goffart |
2018-10-16 | Discovery: Remove stale DB entries | Olivier Goffart |
2018-08-22 | Conflicts: Rename BasePath to InitialBasePath #6709 | Christian Kamm |
2018-08-21 | Fix test link with older Qt | Olivier Goffart |
2018-08-19 | Conflict handling: add the OC-ConflictBasePath header | Olivier Goffart |
2018-05-23 | SocketAPI: Introduce conflict resolution actions #6252 | Christian Kamm |
2018-04-03 | Conflicts: Change tags to be more user friendly #6365 | Christian Kamm |
2018-02-20 | Conflicts with user name: Fix tests | Christian Kamm |
2018-02-20 | Conflicts: Add user name to conflict file name #6325 | Christian Kamm |
2018-01-19 | Sync: Deal with file/folder conflicts #6312 | Christian Kamm |
2017-12-15 | Upload conflict files #4557 | Christian Kamm |