ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,494 Commits 117 Branches 1,511 Tags
Commit Graph

2494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
ffe28af856
Merge pull request #231 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-13 19:23:09 +01:00
dependabot[bot]
412f220dba
Bump eslint-plugin-jest from 22.3.0 to 22.3.2 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.3.0 to 22.3.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.3.0...v22.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 16:28:31 +00:00
dependabot[bot]
e6d51d04bc
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 16:27:59 +00:00
Robert Schäfer
af03b4958b
Merge pull request #223 from Human-Connection/212-change-password 
Change password in the backend
 2019-03-13 17:25:38 +01:00
Robert Schäfer
57fc99fc3f Fix merge error again 
cc @Lulaby pay attention when merging `master`
 2019-03-13 17:01:49 +01:00
Lala Sabathil
12fc42973a
Merge branch 'master' into 212-change-password 2019-03-13 16:50:19 +01:00
Robert Schäfer
e9e0c84cb2 Fixed merge error 
CC @Lulalaby
 2019-03-13 16:48:56 +01:00
Lala Sabathil
5308c3bff2
Merge pull request #235 from Human-Connection/234-test-follow-and-shout-unauthenticated 
Add unauthenticated test to follow and shout
 2019-03-13 16:20:51 +01:00
Matt Rider
c8f66d168a Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-13 11:30:47 -03:00
Matt Rider
22eec97551 Fix onSelect test to use realistic results 2019-03-13 11:29:41 -03:00
Armin
9dffb69162 Fix blank lines in test 2019-03-13 14:39:00 +01:00
Wolfgang Huß
460f94ea3f Add unauthenticated test to follow and shout 
close #234
 2019-03-13 14:32:15 +01:00
Lala Sabathil
2d2fb9c9a9
Merge pull request #173 from Human-Connection/dependabot/submodules/Nitro-Styleguide-baf3134 
Bump Nitro-Styleguide from `e77754c` to `baf3134`
 2019-03-13 14:05:00 +01:00
Lala Sabathil
f7d52e1ea4
Merge pull request #172 from Human-Connection/dependabot/submodules/Nitro-Web-a05b438 
Bump Nitro-Web from `4aa640a` to `a05b438`
 2019-03-13 14:04:54 +01:00
Lala Sabathil
15e5c39b6a
Merge pull request #171 from Human-Connection/dependabot/submodules/Nitro-Backend-0dce83b 
Bump Nitro-Backend from `28a37c2` to `0dce83b`
 2019-03-13 14:04:46 +01:00
Robert Schäfer
ac155b7f17 Small refactoring let client in the upmost scope 
cc @Tirokk
 2019-03-13 13:57:46 +01:00
Robert Schäfer
3d56875be5 Typo 2019-03-13 13:51:51 +01:00
Grzegorz Leoniec
6e8e51d99a
Remove styleguide installation instructions 
Styleguide is now a npm dependency.
 2019-03-13 13:12:38 +01:00
Grzegorz Leoniec
a09df8fe24
Merge pull request #27 from proofy/patch-1 
Update local-backend.md
 2019-03-13 13:07:52 +01:00
Grzegorz Leoniec
caa9a98c19
Use the LTS version of Node 2019-03-13 13:06:43 +01:00
Grzegorz Leoniec
9cad81fa25
Make disabled content more "pretty" 2019-03-13 12:51:50 +01:00
dependabot[bot]
453508040a
Bump Nitro-Styleguide from e77754c to baf3134 
Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `e77754c` to `baf3134`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](e77754cb78...baf3134f9d)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:53 +00:00
dependabot[bot]
e0578fa4fe
Bump Nitro-Web from 4aa640a to a05b438 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `4aa640a` to `a05b438`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](4aa640a2e5...a05b438b3c)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:52 +00:00
dependabot[bot]
5cf9145dd9
Bump Nitro-Backend from 28a37c2 to 0dce83b 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `28a37c2` to `0dce83b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](28a37c226a...0dce83b55f)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:52 +00:00
Armin
a5e769de3f Merge branch 'activitypub-editor' of https://github.com/mastercuber/Nitro-Backend into activitypub-editor 2019-03-13 02:03:35 +01:00
Armin
5ea3ef99e1 Fixed follow feature + clean database after tests run + wait for user to be created before proceed 2019-03-13 01:17:17 +01:00
Lala Sabathil
50639ec61f
Merge branch 'master' into activitypub-editor 2019-03-12 23:47:11 +01:00
Robert Schäfer
0ba0d2f0a2 Implement effects but remove modals from DOM 2019-03-12 23:26:56 +01:00
Sven Jörns
302dab3485
Update local-backend.md 
add link to node download site
 2019-03-12 23:06:21 +01:00
Armin
00ba891cbf Some refactoring + add timeout functions to some step definitions + add objectId to Post and schema 2019-03-12 22:50:58 +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
abf5a3143d
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 19:34:32 +01:00
Armin
5aeb2845db Change test port in some feature files 2019-03-12 19:14:13 +01:00
Armin
48ed75b6e4 Use GRAPHQL_URI env var instead establishing ACTIVITYPUB env vars + http Signature test fix 2019-03-12 19:07:58 +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
Wolfgang Huß
a6f96cad78 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-12 18:45:49 +01:00
Grzegorz Leoniec
4810fd1497
Fixed tag and categories tests by trimming names 2019-03-12 18:44:51 +01:00
Matt Rider
16e75e4464 Refactor SearchInput 
- break focus and blur into two functions
- add failing test for onSelect function

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
 2019-03-12 14:31:29 -03: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
Matt Rider
85ffd67a49 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-12 12:49:48 -03:00
Grzegorz Leoniec
0dce83b55f
Merge pull request #152 from Human-Connection/37-full-text-search-top-bar 
[WIP] 37 full text search top bar
 2019-03-12 16:07:55 +01:00
Wolfgang Huß
29afce7c27 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-12 16:04:31 +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