Commit Graph

485 Commits

Author SHA1 Message Date
Thomas Citharel
7ef4ef264b Attach actor to pictures entity 2019-05-31 18:07:37 +02:00
Thomas Citharel
290b4ba7d3 Make event & create event & map async components
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-31 15:13:07 +02:00
Thomas Citharel
f0d63737d4 Merge branch 'upgrade-deps' into 'master'
Add vue-cli-plugin-webpack-bundle-analyzer and upgrade deps

See merge request framasoft/mobilizon!145
2019-05-31 11:39:40 +02:00
Thomas Citharel
990d7abc49 Add vue-cli-plugin-webpack-bundle-analyzer and upgrade deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-31 11:32:50 +02:00
Thomas Citharel
c1e3e73271 Merge branch 'description-editor' into 'master'
Add tiptap editor for description ❤️

See merge request framasoft/mobilizon!143
2019-05-31 11:32:09 +02:00
Thomas Citharel
71efbb0880 Trigger file upload with button
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-31 11:01:52 +02:00
Thomas Citharel
c0abbf3d3e Allow uploading pictures into description by drag&drop them
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-29 17:47:52 +02:00
Thomas Citharel
fe65a478f0 Add mentions
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-29 16:46:23 +02:00
Thomas Citharel
dd9c748780 Merge branch 'upgrade-deps' into 'master'
Upgrade deps

See merge request framasoft/mobilizon!144
2019-05-28 19:51:30 +02:00
Thomas Citharel
ea53554a01 Upgrade deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-28 19:11:22 +02:00
Thomas Citharel
417618a36d Add tiptap editor for description ❤️
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-28 18:55:02 +02:00
Thomas Citharel
2b8d4c85c2 Merge branch 'use-reverse-proxy-for-remote-images' into 'master'
Add proxy route and proxify pics everywhere

See merge request framasoft/mobilizon!142
2019-05-28 11:03:23 +02:00
Thomas Citharel
34e353939a Add proxy route and proxify pics everywhere
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-28 10:55:13 +02:00
Thomas Citharel
5dccabb9b8 Merge branch 'fix_logo_size' into 'master'
Move main logo height definition from css to img tag

See merge request framasoft/mobilizon!138
2019-05-24 17:38:57 +02:00
Thomas Citharel
32367790d6 Merge branch 'feature/media-upload' into 'master'
Refactor media upload

See merge request framasoft/mobilizon!140
2019-05-24 17:38:33 +02:00
Thomas Citharel
3cb29be4fc Refactor media upload
Use Upload Media logic from Pleroma

Backend changes for picture upload

Move AS <-> Model conversion to separate module

Front changes

Downgrade apollo-client: https://github.com/Akryum/vue-apollo/issues/577

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-24 17:29:51 +02:00
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
Alexandre Mathieu
48aedb4ba9 Move main logo height definition from css to img tag 2019-05-21 16:52:47 +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