clarat-org / claradmin

100%

develop: 100%

LAST BUILD ON BRANCH 1280_split_base_validierung_erweitern

branch: 1280_split_base_validierung_erweitern

CHANGE BRANCH

x

Reset

• 1280_split_base_validierung_erweitern
• 1039_update_clarat_base
• 1063_remove_big_players_from_orgas
• 1195_update_ref_umf_stamp
• 1433_statistiken_laden_nicht
• 1490/fix-email-create-bug
• 944-945-merge-1041
• bug/875-contact-offer-uniqueness
• clarat-org/clarat#1495_zurück_zum_Index_link
• develop
• feature/1004-one-section-per-offer
• feature/1006_ignored_by_crawler_websites
• feature/1007-extend-assignments
• feature/1026-states-for-statistics
• feature/1028-individual-goals
• feature/1030_Pagination_fix
• feature/1039_filtering_validation
• feature/1041-add-range-filter
• feature/1043_expires_at
• feature/1051-styling
• feature/1052-collapsible-panels
• feature/1052-refactor-collapsible-panel
• feature/1054_statistics_hover_tooltip
• feature/1056-load-statistic-in-chunks
• feature/1061_rearrange_statistics_table
• feature/1064-team-goal-views
• feature/1065-team-goals
• feature/1072_send_definitions_to_algolia
• feature/1089_1074_User_team_edit_problems
• feature/1092_crawler_reactivates_wo_websites
• feature/1093_remove_legal_informaiton
• feature/1094_definitions_rework
• feature/1098-improved-react-tabs
• feature/1099_gengo_worker_should_check_if_field_exists
• feature/1102_create_contract_tests
• feature/1102_move_website_validations_to_claradmin
• feature/1119_add_keywords_to_categories
• feature/1120_rework_rename_keywords_to_tags
• feature/1125_User_team_users_not_shown
• feature/1136-basic-flash-messages
• feature/1137-locations-and-contact-people
• feature/1156-extend-filters-offers
• feature/1157_fix_regenerateHTMLworker_add_markdown
• feature/1158_show_active_creator_as_assignor_for_assignments
• feature/1161_rewrite_test_for_link_and_infuse
• feature/1170_split_in_control_new_version
• feature/1172_fix_travis_node_js_problems
• feature/1173_assign_splitbase_solution_category
• feature/1179_orga_search_repair
• feature/1180-reorder-fields
• feature/1196_auto_update_team_stats_on_user_change
• feature/1210_orgas_in_not_HQ_cities_should_count
• feature/1211_remove_uniqness_from_target_audience
• feature/1213_remove_variables_from_offer_that_moved_to_target_audience
• feature/1214_send_explanations_to_algolia
• feature/1222_male_german_stamps_visible
• feature/1223_zuweisung_schließen_und_speichern
• feature/1235-mark-required-inputs
• feature/1268_move_opening_to_new_backend
• feature/1270-deletion-backend-2
• feature/1274-to-system-button
• feature/1284-orga-preview
• feature/1294-duplicate
• feature/1296_solution_categories_to_new_backend
• feature/1297-improved-changes-handling
• feature/1298_user_team_create_update_problem
• feature/1304_accredited_institution_in_orga_update
• feature/1309-filter-rework
• feature/1310_move_split_base_to_backend_2.0
• feature/1312_move_subscriptions&update_requests_to_new_backend
• feature/1313_Kategorien_zu_Tags
• feature/1314-update-algolia-ranking
• feature/1319_boolean_filters_and_usability
• feature/1321_mailings_in_orga_create&update
• feature/1326-show-index-result-count
• feature/1327_add_topics_to_orgas
• feature/1330_organisation_welt_statistik_screening
• feature/1334-action-cable
• feature/1344-refactor-range-params
• feature/1355_containing_filter
• feature/1356_split_base_validation
• feature/1367-character-counter
• feature/1372_mehr_infos_bei_split_base_wahl
• feature/1376-history
• feature/1385_division_categories_to_tags
• feature/1394-label-for-divisions-and-split-base
• feature/1398_return_to_page_after_delete
• feature/1401-enhance-add-new-reference-item
• feature/1406_Title_Tags
• feature/1413-remove-tag-explanations-from-algolia
• feature/1426_contact_people_email_durchsuchbar
• feature/1428-approval-fail-notice
• feature/1431-set-foreign-key-to-nil
• feature/1437-create-assignments-when-website-unavailable
• feature/1440-trigger-orga-state-change-upon-divisions-delete
• feature/1443_remove_split_base
• feature/1447_rubocop_linelength
• feature/1449_division_section_validation
• feature/1451_sections_aus_offer_entfernen
• feature/1469_move_missing_classes_to_claradmin
• feature/1471-update-delete-error-message
• feature/1472_Lösungskategorie_als_Spalte_von_offers
• feature/1473-make-filter-case-insensitive
• feature/1475_Notizen_abschaffen
• feature/1477_Next_Steps_Pflichtfeld_beim_approven
• feature/1478-address-autocomplete
• feature/1484_Stamp_target_audience_filters_parents
• feature/1485_add_export_to_search_locations
• feature/1487_neue_reihenfolge_dropdown_topnav
• feature/1488_Diverse_contact-people_Felder_ausblenden
• feature/1489-custom-division-delete
• feature/1496_change_form_factory_girl_to_bot
• feature/537-orga-website-validation
• feature/547-check-websites
• feature/554-translations
• feature/573-update-offer-mailings
• feature/588-offer-name-char-count
• feature/599-increase-offer-name-length
• feature/600-backend-2.0
• feature/607-remove-renewed-flag
• feature/611-new-portal-encounter
• feature/614-next-steps-lego
• feature/616-always-validate-expiry-date
• feature/621-hide-contact-persons
• feature/624-new-website-hosts
• feature/629-optional-street-digit-validation
• feature/631-code-word
• feature/634-target-audience-stamp
• feature/640-more-categories-and-filters
• feature/643-frontend-offer-stamp
• feature/652-new-trait-filter
• feature/657-remove-note-type
• feature/658-contact-persons-update
• feature/683-logic-versions-editable
• feature/684-add-code-word-to-algolia
• feature/697-increase-definition-key-limit
• feature/699-add-doze-state
• feature/705-replace-mandrill
• feature/708-remove-fields-from-location
• feature/709-different-category-translations
• feature/716-stamp-overhaul
• feature/717-orga-mailings
• feature/719_translate_contactPerson_responsability
• feature/723-regenerate-definitions
• feature/729_add_location_name_to_search_results
• feature/740-reactivate-crawler
• feature/740-resurrect-worker
• feature/755-follow-up-adjustments
• feature/778-redirect-after-login
• feature/779-add-new-encounters
• feature/784-add-address-to-contacts
• feature/785-new-language-filters
• feature/788-update-gender-filter
• feature/789-edit-asana-task-title
• feature/794-all-incl-flag
• feature/801-timezones-for-sidetiq
• feature/803-translate-changed-fields
• feature/810-split-base
• feature/811-contact-mailer-worker
• feature/815-manual-translations
• feature/817-under-construction-state
• feature/834-add-stamp-to-search-index
• feature/841-multiple-umbrellas-for-organizations
• feature/842-gengo-with-job-ids
• feature/842-improve-gengo-process
• feature/847_sendgrid_categories
• feature/855-add-description-to-logic-version
• feature/860-manual-orga-translations
• feature/861-adjust-mailings-for-portal-offers
• feature/867-states-1.5
• feature/870-2nd-batch
• feature/871-link-organization-translations
• feature/872-subscriptions-for-orga-mailings
• feature/873-utm-tags-in-mailings
• feature/878-assignment-refactoring
• feature/878-assignments
• feature/878-refactoring-operations
• feature/890-add-farsi-to-locales
• feature/891-exclude-city-model
• feature/919-only-show-refugees-translations
• feature/923-user-teams
• feature/928-filter-by-associated
• feature/929-testing-javascript
• feature/941-stamp-refugees
• feature/944-945-orga-division-2
• feature/944-frontend-fixes
• feature/944-orgas-2
• feature/944-screening
• feature/945-divisions
• feature/945-refactored-associations
• feature/975-rails-5-upgrade
• feature/980-classification-for-user-teams
• feature/986-show-expired-offers-in-frontend
• feature/auto-select-solution-category
• feature/awesome-feature
• feature/backend-react
• feature/orga-divisions-show-rework
• feature/productivity-stats
• feature/puma-server
• feature_1152_move_geolocation_worker_to_claradmin
• feature_973_signatur_absender
• fix/1116-style-fixes
• fix/1262-fix-backend-link
• fix/1267-bugfixing-and-error-parsing
• fix/1410-fix-pagination-prompt
• fix/1429-remove-approval-button-if-orga-invalid
• fix/1439-fix-associations-bug
• fix/677-fix-map
• fix/994-crawler-issues
• fix/mailings-spawners
• fix/test-suite-coverage
• master
• refactoring/1344-refactor-range-params

Merge branch 'develop' into 1280_split_base_validierung_erweitern

# Conflicts:
#	client/app/Backend/containers/TopNav.js