haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Collabora Online is a collaborative online office suite based on LibreOffice technology. This is also the source for the Collabora Office apps for iOS and Android.
15,690 Commits
477 Branches
566 Tags
307 MiB
JavaScript 39.7%
C++ 38.7%
TypeScript 8.7%
CSS 4.1%
HTML 2.3%
Other 6.3%
 
 
 
 
 
 
Go to file
Mike Kaganski c13fa52613 Use custom local branch name as explicit remote user branch name for PR 
In a scenario where onee has several parallel PRs, one needs to use
several local branches, and when updating PRs, _needs to provide PR
branch name explicitly_ each time (my-PR-name-* in the example):

  git checkout featureFoo
  [ edit session ]
  git commit
  ./g review my-PR-name-1
  git checkout featureBar
  [ edit session ]
  git commit
  ./g review my-PR-name-2

This changes the processing, so that when the user's local branch name
is different from the tracked branch name, it is treated as if user
used that name explicitly in a call:

  git checkout -b featureFoo origin/master
  git checkout -b featureBar origin/distro/collabora/co-6-4
  [ ... ]
  git checkout featureFoo
  [ edit session ]
  git commit
  ./g review # this uses "featureFoo" as implicit second argument
  git checkout featureBar
  [ edit session ]
  git commit
  ./g review # this uses "featureBar" as implicit second argument

so no need to remember which PR name was used where.
This only works for local branch names that are not equal to a remote
branch name, or to the last part (after last /) of any distro branch.

Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: I8b95f92f6e205e3c93ef30f4813f3549c2315872
 		2021-07-16 08:53:58 +02:00
