lp:~tarkisto-dev/tarkisto/ldap-authentication

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:tarkisto at revision 31

naimela: Approve on 2010-07-05

Diff: 652 lines (+431/-37)

21 files modified

.bzrignore (+1/-0)
app/controllers/application_controller.rb (+8/-5)
app/controllers/session_controller.rb (+8/-2)
app/helpers/application_helper.rb (+3/-0)
app/models/user.rb (+14/-0)
app/stylesheets/_header.sass (+11/-1)
app/views/layouts/_header.html.haml (+1/-19)
app/views/layouts/_login.html.haml (+20/-0)
config/environment.rb (+1/-0)
config/initializers/ldap.rb (+1/-0)
config/ldap.yml.example (+31/-0)
config/locales/tarkisto.en.yml (+5/-0)
config/locales/tarkisto.fi.yml (+5/-0)
features/manage_session.feature (+2/-2)
features/step_definitions/session_steps.rb (+9/-0)
lib/ldap.rb (+57/-0)
lib/session.rb (+19/-0)
spec/controllers/session_controller_spec.rb (+45/-6)
spec/lib/ldap_spec.rb (+109/-0)
spec/lib/session_spec.rb (+26/-0)
spec/models/user_spec.rb (+55/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

30. By Sami Saada on 2010-07-03

Added logged in information.

29. By Sami Saada on 2010-07-03

Added some notifications.
Fixed empty user signing in successfully.

28. By Sami Saada on 2010-07-03

Merged latest trunk, which contains Qunit style sheet.

27. By Sami Saada on 2010-07-02

Moved ldap-configuration to distributed one like database.

26. By Sami Saada on 2010-07-02

Merged latest trunk.

25. By Sami Saada on 2010-06-21

Changed TLS from simple_tls to start_tls.
Added configuration for Univ. Helsinki IT LDAP.

24. By Sami Saada on 2010-06-21

Added rest of department check functionality.

23. By Sami Saada on 2010-06-21

Refactored LDAP-tests.
Added minimal department check.
Added User to use also department check.
Added department to config-file.

22. By Sami Saada on 2010-06-20

Added spec test for department check.

21. By Sami Saada on 2010-06-20

Added rest of LDAP#authenticate tests.