Commit graph

149 commits

Author SHA1 Message Date
556e254870 Merge remote branch 'origin/deployed'
* origin/deployed:
  silence keyringanalyzer
  fix path handling in keyringanalyzer
  add flattr button
2010-06-11 20:56:05 +02:00
71c24cf9e3 silence keyringanalyzer 2010-06-06 00:39:20 +02:00
3e0df60e17 fix path handling in keyringanalyzer 2010-06-06 00:31:41 +02:00
3e8f1f10e6 Merge branch 'master' into lenny
* master:
  add flattr button
2010-06-06 00:29:46 +02:00
560aba70d9 add flattr button 2010-06-06 00:29:14 +02:00
daed37c4ab add flattr button 2010-06-06 00:27:11 +02:00
c06107c597 add flattr button 2010-06-06 00:26:49 +02:00
f2e90118f6 Merge branch 'master' into pylons0.10
* master:
  updated translations
  add support for non-url information
2010-06-04 00:35:58 +02:00
770a533e40 add support for non URL-Information 2010-06-04 00:29:28 +02:00
4eb9421004 updated translations 2010-06-04 00:29:03 +02:00
2aec4f8f98 add support for non-url information
* add ssh commands for MIA information, owned debian.net domains and
  group membership
* add support for specifying type of pattern
2010-06-04 00:24:15 +02:00
f4c2c2d58d Merge branch 'master' into pylons0.10
* master:
  update copyright information
  add ChangeLog file
2010-06-03 23:37:54 +02:00
b8af34c80b update copyright information 2010-06-03 23:33:49 +02:00
4d8fd2e9cf add ChangeLog file 2010-06-03 23:28:03 +02:00
74ed088cf9 Merge branch 'extraparams' into pylons0.10
* extraparams:
  generate wikihomepage from name if parameter is missing
  add translations for new pattern labels
  add support for optional patterns
  support non unicode fields
  add new patterns for wiki and forum
  improve handling of missing fields
  accept extra fields forumsid and wikihomepage
  use the fixed set of dependency versions from Lenny
2010-06-03 23:08:05 +02:00
cf07a446b2 Merge branch 'extraparams' into lenny
* extraparams:
  generate wikihomepage from name if parameter is missing
  add translations for new pattern labels
  add support for optional patterns
  support non unicode fields
  add new patterns for wiki and forum
  improve handling of missing fields
  accept extra fields forumsid and wikihomepage
2010-06-03 22:59:25 +02:00
bbd6ae9017 generate wikihomepage from name if parameter is missing 2010-06-03 22:58:34 +02:00
44f5ffa8c3 add translations for new pattern labels 2010-06-03 22:39:13 +02:00
3a28db9439 add support for optional patterns 2010-06-03 22:35:37 +02:00
cce0d82f56 support non unicode fields 2010-06-03 22:25:46 +02:00
ce83914398 add new patterns for wiki and forum 2010-06-03 21:59:54 +02:00
19e6e0f191 improve handling of missing fields 2010-06-03 21:58:44 +02:00
c3afa11013 accept extra fields forumsid and wikihomepage 2010-06-03 21:49:34 +02:00
03954ba7e9 Merge branch 'newrules' into pylons0.10
* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
  add ubuntudiff to new group Ubuntu

Resolved conflicts:
	ddportfolioservice/i18n/ddportfolioservice.pot
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
	ddportfolioservice/model/ddportfolio.ini
2010-05-10 21:33:50 +02:00
2b6e6869f7 Merge branch 'newrules' into lenny
* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
2010-05-10 21:22:59 +02:00
5509660a6f updated translations 2010-05-10 21:22:50 +02:00
c78f830b35 add ideas for SSH functions as comment 2010-05-10 21:18:38 +02:00
2f49b0a466 add idea for debconf list search as comment 2010-05-10 21:18:00 +02:00
5215d8d266 add Debian search 2010-05-10 21:17:14 +02:00
2c0ff46c7f add website google search 2010-05-10 21:15:46 +02:00
9cc4597bc3 add patch tracker 2010-05-10 21:13:57 +02:00
c5b592596e add piuparts 2010-05-10 21:13:03 +02:00
ea095463e1 add support for "firstchar" in patterns 2010-05-10 21:10:37 +02:00
8e70fbdb7f Merge branch 'newrules' into lenny
* newrules:
  add ubuntudiff to new group Ubuntu
2010-05-10 20:16:02 +02:00
f5879c5ab0 add ubuntudiff to new group Ubuntu 2010-05-10 20:15:49 +02:00
f5363a360c use url instead of url_for 2010-05-10 19:51:45 +02:00
f5f5e366ea modernize unit tests 2010-05-10 19:51:45 +02:00
2d12dd6a28 update line numbers in translation files 2010-05-10 19:51:45 +02:00
39fb201f84 upgrade result page to Pylons 0.10 2010-05-10 19:51:45 +02:00
0b3373da0e import missing abort function 2010-05-10 19:51:44 +02:00
c043f7b2bc update year in translations 2010-05-10 19:51:44 +02:00
64241e4028 fix unit tests 2010-05-10 19:51:44 +02:00
21b8d883d8 upgrade showformscripts controller and template 2010-05-10 19:51:44 +02:00
7e047e9b15 update translation 2010-05-10 19:51:44 +02:00
7cb0b383a3 upgrade mako templates, add explicit webhelpers 2010-05-10 19:51:44 +02:00
716ca8d40a adapt error controller to new Pylons 2010-05-10 19:51:44 +02:00
794bed92fd make the application start with pylons 0.10 2010-05-10 19:51:44 +02:00
d0082377cd use the fixed set of dependency versions from Lenny
this allows to create a clean virtualenv that behaves like a Debian Lenny
Python setup
2010-05-10 19:25:33 +02:00
284844168c ignore .coverage 2010-05-10 18:46:17 +02:00
23098f1647 use ; instead of & for merkel search url 2009-09-14 21:49:28 +02:00