tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity
3337 commits 15 branches 0 tags 128 MiB
Commit graph

3337 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Citharel 4434459e59 Merge branch 'attach-picture-entities' into 'master' 
Attach actor to pictures entity

Closes #129

See merge request framasoft/mobilizon!147
 2019-06-03 15:54:37 +02:00
Thomas Citharel 5b3831b4bf
Attach actor to pictures entity 2019-05-31 18:07:37 +02:00
Thomas Citharel 768dc57062 Merge branch 'chunk-output' into 'master' 
Make event & create event & map async components

See merge request framasoft/mobilizon!146
 2019-05-31 15:21:15 +02:00
Thomas Citharel 0a1f955194
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 55cd3bc54a 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 5a6ed464b6
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 84e1ffe24c 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 e8ef5997eb
Trigger file upload with button 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-31 11:01:52 +02:00
Thomas Citharel 2a2e4690ff
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 d3176e2a8d
Add mentions 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-29 16:46:23 +02:00
Thomas Citharel b613de040c Merge branch 'upgrade-deps' into 'master' 
Upgrade deps

See merge request framasoft/mobilizon!144
 2019-05-28 19:51:30 +02:00
Thomas Citharel 1be2e839e6
Upgrade deps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-28 19:11:22 +02:00
Thomas Citharel 07d4db5ce9
Add tiptap editor for description ❤️ 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-28 18:55:02 +02:00
Thomas Citharel 01f6f8c35e 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 d4d295eae1
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 c648ff1f37 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 dfade9fb06 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 f90089e1bf
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 9724bc8e9f 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 a2c181f7fe Update NodeInfo support to 2.1 (#79) 2019-05-24 09:18:19 +02:00
Alexandre Mathieu 93bc7cc259 Move main logo height definition from css to img tag 2019-05-21 16:52:47 +02:00
Thomas Citharel 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
Armando Lüscher 2821e5f12a Documentation proofing 2019-05-19 11:38:09 +02:00
Thomas Citharel 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
Alexandre Mathieu 90fd4cda66 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 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
poulp 4b80a2a203 Use merge_map when defining colors to avoid override original Bulma colors 2019-05-17 15:28:10 +02:00
Thomas Citharel c53f19dc04 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 cf4c41fc81
Logo updates 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-07 14:52:01 +02:00
Thomas Citharel 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
Thomas Citharel f07216bbd7
Assert HTML contains opengraph content 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-05-02 13:54:12 +02:00
Vincent 7f31121880
Simplify PageController 2019-05-02 13:54:06 +02:00
Vincent fb0e9c42f8 Add argon2 dependency in Docker 2019-05-02 13:04:39 +02:00
Vincent 3f71ddfe5b Move eventos to mobilizon 2019-05-02 11:38:44 +02:00
Thomas Citharel 8b80cb056e Merge branch 'deps/upgrade' into 'master' 
Upgrade deps

See merge request framasoft/mobilizon!130
 2019-04-30 14:47:03 +02:00
Thomas Citharel 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
Thomas Citharel 961f22e9ab
Upgrade deps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-30 14:35:02 +02:00
Thomas Citharel 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
Thomas Citharel 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
Thomas Citharel 7c8f1a56af
Fix warning 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-30 14:04:00 +02:00
Thomas Citharel 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
Vincent ff7fd460f0
add make test and Remove vue-cli serve 2019-04-30 13:56:07 +02:00
Chocobozzz 92ff05f505
Test implementation of my account page 2019-04-26 15:36:53 +02:00
Thomas Citharel 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
Chocobozzz 25153d2ae1
Only render public comments 2019-04-26 10:03:46 +02:00
Thomas Citharel 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
Thomas Citharel 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
Thomas Citharel 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
Thomas Citharel 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
Thomas Citharel 445619db8b
Show cards on event card 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-24 20:49:52 +02:00