git.onelab.eu Git - myslice.git/commit

git://git.onelab.eu / myslice.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 3aebcde) | patch

author	Thierry Parmentelat <thierry.parmentelat@inria.fr>
	Mon, 16 Dec 2013 10:47:32 +0000 (11:47 +0100)
committer	Thierry Parmentelat <thierry.parmentelat@inria.fr>
	Mon, 16 Dec 2013 10:47:32 +0000 (11:47 +0100)
commit	04ea5e29850e650e370b7815c491f3538b442d9e
tree	46686af4680f4e85d7ab0c2b1e0b8a28a5a8b458	tree \| snapshot
parent	3aebcdea46b9569dcec71b1e799a839c4b169b0b	commit \| diff

merged trash/ into sample/

17 files changed:

myslice/settings.py		diff \| blob \| history
sample/dashboardview.py	[moved from trash/dashboardview.py with 100% similarity]	blob \| history
sample/pluginview.py	[moved from trash/pluginview.py with 100% similarity]	blob \| history
sample/querygridview.py	[moved from trash/querygridview.py with 100% similarity]	blob \| history
sample/querytableview.py	[moved from trash/querytableview.py with 100% similarity]	blob \| history
sample/scrollview.py	[moved from trash/scrollview.py with 100% similarity]	blob \| history
sample/static/css/dashboard.css	[moved from trash/static/css/dashboard.css with 100% similarity]	blob \| history
sample/static/css/sample.css	[moved from trash/static/css/sample.css with 100% similarity]	blob \| history
sample/tabview.py	[moved from trash/tabview.py with 100% similarity]	blob \| history
sample/templates/view-scroll.html	[moved from trash/templates/view-scroll.html with 100% similarity]	blob \| history
sample/templates/view-tab.html	[moved from trash/templates/view-tab.html with 100% similarity]	blob \| history
sample/templates/view-unfold2.html	[moved from trash/templates/view-unfold2.html with 100% similarity]	blob \| history
sample/trashutils.py	[moved from trash/trashutils.py with 100% similarity]	blob \| history
sample/urls.py		diff \| blob \| history
sample/validatebuttonview.py	[moved from trash/validatebuttonview.py with 100% similarity]	blob \| history
trash/__init__.py	[deleted file]	blob \| history
trash/urls.py	[deleted file]	blob \| history

myslice (django)