opensourceprojects.eu / osp-allura / Commit [c0bdf0]

Commit [c0bdf0] master History

Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Authored by: Rick Copeland 2010-10-14

Browse code at this revision

Parent(s): [7ee1f9][b61566]

Child(ren): [66c677]

1 2 3 .. 172 > >> (Page 1 of 172)

added	Allura/allura/lib/widgets/repo.py
added	Allura/allura/lib/repository.py
added	Allura/allura/templates/repo/fork.html
added	Allura/allura/templates/repo/log.html
added	Allura/allura/templates/repo/repo_master.html
added	Allura/allura/templates/repo/commit.html
added	Allura/allura/templates/repo/admin_extensions.html
added	Allura/allura/templates/widgets/repo/revision.html
added	Allura/allura/templates/widgets/repo/log.html
added	Allura/allura/templates/widgets/repo/tree_widget.html
added	Allura/allura/templates/widgets/repo/commit.html
added	ForgeGit/forgegit/tests/data/testgit.git/objects/6a/45885ae7347f1cac5103b0050cc1be6a1496c8
added	ForgeGit/forgegit/tests/data/testgit.git/objects/6d/2ce67bdd55ae2c2ac72cbc879ed7c67ecc9786
added	ForgeGit/forgegit/tests/data/testgit.git/objects/be/00c63250248c284b842deee5d8fb0b8132acab
added	ForgeGit/forgegit/tests/data/testgit.git/objects/9a/7df788cf800241e3bb5a849c8870f2f8259d98
added	ForgeGit/forgegit/tests/data/testgit.git/objects/8c/3c7fbcd903744b20fd7567a1fcefa99133b5bc
added	ForgeGit/forgegit/tests/data/testgit.git/objects/43/80f66cf5cbd858b73156681d665593ec80a58d
added	ForgeGit/forgegit/tests/data/testgit.git/objects/e9/65047ad7c57865823c7d992b1d046ea66edf78
added	ForgeGit/forgegit/tests/data/testgit.git/objects/df/30427c488aeab84b2352bdf88a3b19223f9d7a
added	ForgeGit/forgegit/tests/data/testgit.git/objects/1e/146e67985dcd71c74de79613719bef7bddca4a
added	ForgeGit/forgegit/tests/data/testgit.git/objects/0d/666fc313e6f4829e8d4446d4529394f8e464a9
added	ForgeGit/forgegit/tests/data/testgit.git/objects/d7/c40db3ffe2b87e96b94c280a67265c8de7a4ad
added	ForgeGit/forgegit/tests/data/testgit.git/objects/e5/6a4d15295d3754310f114c86d93645308110ad
added	ForgeGit/forgegit/tests/data/testgit.git/objects/0f/419b54b956f4a849a689105216282f1a4c749a
added	ForgeGit/forgegit/tests/data/testgit.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904

Allura/allura/lib/widgets/repo.py Diff Switch to side-by-side view

Allura/allura/lib/repository.py Diff Switch to side-by-side view

Allura/allura/templates/repo/fork.html Diff Switch to side-by-side view

Allura/allura/templates/repo/log.html Diff Switch to side-by-side view

Allura/allura/templates/repo/repo_master.html Diff Switch to side-by-side view

Allura/allura/templates/repo/commit.html Diff Switch to side-by-side view

Allura/allura/templates/repo/admin_extensions.html Diff Switch to side-by-side view

Allura/allura/templates/widgets/repo/revision.html Diff Switch to side-by-side view

Allura/allura/templates/widgets/repo/log.html Diff Switch to side-by-side view

Allura/allura/templates/widgets/repo/tree_widget.html Diff Switch to side-by-side view

Allura/allura/templates/widgets/repo/commit.html Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/6a/45885ae7347f1cac5103b0050cc1be6a1496c8 Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/6d/2ce67bdd55ae2c2ac72cbc879ed7c67ecc9786 Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/be/00c63250248c284b842deee5d8fb0b8132acab Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/9a/7df788cf800241e3bb5a849c8870f2f8259d98 Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/8c/3c7fbcd903744b20fd7567a1fcefa99133b5bc Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/43/80f66cf5cbd858b73156681d665593ec80a58d Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/e9/65047ad7c57865823c7d992b1d046ea66edf78 Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/df/30427c488aeab84b2352bdf88a3b19223f9d7a Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/1e/146e67985dcd71c74de79613719bef7bddca4a Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/0d/666fc313e6f4829e8d4446d4529394f8e464a9 Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/d7/c40db3ffe2b87e96b94c280a67265c8de7a4ad Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/e5/6a4d15295d3754310f114c86d93645308110ad Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/0f/419b54b956f4a849a689105216282f1a4c749a Diff Switch to side-by-side view

ForgeGit/forgegit/tests/data/testgit.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 Diff Switch to side-by-side view

1 2 3 .. 172 > >> (Page 1 of 172)