Commit graph

2412 commits

Author SHA1 Message Date
Lauri Ojansivu
b1b9170afe Merge branch 'devel' of https://github.com/ppoulard/wekan into ppoulard-devel 2018-07-05 23:22:57 +03:00
Lauri Ojansivu
13e5ccb56e Fix missing space in jade file.
Thanks to xet7 !
2018-07-05 23:06:02 +03:00
Lauri Ojansivu
8d24fc4bcf Merge branch 'TNick-calendar' into devel 2018-07-05 23:04:35 +03:00
Lauri Ojansivu
cc63a575ab - Calendar improvements.
Thanks to TNick !
2018-07-05 23:03:48 +03:00
Lauri Ojansivu
a02c51cc3b Merge branch 'calendar' of https://github.com/TNick/wekan into TNick-calendar 2018-07-05 23:02:20 +03:00
Lauri Ojansivu
ca6cadbe6d Merge branch 'TNick-nested-tasks' into devel 2018-07-05 22:54:04 +03:00
Lauri Ojansivu
cc753cf4e4 - Nested tasks.
Thanks to TNick !

Closes #709
2018-07-05 22:51:10 +03:00
Lauri Ojansivu
7e4fddd932 Update translations. 2018-07-05 22:49:25 +03:00
Lauri Ojansivu
06423164fb Merge branch 'nested-tasks' of https://github.com/TNick/wekan into TNick-nested-tasks 2018-07-05 22:48:43 +03:00
Lauri Ojansivu
515c9be051 - Fix Minimize board sidebar actually just moves it over.
Thanks to dagomar !

Closes #1589
2018-07-05 21:57:17 +03:00
Nicu Tofan
243797d2e9
Merge branch 'upstream-devel' into calendar 2018-07-05 20:17:18 +03:00
Lauri Ojansivu
c997786e64 - Fix lint warning: EditCardDate is assigned a value but never used no-unused-vars
Thanks to xet7 !
2018-07-04 00:01:05 +03:00
Lauri Ojansivu
dd324aa581 - Fix lint warning: EditCardDate is assigned a value but never used no-unused-vars
Thanks to xet7 !
2018-07-03 23:57:05 +03:00
Lauri Ojansivu
177c00e974 - Fix warning about missing space in jade file.
Thanks to xet7 !
2018-07-03 23:40:31 +03:00
Lauri Ojansivu
067aef9de9 Fix warning about missing space in jade file.
Thanks to xet7 !
2018-07-03 23:33:28 +03:00
ppoulard
02f14d967f Fix stupid error 💥🗯💣🕳💢 2018-07-03 16:21:51 +02:00
Lauri Ojansivu
122a61b333 - Revert "Fix vertical align of user avatar initials",
so that initials are again visible.

Thanks to pravdomil and xet7 !

Reverts https://github.com/wekan/wekan/pull/1714
2018-07-03 17:19:13 +03:00
ppoulard
49a89b80cf Fix QA 2018-07-03 16:08:18 +02:00
ppoulard
ee81775dc8 Adding SSO CAS to Wekan 2018-07-03 15:55:19 +02:00
Lauri Ojansivu
05869792ad Revert Dockerfile changes. 2018-07-02 20:06:22 +03:00
Lauri Ojansivu
2ac7660f29 Fix typo. 2018-07-02 20:01:13 +03:00
Lauri Ojansivu
abf7890941 Try to fix Dockerfile. 2018-07-02 19:59:00 +03:00
Lauri Ojansivu
e139e140f4 Fix typo. 2018-07-02 19:42:04 +03:00
Lauri Ojansivu
1f7db171d9 Try to fix Dockerfile. 2018-07-02 19:38:49 +03:00
Lauri Ojansivu
bf06c715fe Fix URL. 2018-07-02 19:09:57 +03:00
Lauri Ojansivu
44e20023cc Try to fix Dockerfile. 2018-07-02 19:05:39 +03:00
Lauri Ojansivu
e03ee1bd2f Try to fix Dockerfile. 2018-07-02 18:51:42 +03:00
Lauri Ojansivu
aea5ed7848 Try to fix Dockerfile. 2018-07-02 18:48:49 +03:00
Lauri Ojansivu
bbdb6a90b2 Download node from sandstorm in Dockerfile. 2018-07-02 18:40:08 +03:00
Lauri Ojansivu
8fbbc104f7 v1.11 2018-06-30 12:38:40 +03:00
Lauri Ojansivu
6ba4574c67 - Less margin-bottom after minicard.
Thanks to pravdomil and xet7 !
2018-06-30 12:23:49 +03:00
Lauri Ojansivu
928d88cfe1 - More margin-bottom after minicard.
Thanks to pravdomil and xet7 !
2018-06-30 12:22:35 +03:00
Lauri Ojansivu
4f5086c5cd - Revert previous More margin-bottom after minicard.
Thanks to pravdomil and xet7 !
2018-06-30 12:03:15 +03:00
Lauri Ojansivu
fe69ab9030 Merge branch 'pravdomil-patch-7' into devel 2018-06-30 11:42:47 +03:00
Lauri Ojansivu
08a1927c0c - Remove card shadow, Wekan users now prefer not to have it.
Thanks to GitHub users pravdomil and xet7 for their contributions.
2018-06-30 11:42:03 +03:00
Lauri Ojansivu
f02d5e64f0 Merge branch 'patch-7' of https://github.com/pravdomil/wekan into pravdomil-patch-7 2018-06-30 11:39:51 +03:00
Lauri Ojansivu
5bca2f802b Update translations. 2018-06-30 11:34:00 +03:00
Nicu Tofan
3eba6ef285
Merge branch 'devel' into nested-tasks 2018-06-28 17:00:35 +03:00
Lauri Ojansivu
ad54a8a484 v1.10 2018-06-28 14:02:57 +03:00
Lauri Ojansivu
5adce79842 Update translations (de) 2018-06-28 13:59:43 +03:00
Lauri Ojansivu
9fceb212d9 Fix migration error "TypeError: Checklists.foreach" at Snap, Docker etc.
Thanks to Jubi94, kestrelhawk and xet7 !
2018-06-28 13:56:41 +03:00
Lauri Ojansivu
e044769d85 - Fix migration error "TypeError: Checklists.foreach"
Thanks to Jubi94, kestrelhawk and xet7 !

Fixes #1736,
fixes wekan/wekan-snap#51
2018-06-28 13:48:36 +03:00
Lauri Ojansivu
a86a8eff2d Fix typo. 2018-06-28 00:26:37 +03:00
Lauri Ojansivu
541dc67a02 v1.09 2018-06-28 00:14:02 +03:00
Nicu Tofan
db5ff4e1e2
Changing events in calendar updates the card 2018-06-28 00:13:35 +03:00
Lauri Ojansivu
d0611e1bff Update translations. 2018-06-28 00:09:52 +03:00
Lauri Ojansivu
523ebea4dd Merge branch 'TNick-calendar' into devel 2018-06-27 23:57:02 +03:00
Lauri Ojansivu
bccfa320a9 - Calendar.
Thanks to TNick !
2018-06-27 23:56:15 +03:00
Lauri Ojansivu
72d0db7a59 Merge branch 'calendar' of https://github.com/TNick/wekan into TNick-calendar 2018-06-27 23:55:06 +03:00
Lauri Ojansivu
ed0ef5b7d3 Merge branch 'TNick-invitation-code-setting' into devel 2018-06-27 23:38:58 +03:00