Log In
beaker
Clone
Source Code
GIT
Source
Stats
Overview
Files
Commits
Branches
Forks
Releases
7662a2a
Merge branch 'bz644132' into develop
Merged and Committed by Raymond Mancy
13 years ago
raw
patch
tree
parents
828a3880b49fe58fe44ea2aab411f50bc86c311d
ce609f179092ca0114b9f06fd59a169829ccd89b
13 files changed.
602 lines added
.
91 lines removed
.
Server/bkr/server/activity.py
file modified
+1
-0
Server/bkr/server/controllers.py
file modified
+44
-57
Server/bkr/server/distro.py
file modified
+1
-0
Server/bkr/server/jobs.py
file modified
+1
-0
Server/bkr/server/recipes.py
file modified
+1
-0
Server/bkr/server/search_utility.py
file modified
+66
-12
Server/bkr/server/static/javascript/searchbar_v6.js
Server/bkr/server/static/javascript/searchbar_v5.js
file renamed
+21
-6
Server/bkr/server/templates/system.kid
file modified
+2
-2
Server/bkr/server/test/data_setup.py
file modified
+9
-2
Server/bkr/server/test/selenium/test_distro_search.py
file added
+284
Server/bkr/server/test/selenium/test_system_search.py
file added
+72
Server/bkr/server/test/selenium/test_task_search.py
file added
+74
Server/bkr/server/widgets.py
file modified
+26
-12
Merge branch 'bz644132' into develop Conflicts: Server/bkr/server/
controllers.py
Server/bkr/server/activity.py
file modified
+1
-0
Server/bkr/server/controllers.py
file modified
+44
-57
Server/bkr/server/distro.py
file modified
+1
-0
Server/bkr/server/jobs.py
file modified
+1
-0
Server/bkr/server/recipes.py
file modified
+1
-0
Server/bkr/server/search_utility.py
file modified
+66
-12
Server/bkr/server/static/javascript/searchbar_v6.js
Server/bkr/server/static/javascript/searchbar_v5.js
file renamed
+21
-6
Server/bkr/server/templates/system.kid
file modified
+2
-2
Server/bkr/server/test/data_setup.py
file modified
+9
-2
Server/bkr/server/test/selenium/test_distro_search.py
file added
+284
Server/bkr/server/test/selenium/test_system_search.py
file added
+72
Server/bkr/server/test/selenium/test_task_search.py
file added
+74
Server/bkr/server/widgets.py
file modified
+26
-12