Merge branch 'feature/tracker' into dev

Conflicts:
ForgeTracker/forgetracker/tests/functional/test_root.py

Jenny Steele Jenny Steele 2010-10-13

1 2 3 .. 6 > >> (Page 1 of 6)
added Allura/allura/lib/widgets/resources/js/state_field.js
added Allura/allura/lib/widgets/resources/js/sortable_repeated_field.js
added Allura/allura/lib/widgets/templates/admin_field.html
added Allura/allura/lib/widgets/templates/state_field.html
added Allura/allura/lib/widgets/templates/field_cluster.html
added Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
added Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png
added Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png
added Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
added Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png
added Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
added Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png
added Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
added ForgeTracker/forgetracker/templates/tracker/index.html
added ForgeTracker/forgetracker/templates/tracker/new_ticket.html
added ForgeTracker/forgetracker/templates/tracker/admin_fields.html
added ForgeTracker/forgetracker/templates/tracker/mass_edit.html
added ForgeTracker/forgetracker/templates/tracker/milestone.html
added ForgeTracker/forgetracker/widgets/templates/tracker_widgets/custom_field_admin_detail.html
Allura/allura/lib/widgets/resources/js/state_field.js Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/resources/js/sortable_repeated_field.js Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/templates/admin_field.html Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/templates/state_field.html Diff Switch to side-by-side view
Loading...
Allura/allura/lib/widgets/templates/field_cluster.html Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png Diff Switch to side-by-side view
Loading...
Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/templates/tracker/index.html Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/templates/tracker/new_ticket.html Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/templates/tracker/admin_fields.html Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/templates/tracker/mass_edit.html Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/templates/tracker/milestone.html Diff Switch to side-by-side view
Loading...
ForgeTracker/forgetracker/widgets/templates/tracker_widgets/custom_field_admin_detail.html Diff Switch to side-by-side view
Loading...
1 2 3 .. 6 > >> (Page 1 of 6)