IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
904 Commits 5 Branches 2 Tags
Commit Graph

904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
e6af5a11ab Tests pass 2019-03-15 16:56:24 +01:00
Robert Schäfer
3fad432858 Merge Author+RelatedUser into User component 2019-03-15 16:47:51 +01:00
Robert Schäfer
fc244cd098 More honest translations 2019-03-14 23:21:19 +01:00
Robert Schäfer
e0dd39d5fc Fix bug: No red border of comment for user 2019-03-14 23:17:20 +01:00
Robert Schäfer
7160006eed Show red border for moderators 2019-03-14 02:11:17 +01:00
Robert Schäfer
c2d7002795 Translations 2019-03-14 02:11:17 +01:00
Robert Schäfer
48a85b4af3 Copy+paste from post/_slug page 2019-03-14 02:11:17 +01:00
Robert Schäfer
08d0679a67 Show the comment content if you are a moderator 2019-03-14 02:11:17 +01:00
Robert Schäfer
bb2a6c052e Comment component shows content unless disabled 2019-03-14 02:11:17 +01:00
Robert Schäfer
4845904ddf Sketch comment component 2019-03-14 02:11:17 +01:00
Lala Sabathil
c934cc339e
Merge branch 'master' into 27_disable_posts 2019-03-14 00:47:00 +01:00
Lala Sabathil
0fae7a26e5
Merge pull request #254 from Human-Connection/dependabot/npm_and_yarn/jest-24.5.0 
Bump jest from 24.1.0 to 24.5.0
 2019-03-14 00:42:16 +01:00
dependabot[bot]
192e3290b1
Bump jest from 24.1.0 to 24.5.0 
Bumps [jest](https://github.com/facebook/jest) from 24.1.0 to 24.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.1.0...v24.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 23:38:03 +00:00
Lala Sabathil
5e8497e510
Merge pull request #255 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.5.0 
Bump babel-jest from 24.3.1 to 24.5.0
 2019-03-14 00:35:55 +01:00
dependabot[bot]
d62a9c0480
Bump babel-jest from 24.3.1 to 24.5.0 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.3.1 to 24.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.5.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 22:55:25 +00:00
Lala Sabathil
ae5f663c4d
Merge pull request #258 from Human-Connection/remove_cypress_dependency 
Remove cypress from package.json
 2019-03-13 23:46:34 +01:00
Robert Schäfer
c3dd027c9f Remove cypress from package.json 
cc @mattwr18 added by accident?
 2019-03-13 23:30:24 +01:00
Grzegorz Leoniec
9cad81fa25
Make disabled content more "pretty" 2019-03-13 12:51:50 +01:00
Robert Schäfer
0ba0d2f0a2 Implement effects but remove modals from DOM 2019-03-12 23:26:56 +01:00
Robert Schäfer
58852cb566 Visually distinguish disabled content 
with beautiful orange border 😆

cc @appinteractive
 2019-03-12 21:47:37 +01:00
Grzegorz Leoniec
9419a57c29
Updated yarn.lock 2019-03-12 20:26:41 +01:00
Grzegorz Leoniec
0d38505054
Merge branch 'master' into 27_disable_posts 2019-03-12 19:36:56 +01:00
Grzegorz Leoniec
a05b438b3c
Merge pull request #253 from Human-Connection/fix-styleguide-issues 
Fix styleguide issues
 2019-03-12 19:06:54 +01:00
Grzegorz Leoniec
078b4974c4
Upgraded nuxt to 2.4.5 2019-03-12 18:47:47 +01:00
Grzegorz Leoniec
4810fd1497
Fixed tag and categories tests by trimming names 2019-03-12 18:44:51 +01:00
Grzegorz Leoniec
968365187a
Merged master in 2019-03-12 18:08:53 +01:00
Grzegorz Leoniec
b8417f3a5f
Try to "quick" (haha) fix the build with styleguide 2019-03-12 18:06:18 +01:00
Grzegorz Leoniec
ab09f356ca
Fixed a submit buttion translation for reporting content 2019-03-12 17:59:40 +01:00
Grzegorz Leoniec
370734bdde
Merged master in, fixed translation and modal linting issues 2019-03-12 17:58:04 +01:00
Grzegorz Leoniec
c68b214dc5
Removed polyfill 2019-03-12 15:39:54 +01:00
Grzegorz Leoniec
c1218d8607
Revert change from chrome to electron as we need recording 2019-03-12 15:07:15 +01:00
Grzegorz Leoniec
77200bda74
Ignore .min.js files from linting 2019-03-12 14:45:59 +01:00
Grzegorz Leoniec
b1b5a041a0
Removed parallel from cypress run 2019-03-12 14:43:14 +01:00
Grzegorz Leoniec
033e440ea3
Updated styleguide to 0.5.14 2019-03-12 13:58:21 +01:00
Grzegorz Leoniec
bb4afe79cb
Added IntersectionObserver polyfill 2019-03-12 13:58:07 +01:00
Grzegorz Leoniec
dc8c2e81aa
Try to run cypress tests in chrome 2019-03-12 13:57:29 +01:00
Robert Schäfer
6e003d428b
Merge pull request #233 from Human-Connection/get_rid_of_resource_type 
Update ReportModal to work with back end
 2019-03-12 13:52:30 +01:00
Robert Schäfer
3b7ffde4c2 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into get_rid_of_resource_type 2019-03-12 13:26:56 +01:00
Grzegorz Leoniec
610aa470fb
Merge pull request #250 from Human-Connection/lokalise-2019-03-12_10-42-56 
Lokalise: Translations update
 2019-03-12 10:44:07 +01:00
lokalise-bot
d1be013c3c Lokalise: update of locales/pt.json 2019-03-12 10:43:01 +01:00
lokalise-bot
bcedf11c69 Lokalise: update of locales/pl.json 2019-03-12 10:43:00 +01:00
Grzegorz Leoniec
39933995c5
Merge pull request #240 from Human-Connection/update_translations 
Update translations
 2019-03-12 10:42:31 +01:00
Robert Schäfer
31c056e8d3 Display who disabled a resource 2019-03-10 22:40:29 +01:00
Robert Schäfer
2d1ea0e251 Cypres should be a development dependency 2019-03-10 18:24:37 +01:00
Robert Schäfer
d114d71fac Remove unrelated translations 2019-03-10 18:24:37 +01:00
Robert Schäfer
c794e5acb4 Fix yarn.lock 2019-03-10 18:24:37 +01:00
Robert Schäfer
ff926ae35f Bugfix: ReportModal keeps showing success screen 2019-03-10 18:24:37 +01:00
Robert Schäfer
dd6f9ddd25 Improve locales 2019-03-10 15:49:02 +01:00
Robert Schäfer
9eba745b83 We probably don't even need 'disabled' property 2019-03-10 15:47:23 +01:00
Robert Schäfer
7efc56a227 Fine-tune styling 2019-03-10 15:24:04 +01:00