[ckan-changes] [ckan/ckan] ce5bda: fixed ckan.ico path

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: ce5bdaf80dae409db429d66b52454a29f2bc9a3d
      https://github.com/ckan/ckan/commit/ce5bdaf80dae409db429d66b52454a29f2bc9a3d
  Author: bunnis <coelhop24 at gmail.com>
  Date:   2016-03-08 (Tue, 08 Mar 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py

  Log Message:
  -----------
  fixed ckan.ico path


  Commit: 7b1b706623dcd60896ebf539846e0d0336bf6298
      https://github.com/ckan/ckan/commit/7b1b706623dcd60896ebf539846e0d0336bf6298
  Author: amercader <amercadero at gmail.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/bunnis/ckan into bunnis-master


  Commit: a5158fb63f4d03af9a4d62af2fc1f31eb4b02eb9
      https://github.com/ckan/ckan/commit/a5158fb63f4d03af9a4d62af2fc1f31eb4b02eb9
  Author: bunnis <coelhop24 at gmail.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    A .project
    A .pydevproject
    A .settings/org.eclipse.core.resources.prefs
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py

  Log Message:
  -----------
  fixed ckan.ico path


  Commit: d84f2a48ae54f71c0c79778c6002047a2f0f4426
      https://github.com/ckan/ckan/commit/d84f2a48ae54f71c0c79778c6002047a2f0f4426
  Author: bunnis <coelhop24 at gmail.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    R .project
    R .pydevproject
    R .settings/org.eclipse.core.resources.prefs

  Log Message:
  -----------
  fixed ckan.ico path


  Commit: 1b97cdd9e695f8c97bd8d0d04021c8e36c488ea5
      https://github.com/ckan/ckan/commit/1b97cdd9e695f8c97bd8d0d04021c8e36c488ea5
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Made the user list limit configurable

Allows the user list limit to be set by ini setting or querysrting


  Commit: b67bfd3f8bc5b672f5ccb43db5b77e6b1e42a968
      https://github.com/ckan/ckan/commit/b67bfd3f8bc5b672f5ccb43db5b77e6b1e42a968
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Added documentation for the user list limit


  Commit: 97024ea42b4290f69d55dfeaeca7bcc5630fe916
      https://github.com/ckan/ckan/commit/97024ea42b4290f69d55dfeaeca7bcc5630fe916
  Author: amercader <amercadero at gmail.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'user_list_limit' of https://github.com/LaurentGoderre/ckan into LaurentGoderre-user_list_limit


  Commit: d18f7d78e79d22c1ea1a534e7dcdcb923196fa93
      https://github.com/ckan/ckan/commit/d18f7d78e79d22c1ea1a534e7dcdcb923196fa93
  Author: amercader <amercadero at gmail.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'LaurentGoderre-user_list_limit'


  Commit: c0b9d5495bf5b446ab531035e791006214e23d02
      https://github.com/ckan/ckan/commit/c0b9d5495bf5b446ab531035e791006214e23d02
  Author: amercader <amercadero at gmail.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/bunnis/ckan


  Commit: 8dbb6dcacd2b95f1dc2ce5fcaaabf57462569269
      https://github.com/ckan/ckan/commit/8dbb6dcacd2b95f1dc2ce5fcaaabf57462569269
  Author: amercader <amercadero at gmail.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Log Message:
  -----------
  Merge branch 'bunnis-master'


Compare: https://github.com/ckan/ckan/compare/5f16da334720...8dbb6dcacd2b