about summary refs log tree commit diff
path: root/pkgs/applications/office
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2019-01-04
|\
| * gnucash: 3.3 -> 3.4R. RyanTM2019-01-03
* | Merge master into staging-nextFrederik Rietdijk2019-01-02
|\|
| * Merge pull request #53088 from dtzWill/feature/triliumWill Dietz2019-01-02
| |\
| | * trilium: init at 0.26.1Will Dietz2018-12-30
| * | gnucash2{4,6}: dropJan Tojnar2019-01-02
| |/
* | Merge staging-next into stagingFrederik Rietdijk2018-12-26
|\|
| * Merge pull request #52771 from r-ryantm/auto-update/skroogeYannis Koutras2018-12-26
| |\
| | * skrooge: 2.16.2 -> 2.17.0R. RyanTM2018-12-24
* | | Merge branch 'master' into stagingJan Tojnar2018-12-24
|\| |
| * | gnumeric: 1.12.43 → 1.12.44Jan Tojnar2018-12-24
| * | zim: mark as broken for darwinTimo Kaufmann2018-12-22
| * | zim: 0.68 -> 0.69R. RyanTM2018-12-21
| |/
* / treewide: remove paxutils from stdenvJörg Thalheim2018-12-22
|/
* Merge master into staging-nextFrederik Rietdijk2018-12-08
|\
| * todoman: 3.4.1 -> 3.5.0Notkea2018-12-07
* | Merge master into staging-nextFrederik Rietdijk2018-12-03
|\|
| * Merge pull request #50977 from jtojnar/parallel-update.nixJan Tojnar2018-12-02
| |\
| | * update.nix: Run update scripts in parallelJan Tojnar2018-12-01
* | | gobject-introspection: rename packageJan Tojnar2018-12-02
* | | gnucash: don't fail on glib-2.58's new deprecrationsTor Hedin Brønner2018-11-30
* | | gnucash24: add `pcre` fix buildTor Hedin Brønner2018-11-30
* | | planner: don't error on deprecrated declarationsTor Hedin Brønner2018-11-30
* | | Merge staging-next into stagingFrederik Rietdijk2018-11-29
|\| |
| * | Merge master into staging-nextFrederik Rietdijk2018-11-29
| |\ \
| | * | marp: 0.0.13 -> 0.0.14Brian McKenna2018-11-28
| * | | Merge branch 'master' into staging-nextVladimír Čunát2018-11-26
| |\| |
| | * | kmymoney: cleanup install checkMatthew Bauer2018-11-24
| | |/
* | | Merge pull request #50527 from matthewbauer/ninja-check-phaseMatthew Bauer2018-11-20
|\ \ \ | |/ / |/| |
| * | cmake: set CTEST_OUTPUT_ON_FAILURE globallyMatthew Bauer2018-11-19
* | | Merge staging-next into stagingFrederik Rietdijk2018-11-20
|\ \ \ | | |/ | |/|
| * | Merge pull request #50517 from c0bw3b/pkg/plannerRenaud2018-11-19
| |\ \
| | * | planner: 20170425 -> unstable-2018-03-25c0bw3b2018-11-17
| * | | Merge pull request #50742 from worldofpeace/bookworm/2018-11-19Jan Tojnar2018-11-19
| |\ \ \
| | * | | bookworm: 2018-10-21 -> unstable-2018-11-19worldofpeace2018-11-19
* | | | | Merge remote-tracking branch 'upstream/master' into stagingMatthew Bauer2018-11-18
|\| | | |
| * | | | libreoffice-fresh: 6.1.2.1 -> 6.1.3.2Alyssa Ross2018-11-18
| * | | | libreoffice-still: 6.0.6.2 -> 6.0.7.3Alyssa Ross2018-11-18
| | |/ / | |/| |
* | | | Merge staging-next into stagingFrederik Rietdijk2018-11-18
|\| | | | |_|/ |/| |
| * | skrooge: 2.13.0 -> 2.16.2 (#50498)Andrei Lapshin2018-11-17
| |/
| * Merge pull request #47987 from erictapen/scribus-unstableSamuel Dionne-Riel2018-11-12
| |\
| | * scribusUnstable: init at 2018-10-13Justin Humm2018-10-15
* | | Merge staging-next into stagingFrederik Rietdijk2018-11-11
|\| |
| * | Merge pull request #50054 from samueldr/fixes/libreoffice-miscMichael Raskin2018-11-09
| |\ \
| | * | libreoffice-*: inherits meta.Samuel Dionne-Riel2018-11-09
| * | | ledger-web: rack: 1.6.4 -> 1.6.11Alyssa Ross2018-11-06
| |/ /
* | | bookworm: fix revPatrick Hilhorst2018-11-06
* | | treewide: use unstable-date instead of hash as versionPatrick Hilhorst2018-11-06
|/ /
* | Merge pull request #49560 from worldofpeace/eos-third-updateJan Tojnar2018-11-02
|\ \
| * | spice-up: 1.3.2 -> 1.6.0worldofpeace2018-10-31