Changeset 3c1b20b for asadb/util/diff_static_data.sh

Timestamp:

Jun 4, 2013, 3:40:41 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

6aa3517

Parents:

1927d79 (diff), 1e08e97 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (06/04/13 03:40:41)

git-committer:

Alex Dehnert <adehnert@…> (06/04/13 03:40:41)

Message:

Merge branch 'master' into space-access

• master: (43 commits) Color NGEs differently from inactive groups Don't add NGEs to asa-official (ASA-#231) Take is_active out of str(GroupStatus?) (ASA-#230) Add group status to account lookup (ASA-#203) Add help text about Athena lockername selection Sort the "Update people" page (partial ASA-#232) Sort the signatories page (partial ASA-#232) Sort the officers of a group (partial ASA-#232) Validate P/T usernames in group creation form Remove spurious slash in new group email (ASA-#217) Use absolute path to templates (ASA-#211) Show group status on the non-student officers page Prevent 500'ing while uploading midway assignments "Upload table assignments" link (ASA-#225) Add midway tab Add midway list page (ASA-#226) Handle duplicate groups Fix spelling of midway permission Add the midway permissions to the asa-ebm group Allow running diff_static_data from any directory ...

Conflicts:

asadb/space/admin.py

File:

• asadb/util/diff_static_data.sh (modified) (1 diff)

asadb/util/diff_static_data.sh

@@ -5 +5 @@
 date
 
-cd static-data
+cd "$(dirname "$0")/static-data"
 
 ../dump_group_perms.py > group-perms.py