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
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
56531dab62
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 08:31:45 -03:00
Lala Sabathil
9ef4948a7f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 12:02:26 +01:00
Lala Sabathil
9a4c911eb0
Merge branch 'master' into 212-change-password 2019-03-12 12:01:00 +01:00
Lala Sabathil
6f075e08c5
Merge branch 'master' into activitypub-editor 2019-03-12 12:00:09 +01:00
Lala Sabathil
bc133b4728
Merge pull request #112 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.0.0-alpha.27 
Bump date-fns from 2.0.0-alpha.26 to 2.0.0-alpha.27
 2019-03-12 11:58:44 +01:00
Lala Sabathil
8b1c7c1d23
Merge pull request #170 from Human-Connection/dependabot/submodules/Nitro-Styleguide-e77754c 
Bump Nitro-Styleguide from `562fddb` to `e77754c`
 2019-03-12 11:55:06 +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
dependabot[bot]
80669e242d
Bump Nitro-Styleguide from 562fddb to e77754c 
Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `562fddb` to `e77754c`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](562fddb1b4...e77754cb78)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-12 04:31:01 +00:00
Matt Rider
c4dff9a916 Add tests for onDelete, query functions 2019-03-11 18:36:32 -03:00
Matt Rider
168278d76a Add component tests checking custom functions 
- clear()
- handleInput()
- onEnter()
 2019-03-11 17:59:24 -03:00
Wolfgang Huß
22b521b93d Deleted a line in graphql.schema 2019-03-11 17:02:31 +01:00
Sam Joseph
fc9466fa36
Update local-backend.md 2019-03-11 15:11:10 +00:00
Sam Joseph
e440e3b973
Update CONTRIBUTING.md 2019-03-11 14:37:53 +00:00
Sam Joseph
034f0bccd8
Update CONTRIBUTING.md 2019-03-11 14:36:13 +00:00
Lala Sabathil
628502de05
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-11 14:37:02 +01:00
Matt Rider
caf56ca967 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-11 09:20:43 -03:00
Lulalaby
682ad65f83 submodule update 2019-03-11 11:38:02 +01:00
Lala Sabathil
6f934da2cf
Merge pull request #168 from Human-Connection/dependabot/submodules/Nitro-Backend-28a37c2 
Bump Nitro-Backend from `2d24fc9` to `28a37c2`
 2019-03-11 11:26:00 +01:00
Lala Sabathil
ccff501b37
Merge pull request #166 from Human-Connection/dependabot/submodules/Nitro-Styleguide-ce20d5b 
Bump Nitro-Styleguide from `ce69fe5` to `ce20d5b`
 2019-03-11 11:25:52 +01:00
Lala Sabathil
dda147feba
Merge pull request #164 from Human-Connection/killing-the-past 
[WIP] Killing the past
 2019-03-11 11:23:41 +01:00
Grzegorz Leoniec
9cb19e6180
Improved and fixed Readme 2019-03-11 09:43:35 +01:00
dependabot[bot]
8bae410931
Bump Nitro-Backend from 2d24fc9 to 28a37c2 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `2d24fc9` to `28a37c2`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](2d24fc9945...28a37c226a)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-11 04:24:37 +00:00
dependabot[bot]
f5535776a9
Bump Nitro-Styleguide from ce69fe5 to ce20d5b 
Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `ce69fe5` to `ce20d5b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](ce69fe5cb7...ce20d5b58e)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-11 04:24:22 +00:00
Armin
ff9840b844 Signature Test lint fix 2019-03-11 02:21:16 +01:00
Lala Sabathil
2b6f7270b5
Merge branch 'master' into 212-change-password 2019-03-11 02:19:02 +01:00
Armin
fc9acf0ae3 Merge branch 'activitypub-editor' of https://github.com/mastercuber/Nitro-Backend into activitypub-editor 2019-03-11 00:59:10 +01:00
Armin
77b7ed58d3 Add HTTP Signature Test (Problems with crypto lib till now) 2019-03-11 00:58:19 +01:00
Armin
b2d4dbb190
Merge branch 'master' into activitypub-editor 2019-03-10 23:55:14 +01:00
Robert Schäfer
31c056e8d3 Display who disabled a resource 2019-03-10 22:40:29 +01:00
dependabot[bot]
a1b9f770ce
Bump date-fns from 2.0.0-alpha.26 to 2.0.0-alpha.27 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.26 to 2.0.0-alpha.27.
- [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.0.0-alpha.26...v2.0.0-alpha.27)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-10 19:41:58 +00:00
Robert Schäfer
28a37c226a
Merge pull request #213 from Human-Connection/get_rid_of_resource_type 
Get rid of resource type
 2019-03-10 20:39:09 +01:00
Grzegorz Leoniec
2116936062 Fixed shout and follow seeding 2019-03-10 19:05:50 +01:00
Robert Schäfer
60d711bb0a Prevent to report any type 
Resouce must have a label (Post|Comment|User)
 2019-03-10 19:05:50 +01:00
Robert Schäfer
ee5c4127e6 Prevent disabling any type 
Resource must have a label Post|Comment|User
 2019-03-10 19:05:50 +01:00
Robert Schäfer
f14c903d2a Refactor: we don't need a setup object 2019-03-10 19:05:50 +01:00
Robert Schäfer
cae3330105 Fix deprecation: async function passed to describe 2019-03-10 19:05:50 +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