IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,400 Commits 5 Branches 2 Tags
Commit Graph

6400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store 
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
 2019-10-18 21:58:53 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
Alexander Friedland
f6e87b87ff
locale 
change language to locale
 2019-10-18 12:54:55 +02:00
Alexander Friedland
1fce840efb
locale 
change language to locale
 2019-10-18 12:16:32 +02:00
Alexander Friedland
a6108f6a00
locale 
change language to locale
 2019-10-18 12:15:21 +02:00
Alexander Friedland
abaa9b7759
locale 
change language to locale
 2019-10-18 12:14:11 +02:00
Alexander Friedland
713feb4347
locale 
change language to locale
 2019-10-18 12:13:01 +02:00
Alexander Friedland
6d1bf2c3e8
locale 
change language to locale
 2019-10-18 12:10:44 +02:00
Alexander Friedland
3346048e3e
locale 
change language to locale
 2019-10-18 11:53:29 +02:00
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
Alexander Friedland
18fe54e095
Update Registration.js 
change language to locale
 2019-10-18 11:49:14 +02:00
mattwr18
6d63434751
Merge pull request #1951 from Human-Connection/update-version-to-0.1.5 
Update to version 0.1.5
 2019-10-18 11:39:20 +02:00
mattwr18
bb053afcad Update to version 0.1.5 2019-10-18 11:05:34 +02:00
mattwr18
227239cc8b
Merge pull request #1917 from Human-Connection/dependabot/npm_and_yarn/dotenv-8.2.0 
build(deps-dev): bump dotenv from 8.1.0 to 8.2.0
 2019-10-17 16:46:24 +02:00
mattwr18
3f2d476cf9
Merge pull request #1941 from Human-Connection/1311-fix-vue-errors 
Fix vue errors for Contribution form
 2019-10-17 16:45:27 +02:00
Robert Schäfer
613de33bbb
Merge pull request #1940 from Human-Connection/update-email-to-hyphenate 
Follow @alina-beck and @Tirokk PR suggestions
 2019-10-17 16:16:25 +02:00
Vasily Belolapotkov
20d9ba2439 wrap user component with client-only 2019-10-17 16:45:09 +03:00
Wolfgang Huß
4a2f8edb9e
Merge pull request #1926 from Human-Connection/1924-moderators-reports-list-sort-desc 
🍰 Add Cypher statement for ordering
 2019-10-17 14:28:47 +02:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments 
Improved comment truncation
 2019-10-17 12:21:43 +02:00
Robert Schäfer
ea1b9d6e1e
Merge pull request #1911 from Human-Connection/typo 
fix: typo in German translation
 2019-10-17 12:18:01 +02:00
Wolfgang Huß
72290e1c8a Add ascendant ordering as enum to ReportOrdering 2019-10-17 10:16:27 +02:00
Wolfgang Huß
681733bb0f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1924-moderators-reports-list-sort-desc 2019-10-17 10:05:13 +02:00
dependabot-preview[bot]
5b25240aed
build(deps-dev): bump dotenv from 8.1.0 to 8.2.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-17 08:04:54 +00:00
ppelegrin
3d88e532f9
Merge pull request #1923 from Human-Connection/dependabot/submodules/styleguide-d46fc15 
build(deps): bump styleguide from `808b3c5` to `d46fc15`
 2019-10-17 10:04:28 +02:00
ppelegrin
48cfc017ea
Merge pull request #1921 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp
 2019-10-17 10:03:38 +02:00
ppelegrin
76a22af46d
Merge pull request #1915 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend
 2019-10-17 10:02:58 +02:00
Alexander Friedland
cca1e2c04a
remove change 2019-10-17 09:44:26 +02:00
Alexander Friedland
8fd1bb28ef
Merge pull request #1935 from Human-Connection/1932-use-filename-for-cropped-images 
Maintain filename for cropped images
 2019-10-17 09:40:03 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
mattwr18
d62ee23f2a Create new File with blob 
- maintain filename
- reduce image size
 2019-10-16 17:20:35 +02:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Wolfgang Huß
30f268525f Add Cypher statement for ordering 
- minor db manipulation text change
 2019-10-16 13:32:45 +02:00
Alina Beck
a306b9cf4b use constants, truncate only comments with more than 300 characters 2019-10-16 13:56:57 +03:00
dependabot-preview[bot]
a815d92eb2
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:19:18 +00:00
dependabot-preview[bot]
8d5e0b0e2c
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:18:30 +00:00
dependabot-preview[bot]
58cbd07e1b
build(deps): bump styleguide from 808b3c5 to d46fc15 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `d46fc15`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...d46fc1570c)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:17:55 +00:00
Robert Schäfer
452bf4127c
Merge pull request #1919 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.5.0 
build(deps-dev): bump date-fns from 2.4.1 to 2.5.0
 2019-10-16 12:16:32 +02:00
Robert Schäfer
84af40e0df
Merge pull request #1916 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.4 
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend
 2019-10-16 12:16:03 +02:00
Robert Schäfer
d10efbb5a8
Merge pull request #1918 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.6 
build(deps-dev): bump neode from 0.3.3 to 0.3.6
 2019-10-16 12:15:22 +02:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment 
Highlight and expand linked comment
 2019-10-16 12:13:16 +02:00
Robert Schäfer
0792e06a24
Merge pull request #1910 from Human-Connection/add-missing-translations-contribution-form 
Add missing translations for Title placeholder
 2019-10-16 12:10:19 +02:00
Robert Schäfer
d18017e248
Update webapp/locales/de.json 2019-10-16 12:09:03 +02:00
Wolfgang Huß
a705f6a017
Merge pull request #1797 from Human-Connection/1707-reporting-with-specific-information 
🍰 Reporting with specific information
 2019-10-16 11:54:29 +02:00
dependabot-preview[bot]
3c9627ea07
build(deps-dev): bump date-fns from 2.4.1 to 2.5.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:32:31 +00:00
mattwr18
4592ec6340
Merge pull request #1912 from Human-Connection/dependabot/npm_and_yarn/backend/dotenv-8.2.0 
build(deps): bump dotenv from 8.1.0 to 8.2.0 in /backend
 2019-10-16 09:30:36 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00