Commit Graph

21902 Commits (144289b8e085945ebe3dd69a5f41b6428c6a0a4e)
 

Author SHA1 Message Date
Florian Kraft 144289b8e0 Merge branch 'release/4.2' into dev 10 years ago
Florian Kraft 524dc0ec30 Merge pull request #3164 from NobodysNightmare/feature/private_mail_by_default 10 years ago
Florian Kraft 37457e2891 Merge branch 'release/4.2' into dev 10 years ago
Florian Kraft 9c0a7197e3 Merge branch 'release/4.1' into release/4.2 10 years ago
Florian Kraft bcaabeb497 Merge branch 'fix/formbuilder-label-for' into release/4.1 10 years ago
Jens Ulferts a0c7fa2946 Merge branch 'release/4.2' into dev 10 years ago
Jens Ulferts f3458138fb add safeguard to spec 10 years ago
Jan Sandbrink 6406b640b7 remove redundant spec 10 years ago
Jens Ulferts 7dcd3e6560 Merge branch 'release/4.2' into dev 10 years ago
Jens Ulferts 9b93316283 explicitly expecting a setting 10 years ago
Jens Ulferts f4b26f0f40 avoid spec sideeffects by mocking 10 years ago
Jan Sandbrink 885d1eb3d3 repair table in APIv2 documentation 10 years ago
Florian Kraft 550d3f3a51
fix possible xss in label_for_field 10 years ago
Jan Sandbrink db5d633850 update factories to new default preference 10 years ago
Jan Sandbrink 620c55bf3d change the default preference for mail hiding 10 years ago
Jens Ulferts 3316b45af8 Merge branch 'release/4.2' into dev 10 years ago
Jens Ulferts 2652388587 Merge branch 'release/4.1' into release/4.2 10 years ago
Jens Ulferts 4ae7d5cafa remove unsafe html_safe 10 years ago
Jan Sandbrink 25b7211b55 Merge pull request #2957 from myabc/feature/livingstyleguide-upgrade 10 years ago
Alex Coles 43da5beea3 Tell gulp to watch .lsg files instead 10 years ago
Alex Coles a216a04127 Add html[id] to style guide based on file path 10 years ago
Alex Coles 15f2cc5824 [WORKAROUND] Add coffee-script as devDependency 10 years ago
Alex Coles 25259f4ca4 Bump gulp-livingstyleguide to 0.1.5 10 years ago
Alex Coles 7a16a70e49 Upgrade to livingstyleguide v2 syntax 10 years ago
Alex Coles 95072f5c7d Rename style guide doc files from .md → .lsg 10 years ago
Alex Coles a50e4396cb Add separate frontend Gemfile w/ livingstyleguide 10 years ago
Alex Coles 4e920c2183 Remove livingstyleguide as Rails app dependency 10 years ago
Jan Sandbrink 397f2eacfc Merge pull request #3120 from floriank/fix/pin-select-version 10 years ago
Jens Ulferts 8bde768253 Merge branch 'release/4.2' into dev 10 years ago
Jens Ulferts f301b56a92 explicitly require helper 10 years ago
ulferts 71d066ee3e Merge pull request #3161 from oliverguenther/feature/consolidate_module_menu 10 years ago
Jens Ulferts 5a8b9ba795 ensure page loaded before cuke 10 years ago
Oliver Günther 5ada719136 Consolidate Module menu in header navigation This effectively changes the following menus: 10 years ago
Florian Kraft af15752d0f pin select 3.5.2 10 years ago
Azure7111 ea0b07311d Merge pull request #3158 from floriank/fix/20484-clear-option-in-select 10 years ago
Florian Kraft 76c3f9faba style corrections 10 years ago
Florian Kraft ca4b4df0df Merge branch 'release/4.2' into dev 10 years ago
Florian Kraft 086fcd8904 Merge pull request #3132 from HDinger/fix/19911-headlines 10 years ago
Florian Kraft 9944e6b68b Merge pull request #3133 from HDinger/fix/19427-error-message 10 years ago
Florian Kraft e7a1ef11b8 Merge branch 'release/4.2' into dev 10 years ago
Florian Kraft b2dbb7e2da Merge branch 'release/4.1' into release/4.2 10 years ago
Florian Kraft c2988e3af4 Merge pull request #3063 from NobodysNightmare/feature/cleanup_sass 10 years ago
Florian Kraft e63c00a86a add a name to the empty options in dropdowns 10 years ago
Azure7111 3c4f311ec0 Merge pull request #3137 from ulferts/fix/required_password_field_on_users 10 years ago
Jens Ulferts 0fdc8b3387 Merge branch 'release/4.2' into dev 10 years ago
ulferts bd92099f0a Merge pull request #3139 from floriank/fix/19811-icon-cut-off 10 years ago
ulferts 945be87e13 Merge pull request #3150 from ulferts/fix/focus_for_specs 10 years ago
Jens Ulferts 485c67f747 rework focus specs for accessiblity 10 years ago
Jens Ulferts aa18fd5ff0 ensure page loaded for spec 10 years ago
Jens Ulferts 1572619fe1 Merge branch 'release/4.2' into dev 10 years ago