10160 Commits

Author SHA1 Message Date
Alexander Friedland
ebef535e17
Merge branch 'master' into 1804-hide-pagenation-on-empty-transactionlist 2022-05-16 14:14:12 +02:00
Alexander Friedland
c73b09da3d
Merge pull request #1900 from gradido/new-auth-styleling-pre-I
pre I from #1682,  add images, svg for new styling
2022-05-16 14:13:54 +02:00
Wolfgang Huß
089c28a4e6
Merge branch 'master' into 1901-ignore-macos-DS_Store-files 2022-05-16 14:13:23 +02:00
Wolfgang Huß
fc03e1f0ad
Merge branch 'master' into 1804-hide-pagenation-on-empty-transactionlist 2022-05-16 14:11:32 +02:00
Alexander Friedland
0bb8d8e453
Merge branch 'master' into new-auth-styleling-pre-I 2022-05-16 14:04:51 +02:00
Alexander Friedland
d7a6dc198f
Merge pull request #1888 from gradido/ogerly-patch-2
add browserstack logo image
2022-05-16 14:03:26 +02:00
Alexander Friedland
fc270206fc
Merge branch 'master' into new-auth-styleling-pre-I 2022-05-16 14:02:10 +02:00
Wolfgang Huß
666061ead9 Follow Moriz hint for a better fitting text for creations 2022-05-16 13:50:55 +02:00
Wolfgang Huß
095214c282 Change by Alex and Moriz review suggestions 2022-05-16 13:09:46 +02:00
ogerly
378c395489 add scss to bootstrap scss, add watch for mobile Style 2022-05-16 12:36:46 +02:00
Wolfgang Huß
946280a6db Rename transaction link filters
– Fix spelling in comment.
2022-05-16 12:00:57 +02:00
Wolfgang Huß
b8aa75386f Merge branch '1901-ignore-macos-DS_Store-files' of github.com:gradido/gradido into 1840-refactor-to-filter-object 2022-05-16 11:46:38 +02:00
Wolfgang Huß
ed27e163d5 Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object 2022-05-16 11:46:15 +02:00
Wolfgang Huß
ab5e3a7729 Revert "Replace some withDeleted by filterByDeleted"
This reverts commit 5fd1a86af1f5efa514b01784750830380fd53c0f.
2022-05-16 11:45:27 +02:00
Wolfgang Huß
6b9fbc920e Add test for invisible pagination buttons 2022-05-16 11:39:48 +02:00
Wolfgang Huß
9f2d1c4c74 Merge branch '1901-ignore-macos-DS_Store-files' of github.com:gradido/gradido into 1804-hide-pagenation-on-empty-transactionlist 2022-05-16 10:54:26 +02:00
Wolfgang Huß
2ddb8f3702 Merge branch 'master' of github.com:gradido/gradido into 1804-hide-pagenation-on-empty-transactionlist 2022-05-16 10:53:36 +02:00
Wolfgang Huß
f8858bb38a Change ignore of .nvmrc files to a general term 2022-05-16 10:24:51 +02:00
Wolfgang Huß
56182e6e3d Ignore mac OS .DS_Store files 2022-05-16 10:19:32 +02:00
Alexander Friedland
5bbc6a6147
Merge branch 'master' into ogerly-patch-2 2022-05-13 22:29:12 +02:00
Alexander Friedland
4083856ae1
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-05-13 11:53:09 +02:00
Moriz Wahl
87b816e68c
Merge pull request #1899 from gradido/release-1.8.3-new
Release 1.8.3
2022-05-13 11:49:26 +02:00
ogerly
480ee546a9 add images, svg for new styling 2022-05-13 11:47:12 +02:00
Moriz Wahl
99f03dac9f Release 1.8.3 2022-05-13 11:39:18 +02:00
ogerly
29f365e257 refactor scss to bootstrap scss on element 2022-05-13 11:03:11 +02:00
Hardy
28a8de3168
Merge pull request #1894 from gradido/Hardy-Hart-am-Start-patch-1
Checkbox
2022-05-13 10:50:07 +02:00
Alexander Friedland
b0c2588c8f
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-05-13 10:22:34 +02:00
ogerly
699235557a refactor scss to bootstrap scss on element 2022-05-13 10:17:59 +02:00
ogerly
47ee6bfe88 rename Header.vue to Navbar.vue 2022-05-13 10:17:21 +02:00
Alexander Friedland
0e581fccfa
Merge branch 'master' into ogerly-patch-2 2022-05-13 08:14:41 +02:00
ogerly
8697425392 add small navbar for login and register 2022-05-13 07:19:55 +02:00
Hardy
81ad6ff2d3
Add files via upload 2022-05-12 16:30:20 +02:00
Moriz Wahl
645e3f35cc
Merge pull request #1892 from gradido/count-depricated-links-as-well
fix: Count Deprecated Links as Well
2022-05-12 15:11:36 +02:00
Moriz Wahl
a1e7e65830 fix: Count Deprecated Links as Well 2022-05-12 14:36:04 +02:00
Moriz Wahl
5d4ee74f0a
Merge pull request #1890 from gradido/release-1.8.2
Release 1.8.2
2022-05-12 13:46:52 +02:00
Moriz Wahl
ec2a1535a9 release 1.8.2 2022-05-11 17:33:23 +02:00
ogerly
54cbdeed7d center formular if sm grid 2022-05-11 12:47:03 +02:00
ogerly
1bde4014c2 center formular if md grid 2022-05-11 12:42:37 +02:00
ogerly
a4c0e491e8 delete unused image 2022-05-11 09:11:48 +02:00
Alexander Friedland
1954ee01a0
add browserstack logo image 2022-05-11 08:26:31 +02:00
Alexander Friedland
33b0ca1586
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-05-11 08:16:53 +02:00
ogerly
30a4f59f76 remove unused code / comments 2022-05-11 08:16:07 +02:00
Alexander Friedland
754a207fc1
Merge pull request #1878 from gradido/ogerly-patch-1
Update README.md
2022-05-10 22:48:05 +02:00
Alexander Friedland
6864080e7a
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-05-10 21:27:51 +02:00
Alexander Friedland
9eecb987d9
Merge branch 'master' into ogerly-patch-1 2022-05-10 21:24:35 +02:00
Moriz Wahl
d9e493b69a
Merge pull request #1879 from gradido/unique-previous-in-transactions
fix: Unique Previous Column in Transactions Table
2022-05-10 20:25:54 +02:00
Moriz Wahl
0106c0a733 move changes from template to dist 2022-05-10 19:55:19 +02:00
Moriz Wahl
d8d3339e9c fix test for logger 2022-05-10 19:44:20 +02:00
Moriz Wahl
9893cc78aa add context user with user.id instead of public key 2022-05-10 19:33:26 +02:00
Moriz Wahl
cb012882b1 rename logger to apollo 2022-05-10 19:32:48 +02:00