3
0
mirror of https://github.com/reality/dbot.git synced 2024-12-29 14:12:40 +01:00
Commit Graph

1484 Commits

Author SHA1 Message Date
reality
8712216948 dat merge 2013-04-20 10:51:39 +00:00
reality
8d8d32fcc9 debugMode should be false by default 2013-04-20 10:26:04 +00:00
Douglas Gardner
95e7d0ee80 readd strings after weird git explosion 2013-04-20 00:59:31 +00:00
Douglas Gardner
f18c4d0f3a Merge branch 'master' of reality/depressionbot 2013-04-20 00:25:32 +00:00
Sam Nicholls
1123071952 Add timers to config 2013-04-20 02:23:44 +02:00
reality
44d42c5035 load strings first 2013-04-20 00:09:47 +00:00
reality
0f6a486fe7 bump stats lang 2013-04-20 00:04:28 +00:00
reality
e051714b40 Merge pull request #386 from Kagammor/master
Dutch translations++
2013-04-19 17:01:00 -07:00
Niels Simenon
1e30fcfac3 Added Dutch translations for project module. 2013-04-20 01:59:48 +02:00
reality
75b160f161 merge 2013-04-19 23:37:26 +00:00
Niels Simenon
cc0e2030f0 Fixed incorrect spelling correction. 2013-04-20 00:16:58 +02:00
Niels Simenon
b857eaf426 Fixed JSON syntax threat. 2013-04-20 00:13:42 +02:00
Niels Simenon
ff52d7e6f1 Added Dutch translations. 2013-04-20 00:05:46 +02:00
Douglas Gardner
7106d4dd8b Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus 2013-04-19 17:16:11 +00:00
reality
146e7afa5b Don't shit out if there's no highscore quote category 2013-04-19 17:06:19 +00:00
reality
24b7c2b6b4 merge 2013-04-19 13:41:11 +00:00
Douglas Gardner
59b97befed Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus 2013-04-19 13:41:09 +00:00
reality
65302765f0 readd statos [Close #382] 2013-04-19 11:44:33 +00:00
reality
f57a91e481 remove stats [#382] 2013-04-19 11:42:00 +00:00
Douglas Gardner
bddb7ccce4 Add more configuration splurge
+ Added dependency on underscore
+ Added displaying of some configuration options for dent, link, quotes,
  report and web
+ Translated (badly) the word "Milestones"
* Translated and moved the github advert to below the milestones
2013-04-19 10:55:20 +00:00
Douglas Gardner
a61a2300ab Tidy up the project module some more
## Additions
 + Add current branch to display
 + Pass Github repo through to the page
 + Add link to source
 + Differentiate "progress bar" and "milestone" headers again
 + Add Git ``h4``, renamed "version control" because it's more interesting
   to translate
 + Add progress percentages to the progress bars

 - Remove redundant short-hash placeholder
 - Remove extraneous margins on ``ul``
 - Simplify progress calculation code

 * Change some variable names to be more forthcoming about what they
   represent
 * Fix links to the milestones
 * Fix indentation of strings.json
2013-04-19 04:28:03 +00:00
Douglas Gardner
eb1d12ec83 Add hidden counter to imgur
+ Add a counter to the random imgur page.
+ Added functionality to the ``c`` key to toggle the counter display.
+ Added functionality to the ``r`` key to reset the counter to default.
+ Added a new configuration option for a quote category to get the
  default 'highscore' from.

  This commit adds a small decreasing counter to the corner of the
  screen. Hidden by default, press ``c`` to toggle it.

  The counter will begin at highscore + 1, and will decrease with every
  new image. This is intended to be used during contests to see how many
  images one can cycle through before, for example, finding a picture of
  a cat. The counter can be reset using the ``r`` key.

  The highscore is automatically set at page load to the most recent
  quote added to the category specified in the configuration option.
  Therefore it is important that only numeric data is placed in that
  particular quote.

  The score will not reset to a new highscore automatically, and nor
  will a new highscore update the quote category.
2013-04-19 00:02:39 +00:00
reality
75657c5782 Merge branch 'master' of github.com:reality/depressionbot 2013-04-18 23:11:07 +00:00
reality
5108b811a1 bump stats 2013-04-18 23:10:59 +00:00
Sam Nicholls
fd6b048d19 Merge pull request #381 from zuzak/gitstatus
add links to milestones (project)
2013-04-18 15:10:09 -07:00
Douglas Gardner
b4fdfb5104 Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus 2013-04-18 21:40:17 +00:00
Douglas Gardner
940af07b78 add links to milestones 2013-04-18 21:37:17 +00:00
reality
a5d65313a0 Merge pull request #380 from zuzak/gitstatus
Translations, progress bar fallback, lowercasing
2013-04-18 11:58:31 -07:00
reality
93a483a4b3 Fix comments in project, make quotes use bot name & not fail if no quotes, reformatting[#379] 2013-04-18 18:57:04 +00:00
Douglas Gardner
c1693a768f Translations, progress bar fallback, lowercasing
+ Added translations into English for ``cy``, ``es`` and ``na'vi``,
  to ensure that all possible current languages are catered for.
+ Added ``background-color`` rule to progress bars on ``project`` to
  ensure that they are always visible.
+ Forced lowercase for more of the ``project`` page 'cos it looks nice
  (although that's an opinion).
- Removed redundant text shadow rule.
2013-04-18 18:20:58 +00:00
reality
ee28117276 Merge pull request #378 from zuzak/gitstatus
Remove overzealous punctuation
2013-04-18 11:06:07 -07:00
Douglas Gardner
ec431bd257 Merge remote-tracking branch 'origin/gitstatus' into gitstatus
the commit.
2013-04-18 18:00:45 +00:00
Douglas Gardner
fd61f09654 remove errant punctuation 2013-04-18 17:59:01 +00:00
reality
b2e51060f3 Merge pull request #377 from zuzak/gitstatus
Gitstatus
2013-04-18 10:56:14 -07:00
Douglas Gardner
6cf1966967 rm overlooked .js call 2013-04-18 17:53:13 +00:00
reality
e498fc7959 Merge pull request #372 from zuzak/imgur-history
calm down, man
2013-04-18 10:37:21 -07:00
Douglas Gardner
1534d1451c Remove cruft.
- Removed abcdef placeholder from revision total (as the commit is on
  the line below (in longform).
- Removed the English translation of English.
2013-04-18 17:36:43 +00:00
reality
08685481a0 Merge pull request #376 from zuzak/gitignore
update gitignore
2013-04-18 10:35:21 -07:00
Douglas Gardner
abac2fd97a Commit CSS. Remove text shadow. 2013-04-18 17:33:46 +00:00
Douglas Gardner
54beca1501 Add config options; remove closed milestone count 2013-04-18 17:06:25 +00:00
Douglas Gardner
c157ddf08c Added random quote to header 2013-04-18 16:54:09 +00:00
Douglas Gardner
ef2b50863c Renamed "git" "development"
(because I thought having "Development" / "Configuration" would look
cool.
2013-04-18 16:27:07 +00:00
Douglas Gardner
f7dbe77838 Format stuff
## Changelog:

 - Remove Github status call.
 + Closed issues
 + Localised <h1>
 + Add introductory paragraph
 + Add last diff to page
 - Remove jade include to layout.jade
 + Dynamic language metadata
 + CSS
 + Progress bars

 ## Known issues:
 * Loading the closed milestones raises an exception for some reason;
   in a try-catch for now, unsure how to fix.

 ## Still to do:
 * Style loaded modules section (columns?)
 * Shrink footer
 * Do we need a shorthand hash by the revision?
 * Pull req count? (low priority)
2013-04-18 16:17:36 +00:00
Douglas Gardner
985b53c768 Add milestone
+ Bump github
+ Fix Italian translation of revision count
+ Add translation of git to strings.json
  (bonus points if you find a language that needs it)
2013-04-18 14:30:00 +00:00
Douglas Gardner
d3f8e295be convert to dbot.t; add Italian; add debugMode 2013-04-18 11:45:15 +00:00
Douglas Gardner
2a4698c982 push out WIP 2013-04-18 11:06:13 +00:00
Douglas Gardner
d87d6eeeb0 update gitignore 2013-04-18 08:37:30 +00:00
Douglas Gardner
5d41cc633c calm down, man
Add throttle to the spacebar, so you can no longer load another image
whilst the old one is loading.

Hopefully this'll negate some of the API failures we've been getting.
2013-04-17 21:30:05 +00:00
reality
787480647d Merge pull request #371 from zuzak/imgur-history
Imgur history
2013-04-17 14:13:00 -07:00
Douglas Gardner
c9fd314ba4 tidy css 2013-04-17 21:03:40 +00:00