Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity
468 Commits 4 Branches 85 Tags 205 MiB
6083239d0b
Commit Graph

468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Citharel
6083239d0b Merge branch 'issue-79' into 'master' 
Update NodeInfo support to 2.1 (#79)

See merge request framasoft/mobilizon!139
 2019-05-24 09:18:20 +02:00
Julien Lavergne
6657d3cc22 Update NodeInfo support to 2.1 (#79) 2019-05-24 09:18:19 +02:00
Thomas Citharel
b0e4e5a46b 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
Armando Lüscher
7d50b3e220 Documentation proofing 2019-05-19 11:38:09 +02:00
Thomas Citharel
e9d203d482 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
Alexandre Mathieu
92028270b5 Import missing components from Bulma to fix message display, and sort dependencies by alphabetical order 2019-05-17 16:28:15 +02:00
Thomas Citharel
a002a5f669 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
poulp
3b5d3cd2e3 Use merge_map when defining colors to avoid override original Bulma colors 2019-05-17 15:28:10 +02:00
Thomas Citharel
a9136a5b29 Merge branch 'readme/logo-updates' into 'master' 
Logo updates

See merge request framasoft/mobilizon!133
 2019-05-07 14:58:05 +02:00
Thomas Citharel
206c9235bb Logo updates 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-07 14:52:01 +02:00
Thomas Citharel
fed9f8a103 Merge branch 'simplify_page_controller' into 'master' 
Simplify page controller

See merge request framasoft/mobilizon!131
 2019-05-02 13:59:44 +02:00
Thomas Citharel
5d60067747 Assert HTML contains opengraph content 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-02 13:54:12 +02:00
Vincent
5fbde60f0f Simplify PageController 2019-05-02 13:54:06 +02:00
Vincent
c1609186a9 Add argon2 dependency in Docker 2019-05-02 13:04:39 +02:00
Vincent
7aa9201414 Move eventos to mobilizon 2019-05-02 11:38:44 +02:00
Thomas Citharel
fc9032d315 Merge branch 'deps/upgrade' into 'master' 
Upgrade deps

See merge request framasoft/mobilizon!130
 2019-04-30 14:47:03 +02:00
Thomas Citharel
26960774ad 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
Thomas Citharel
55aace23e3 Upgrade deps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-30 14:35:02 +02:00
Thomas Citharel
d8c84377cc 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
Thomas Citharel
555620c7b0 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
Thomas Citharel
cf10e45412 Fix warning 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-30 14:04:00 +02:00
Thomas Citharel
9d5bb8deea 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
Vincent
4a425e6011 add make test and Remove vue-cli serve 2019-04-30 13:56:07 +02:00
Chocobozzz
e5b8a89ec9 Test implementation of my account page 2019-04-26 15:36:53 +02:00
Thomas Citharel
91a42423cf 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
Chocobozzz
fb072fc002 Only render public comments 2019-04-26 10:03:46 +02:00
Thomas Citharel
e14876112c 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
Thomas Citharel
bf75335c2a 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
Thomas Citharel
d26533a0ff 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
Thomas Citharel
7944a7d767 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
Thomas Citharel
6ada1b67af Show cards on event card 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 20:49:52 +02:00
Thomas Citharel
95cc8bb067 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
Thomas Citharel
14604cfa6a Changes for search 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 19:01:39 +02:00
Thomas Citharel
3d2bca2719 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
Thomas Citharel
57d05b9ec6 Use SVG logo instead of raw title 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 17:36:25 +02:00
Thomas Citharel
87ab0b3067 Merge branch 'ci/refresh-dockerfile' into 'master' 
Refresh Dockerfile

See merge request framasoft/mobilizon!121
 2019-04-24 14:40:57 +02:00
Thomas Citharel
7455decacb 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
Thomas Citharel
ae5ab1d7d9 Merge branch 'deps/upgrade' into 'master' 
Update deps

See merge request framasoft/mobilizon!119
 2019-04-24 14:28:31 +02:00
Thomas Citharel
c234a00b0c Refresh Dockerfile 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 14:28:21 +02:00
Thomas Citharel
128f10bf29 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
Thomas Citharel
69457146bf 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
Thomas Citharel
fcad7aa2ce Add map data attribution for OpenStreetMap 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 14:13:52 +02:00
Thomas Citharel
96713cf3d1 Merge branch 'various/cleanup' into 'master' 
Remove logout from profile

See merge request framasoft/mobilizon!118
 2019-04-24 14:12:49 +02:00
Thomas Citharel
23cbb7d359 Load map tiles over HTTPS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 14:11:59 +02:00
Thomas Citharel
8d48dfa5ff Update deps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 14:08:41 +02:00
Thomas Citharel
86e4303529 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
Thomas Citharel
700a0b85c3 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
Thomas Citharel
5e61cf041a 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
Thomas Citharel
a3c90f1654 Merge branch 'feature/related_events' into 'master' 
Feature/related events

See merge request framasoft/mobilizon!113
 2019-04-23 11:31:20 +02:00
Thomas Citharel
f241251b24 Show related events 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-23 11:23:18 +02:00