.git-hooks git-hooks: pre-commit: clean up not needed tweak of the perl library path 2021-07-12 19:47:59 +03:00
.github Add welcome messages for pull requests 2021-07-14 15:13:10 +03:00
.gitpod-files Add default vscode settings for Gitpod 2021-07-13 12:38:31 +03:00
android android: Implemented conversion to odf format for plain/text types 2021-07-12 20:35:51 +03:00
common log: don't try to get the channel of a non-existing logger 2021-07-15 09:01:16 +02:00
cypress_test cypress: make some tests more stable 2021-07-16 12:23:17 +05:30
debian deb: revert systemplate compatibility checks, they don't work well in postinstall script 2021-05-18 15:39:56 +02:00
docker docker: install libnss3 on aarch64 2021-04-06 13:39:30 +02:00
etc change product name 2020-10-02 14:18:28 +02:00
fuzzer log: don't try to get the channel of a non-existing logger 2021-07-15 09:01:16 +02:00
gtk gtk: always include config.h first 2021-06-19 17:44:59 -04:00
ios Guard against REMOVE messages for data: URLs for tunnelled dialogs in iOS app 2021-06-11 14:07:06 +03:00
kit kit: add payload to 'statusindicatorstart' 2021-07-15 15:21:24 +02:00
kubernetes/helm kubernetes: use consistent hash in haproxy 2021-05-25 15:27:00 +05:30
loleaflet moved initializing fontcombobox with select2 to Toolbar.js 2021-07-15 21:15:00 +03:00
man Fix typos 2020-10-07 12:51:08 +02:00
net http response: check if result would fit into chunkLen 2021-07-08 14:51:11 +02:00
scripts scripts/refresh-git-hooks: Create hooks dir before making links. 2021-05-10 09:19:13 +02:00
test Rename fileId to redirectionCount 2021-07-12 08:44:39 +02:00
tools wsd: separate client SSL context from the server 2021-06-23 23:39:34 -04:00
wsd wsd: don't re-render tiles while closing a session. 2021-07-12 16:12:27 +01:00
.cirrus.yml Add Cirrus CI configuration for FreeBSD testing. 2021-05-12 22:10:03 +03:00
.clang-format clang-format: turn off BreakBeforeBinaryOperators 2021-04-23 09:51:06 +02:00
.clang-tidy Png: avoid multiplication at int precision, then converting to long 2016-12-05 11:56:46 +01:00
.gitignore add hello-world.odg to .gitignore 2021-06-04 15:24:25 +02:00
.gitpod.dockerfile Gitpod: Enable VNC and add browser 2020-10-10 01:54:42 +03:00
.gitpod.yml Add default vscode settings for Gitpod 2021-07-13 12:38:31 +03:00
AUTHORS Apply the pre-branch rename script to re-organize the source. 2016-11-25 09:58:48 +00:00
CODE_OF_CONDUCT.md Complete the CoC statement 2020-10-20 20:45:57 +03:00
CONTRIBUTING.md doc: freenode -> libera 2021-06-14 09:14:02 +02:00
COPYING fix license headers 2020-10-01 11:56:43 +02:00
ChangeLog Apply the pre-branch rename script to re-organize the source. 2016-11-25 09:58:48 +00:00
EULA forward port packaging bits to master branch 2021-03-31 18:29:49 +02:00
Makefile.am Add ProfileZone to encodeSubBufferToPNG 2021-06-22 16:43:40 +03:00
NEWS Apply the pre-branch rename script to re-organize the source. 2016-11-25 09:58:48 +00:00
PROBLEMS Tweak problemms. 2019-02-13 18:35:32 +01:00
README.CONTRIBUTING.md Clarify, re: E-mail. 2020-10-26 19:03:53 +00:00
README.md doc: freenode -> libera 2021-06-14 09:14:02 +02:00
SECURITY.md Update SECURITY.md 2021-07-05 12:24:14 +02:00
autogen.sh Use portable `/usr/bin/env bash` shebang, instead of `/bin/bash` one. 2020-12-17 11:52:18 +00:00
browsersync-config.js Browsersync: Also sync html files 2019-05-20 09:59:45 +02:00
configure.ac Rename the Trace Event log to have the extension .json as that is what it is 2021-06-21 12:43:17 +03:00
coolstress.in Use jsdom to load and execute our CSS, HTML and JS. 2021-01-16 12:18:47 +00:00
discovery.xml Enable editing of ODG in discovery.xml 2021-01-21 10:22:58 +01:00
favicon.ico replace favicon.ico (Collabora Online logo) 2020-12-14 13:56:00 +01:00
g Use custom local branch name as explicit remote user branch name for PR 2021-07-16 08:53:58 +02:00
loolkitconfig-mobile.xcu Disable Help button on dialogs in mobile apps 2020-03-23 21:16:40 +01:00
loolkitconfig.xcu.in 3 new build-time configurable settings 2021-05-18 09:14:00 +02:00
loolwsd-generate-proof-key Proof: fixed a typo, and handled the case when the script is running from rootless docker 2020-04-24 20:04:33 +02:00
loolwsd-systemplate-setup Port loolwsd-systemplate-setup to FreeBSD. 2021-03-02 13:44:09 +01:00
loolwsd.init.rhel6 add init script for RHEL6/CentOS6 2019-09-12 18:33:22 +02:00
loolwsd.service add CAP_CHOWN to systemd service files 2021-01-06 11:39:01 +01:00
loolwsd.spec.in LOKit's installation path does not contain version number any more 2021-05-04 13:14:15 +02:00
loolwsd.xml.in Add some comments for developers 2021-07-08 12:07:52 +03:00
sysconfig.loolwsd change product name 2020-10-02 14:18:28 +02:00
trace-event.sample2.json Try repeated async events with same name and id 2021-06-23 12:26:27 +03:00

README.md

Collabora Online

irc Telegram Forum Website L10n Gitpod Ready-to-Code

LibreOffice in the Cloud on your own Terms

Key features

  • View and edit text documents, spreadsheets, presentations & more
  • Collaborative editing features
  • Works in any modern browser – no plugin needed
  • Open Source

Website

For many more details, build instructions, downloads and more please visit https://collaboraonline.github.io/

Developer assistance

Please ask your questions on irc.libera.chat in our #cool-dev channel

Join the conversation on our Discourse server at https://forum.collaboraonline.com/

Watch the tinderbox status (if it's green) at https://cpci.cbg.collabora.co.uk:8080/view/Tinderbox/job/Tinderbox%20for%20online%20master/

Development bits

This project has several components:

  • wsd/
    • The Web Services Daemon - which accepts external connections
  • kit/
    • The client which lives in its own chroot and renders documents
  • common/
    • Shared code between these processes
  • loleaflet/
    • The client side JavaScript component
  • test/
    • C++ based unit tests
  • cypress_test/
    • JavaScript based integration tests

Further recommended reading with build details

Please consult the README files in the component's directory for more details:

  • wsd/README
  • loleaflet/README

iOS and Android apps

See the corresponding READMEs:

  • ios/README
  • android/README

Enjoy!