Permalink
Commits on Mar 22, 2013
  1. @glogiotatidis

    Merge branch 'privacy'

    glogiotatidis committed Mar 22, 2013
  2. @glogiotatidis

    Merge branch 'privacy'

    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:
    glogiotatidis committed Mar 22, 2013
Commits on Mar 21, 2013
  1. @Sancus

    Merge pull request #439 from Sancus/master

     Increase ES timeout to 10 seconds for indexing only
    Sancus committed Mar 21, 2013
  2. @Sancus
  3. @glogiotatidis

    Merge pull request #437 from hoosteeno/privacy

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

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

    [bug 846051] Add new string to edit profile
    
    Fix code formatting
    hoosteeno committed Mar 21, 2013
  6. @glogiotatidis

    Merge pull request #438 from hoosteeno/master

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

    hoosteeno committed Mar 20, 2013
Commits on Mar 19, 2013
  1. @Sancus

    Merge pull request #435 from glogiotatidis/privacy

    [fix bug 846051] String updates for privacy controls.
    Sancus committed Mar 19, 2013
  2. @glogiotatidis
Commits on Mar 18, 2013
  1. @Sancus

    Merge pull request #434 from hoosteeno/privacy

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

    hoosteeno committed Mar 18, 2013
Commits on Mar 16, 2013
  1. @Sancus

    Merge pull request #433 from Sancus/stopcallingbasket

    [Fix Bug 851633] Stop tests from making real POSTs to basket
    Sancus committed Mar 16, 2013
  2. @Sancus
Commits on Mar 15, 2013
  1. @Sancus

    Merge pull request #429 from glogiotatidis/stronghold

    Stronghold
    Sancus committed Mar 15, 2013
  2. @Sancus

    Merge pull request #432 from glogiotatidis/query-set-magic

    Privacy controls
    Sancus committed Mar 15, 2013
Commits on Mar 14, 2013
  1. @glogiotatidis
  2. @glogiotatidis
  3. @glogiotatidis
Commits on Mar 13, 2013
  1. @glogiotatidis

    Merge pull request #431 from hoosteeno/privacy

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

    hoosteeno committed Mar 12, 2013
  2. @Sancus

    Merge pull request #430 from juliaelman/privacy-ui

    [bug 846026] Adding more style/layout changes.
    Sancus committed Mar 12, 2013
  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. @glogiotatidis
  6. @glogiotatidis
  7. @glogiotatidis

    Old code cleanup.

    Rewrite (groups|skills|languages)/search.
    
    Remove permission denied middleware.
    
    Add trailing slashes.
    
    Fix list_location url regexes.
    glogiotatidis committed Mar 8, 2013
  8. @Sancus

    Merge pull request #428 from juliaelman/privacy-ui

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

    …y comtrols.
    juliaelman committed Mar 12, 2013
Commits on Mar 11, 2013
  1. @Sancus

    Merge pull request #427 from juliaelman/privacy-ui

    [bug 849018] Changing select dropdowns to have unique ids.
    Sancus committed Mar 11, 2013
  2. @Sancus

    Merge pull request #426 from juliaelman/privacy-ui

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

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