77d766c143
Merge branch 'proofing' into 'master'
...
Proofing
- Fixed various typos and grammar issues.
- Some mis-wording and re-wording fixes.
- Fixed headings structure (on Styleguide page).
- Unify and fix lists and punctuations.
In the last commit I've also added some re-wording suggestions, which sound better to me, but you're obviously free to let me know if you prefer to keep them as is.
Also, regarding British vs. American English, I honestly prefer British, but many words online these days are American English and have become very engrained in that way. For that reason I haven't touched those and left them as is. (e.g. customize, organize, authorize, etc.)
See merge request framasoft/mobilizon!137
2019-05-19 11:38:10 +02:00
2821e5f12a
Documentation proofing
2019-05-19 11:38:09 +02:00
f3ff8c5b1e
Merge branch 'fix_bulma_message_display' into 'master'
...
Import missing components from Bulma to fix message display
See merge request framasoft/mobilizon!136
2019-05-17 16:35:05 +02:00
90fd4cda66
Import missing components from Bulma to fix message display, and sort dependencies by alphabetical order
2019-05-17 16:28:15 +02:00
705bf26519
Merge branch 'fix_override_original_colors_bulma' into 'master'
...
Use merge_map when defining colors to avoid override original Bulma colors
See merge request framasoft/mobilizon!135
2019-05-17 15:28:10 +02:00
4b80a2a203
Use merge_map when defining colors to avoid override original Bulma colors
2019-05-17 15:28:10 +02:00
c53f19dc04
Merge branch 'readme/logo-updates' into 'master'
...
Logo updates
See merge request framasoft/mobilizon!133
2019-05-07 14:58:05 +02:00
cf4c41fc81
Logo updates
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-07 14:52:01 +02:00
0e0c0712c6
Merge branch 'simplify_page_controller' into 'master'
...
Simplify page controller
See merge request framasoft/mobilizon!131
2019-05-02 13:59:44 +02:00
f07216bbd7
Assert HTML contains opengraph content
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-02 13:54:12 +02:00
7f31121880
Simplify PageController
2019-05-02 13:54:06 +02:00
fb0e9c42f8
Add argon2 dependency in Docker
2019-05-02 13:04:39 +02:00
3f71ddfe5b
Move eventos to mobilizon
2019-05-02 11:38:44 +02:00
8b80cb056e
Merge branch 'deps/upgrade' into 'master'
...
Upgrade deps
See merge request framasoft/mobilizon!130
2019-04-30 14:47:03 +02:00
876ddeb3db
Merge branch 'remove_vue_cli_serve' into 'master'
...
Remove vue cli serve
See merge request framasoft/mobilizon!129
2019-04-30 14:39:39 +02:00
961f22e9ab
Upgrade deps
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-30 14:35:02 +02:00
70b93db8fa
Merge branch 'feature/my-account' into 'master'
...
Test implementation of my account page
See merge request framasoft/mobilizon!127
2019-04-30 14:32:29 +02:00
e97be0b814
Fix tests for FeedController
...
And remove useless Fallbacks in Fallback controller
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-30 14:30:26 +02:00
7c8f1a56af
Fix warning
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-30 14:04:00 +02:00
f8ed5cd779
Fix Docker setup and add back back an entrypoint
...
* Also add special deps for argon2 support inside the Alpine image
* Make sure yarn install is triggered
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-30 13:56:20 +02:00
ff7fd460f0
add make test and Remove vue-cli serve
2019-04-30 13:56:07 +02:00
92ff05f505
Test implementation of my account page
2019-04-26 15:36:53 +02:00
e1e410d595
Merge branch 'feature/private-comment' into 'master'
...
Only render public comments
Closes #111
See merge request framasoft/mobilizon!126
2019-04-26 10:10:11 +02:00
25153d2ae1
Only render public comments
2019-04-26 10:03:46 +02:00
69974ff745
Merge branch 'add-visibility-to-actors' into 'master'
...
Add visibility to actors
Closes #110 et #113
See merge request framasoft/mobilizon!125
2019-04-25 19:17:14 +02:00
12116ba6fa
Add visibility to actors
...
Also use url helpers to generate urls properly
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-25 19:05:05 +02:00
7cd4df0ce9
Merge branch 'front/show-tags-on-event-card' into 'master'
...
Front/show tags on event card
Closes #114
See merge request framasoft/mobilizon!124
2019-04-24 21:00:18 +02:00
f75d853b19
Fix logo on footer by allowing custom fill color
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 20:50:05 +02:00
445619db8b
Show cards on event card
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 20:49:52 +02:00
690620cdff
Merge branch 'front/changes-for-search' into 'master'
...
Front Changes for search
See merge request framasoft/mobilizon!123
2019-04-24 19:55:59 +02:00
88f05665a2
Changes for search
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 19:01:39 +02:00
83ebe94d84
Merge branch 'logo/use-svg' into 'master'
...
Use SVG logo instead of raw title
See merge request framasoft/mobilizon!122
2019-04-24 17:42:42 +02:00
aaa1111cab
Use SVG logo instead of raw title
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 17:36:25 +02:00
db5ef895c1
Merge branch 'ci/refresh-dockerfile' into 'master'
...
Refresh Dockerfile
See merge request framasoft/mobilizon!121
2019-04-24 14:40:57 +02:00
bed9843539
Merge branch 'event-page-fixes' into 'master'
...
Event page fixes
Closes #116 , #117 et #118
See merge request framasoft/mobilizon!120
2019-04-24 14:28:33 +02:00
639f726515
Merge branch 'deps/upgrade' into 'master'
...
Update deps
See merge request framasoft/mobilizon!119
2019-04-24 14:28:31 +02:00
40338bdf77
Refresh Dockerfile
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:28:21 +02:00
ff82cba575
Only show related events section if there's some
...
Always use 1/3 column layout for related events columns
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:21:22 +02:00
dd1e0a3d39
Don't show map if no coords are defined
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:15:47 +02:00
fc699f12b1
Add map data attribution for OpenStreetMap
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:13:52 +02:00
f89f9e2cc2
Merge branch 'various/cleanup' into 'master'
...
Remove logout from profile
See merge request framasoft/mobilizon!118
2019-04-24 14:12:49 +02:00
cb39dbf02f
Load map tiles over HTTPS
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:11:59 +02:00
86b011dc25
Update deps
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:08:41 +02:00
3b37e98806
Remove logout from profile
...
It's in the navbar
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-24 14:05:27 +02:00
13b8f57468
Merge branch 'deps/remove-material-design-icon' into 'master'
...
Remove material-design-icons
Closes #106
See merge request framasoft/mobilizon!117
2019-04-23 11:52:56 +02:00
9a1430d651
Remove material-design-icons
...
Causes #106
Not needed anyway, as we temporarily use the CDN
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-23 11:51:26 +02:00
10bfc17306
Merge branch 'feature/related_events' into 'master'
...
Feature/related events
See merge request framasoft/mobilizon!113
2019-04-23 11:31:20 +02:00
f5b02ed154
Show related events
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-23 11:23:18 +02:00
a877e4d7d9
Implement related events
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-23 11:22:36 +02:00
53111fcd30
Merge branch 'feature/separate-search' into 'master'
...
Add ability to search on Group, Person or Event
See merge request framasoft/mobilizon!112
2019-04-23 11:05:45 +02:00
Thomas Citharel