Permalink
Commits on Mar 22, 2013
  1. Merge branch 'privacy'

    glogiotatidis committed Mar 22, 2013
  2. Merge branch 'privacy'

    glogiotatidis committed Mar 22, 2013
    Conflicts:
    	apps/groups/views.py
    	apps/phonebook/tests/test_edit_profile.py
    	apps/phonebook/tests/test_views.py
    	apps/phonebook/views.py
    
    * apps/groups/tests/test_languages.py:
Commits on Mar 21, 2013
  1. Merge pull request #439 from Sancus/master

    Sancus committed Mar 21, 2013
     Increase ES timeout to 10 seconds for indexing only
  2. Merge pull request #437 from hoosteeno/privacy

    glogiotatidis committed Mar 21, 2013
    Modify strings
  3. [bug 850259] Translate strings

    hoosteeno committed Mar 21, 2013
  4. [bug 846051] Add new string to edit profile

    hoosteeno committed Mar 21, 2013
    [bug 846051] Add new string to edit profile
    
    Fix code formatting
  5. Merge pull request #438 from hoosteeno/master

    glogiotatidis committed Mar 21, 2013
    Fix syntax error in .gitignore
Commits on Mar 20, 2013
  1. Fix syntax error in .gitignore

    hoosteeno committed Mar 20, 2013
Commits on Mar 19, 2013
  1. Merge pull request #435 from glogiotatidis/privacy

    Sancus committed Mar 19, 2013
    [fix bug 846051] String updates for privacy controls.
Commits on Mar 18, 2013
  1. Merge pull request #434 from hoosteeno/privacy

    Sancus committed Mar 18, 2013
    Add clearfix divs to Profile Edit->Skills tab.
  2. Add clearfix divs to Profile Edit->Skills tab.

    hoosteeno committed Mar 18, 2013
Commits on Mar 16, 2013
  1. Merge pull request #433 from Sancus/stopcallingbasket

    Sancus committed Mar 16, 2013
    [Fix Bug 851633] Stop tests from making real POSTs to basket
Commits on Mar 15, 2013
  1. Merge pull request #429 from glogiotatidis/stronghold

    Sancus committed Mar 15, 2013
    Stronghold
  2. Merge pull request #432 from glogiotatidis/query-set-magic

    Sancus committed Mar 15, 2013
    Privacy controls
Commits on Mar 14, 2013
Commits on Mar 13, 2013
  1. Merge pull request #431 from hoosteeno/privacy

    glogiotatidis committed Mar 13, 2013
    Add 'No Change' to global toggle
Commits on Mar 12, 2013
  1. Add 'No Change' to global toggle

    hoosteeno committed Mar 12, 2013
  2. Merge pull request #430 from juliaelman/privacy-ui

    Sancus committed Mar 12, 2013
    [bug 846026] Adding more style/layout changes.
  3. Removing include, since it is no longer being used.

    juliaelman committed Mar 12, 2013
  4. [bug 846026] Adding more style/layout changes.

    juliaelman committed Mar 12, 2013
  5. Old code cleanup.

    glogiotatidis committed Mar 8, 2013
    Rewrite (groups|skills|languages)/search.
    
    Remove permission denied middleware.
    
    Add trailing slashes.
    
    Fix list_location url regexes.
  6. Merge pull request #428 from juliaelman/privacy-ui

    Sancus committed Mar 12, 2013
    [bug 846026] Making additional changes to the layout/styles of privacy controls.
  7. [bug 846026] Making additional changes to the layout/styles of privac…

    juliaelman committed Mar 12, 2013
    …y comtrols.
Commits on Mar 11, 2013
  1. Merge pull request #427 from juliaelman/privacy-ui

    Sancus committed Mar 11, 2013
    [bug 849018] Changing select dropdowns to have unique ids.
  2. Merge pull request #426 from juliaelman/privacy-ui

    Sancus committed Mar 11, 2013
    [bug 846026] Adding change to edit profile and view profile ui
Commits on Mar 8, 2013
  1. [bug 846026] Making style changes to edit profile page and adding dro…

    juliaelman committed Mar 8, 2013
    …pdown view change for view profile page.