Final answer:
Albert Bandura developed the social-cognitive theory, which emphasizes both cognition and learning in personality development.
Step-by-step explanation:
Albert Bandura developed the social-cognitive theory. This theory emphasizes both cognition and learning as sources of individual differences in personality. Bandura proposed concepts such as reciprocal determinism, observational learning, and self-efficacy as important factors in personality development. His ideas challenge Skinner's strict behaviorist approach and emphasize the role of thinking and reasoning in learning.