Commit Graph - dbot - GitCom: Git with a cup of Com

GitHub/dbot

Fork 1

mirror of https://github.com/reality/dbot.git synced 2025-01-27 12:34:15 +01:00

Commit Graph

Select branches

Hide Pull Requests

betterusers

fixusers

master

#10

#10

#101

#101

#102

#102

#103

#103

#104

#104

#108

#108

#109

#109

#11

#11

#110

#110

#114

#114

#12

#12

#121

#121

#123

#123

#13

#130

#130

#138

#138

#139

#139

#14

#14

#148

#148

#15

#15

#17

#17

#172

#172

#174

#174

#175

#175

#178

#178

#18

#18

#19

#19

#194

#194

#195

#195

#196

#196

#197

#197

#199

#199

#2

#2

#20

#20

#200

#200

#202

#202

#203

#203

#204

#204

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#22

#22

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#228

#228

#229

#229

#23

#23

#237

#237

#238

#238

#24

#24

#248

#248

#25

#25

#251

#251

#253

#253

#254

#254

#255

#255

#256

#256

#258

#258

#26

#26

#265

#265

#267

#267

#27

#27

#270

#270

#274

#274

#275

#275

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#285

#285

#29

#29

#292

#292

#3

#3

#30

#30

#301

#301

#303

#303

#304

#304

#306

#306

#309

#309

#31

#31

#310

#310

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#32

#320

#320

#321

#321

#322

#322

#323

#323

#324

#324

#325

#325

#327

#327

#329

#329

#33

#33

#330

#330

#334

#334

#34

#34

#340

#340

#342

#342

#343

#343

#35

#35

#354

#354

#357

#357

#358

#358

#36

#36

#363

#363

#364

#364

#365

#365

#366

#366

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#376

#376

#377

#377

#378

#378

#38

#38

#380

#380

#381

#381

#383

#383

#384

#384

#385

#386

#386

#39

#39

#391

#391

#393

#393

#395

#395

#396

#396

#397

#397

#4

#4

#40

#40

#400

#400

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#409

#409

#41

#41

#410

#410

#411

#411

#414

#414

#418

#418

#42

#42

#424

#424

#425

#425

#428

#428

#429

#429

#43

#43

#44

#44

#449

#45

#45

#451

#451

#46

#46

#461

#461

#47

#47

#48

#48

#484

#484

#485

#485

#49

#49

#5

#5

#50

#50

#505

#505

#51

#51

#52

#52

#525

#525

#526

#526

#528

#528

#529

#529

#53

#53

#535

#535

#539

#539

#541

#541

#55

#55

#56

#56

#561

#561

#57

#57

#576

#576

#58

#58

#589

#589

#59

#59

#590

#590

#6

#6

#60

#600

#600

#604

#604

#607

#61

#61

#615

#618

#623

#624

#627

#635

#637

#638

#641

#642

#643

#644

#645

#646

#648

#649

#652

#654

#655

#655

#656

#657

#657

#658

#659

#660

#660

#661

#662

#662

#664

#665

#666

#667

#667

#668

#669

#67

#67

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#68

#68

#680

#682

#683

#683

#684

#684

#686

#687

#688

#689

#69

#69

#690

#691

#691

#7

#7

#70

#70

#71

#71

#76

#76

#79

#79

#8

#8

#82

#82

#84

#84

#9

#99

#99

v0.1

v0.2

v0.3

v0.3.9

v0.4

e5b2f8c8f2 Add list of authors; shrink tag sizes #396 Douglas Gardner 2013-04-21 05:06:26 +0000
f3681953ed Merge pull request #395 from SamStudio8/database reality 2013-04-20 16:34:18 -0700
0b44f7afb8 add WIP Douglas Gardner 2013-04-20 23:27:50 +0000
b83e497ab9 Merge ab0a110a8e into bd2d0a8953 #395 Sam Nicholls 2013-04-20 14:56:27 -0700
ab0a110a8e Initial databankerisation of profile [#331] * Stats functionality disabled until completion of SamStudio8/dbot-stats#98 * Profile grid currently only works with dbType set to memory * Merge user functionality temporarily disabled #395 Sam Nicholls 2013-04-20 22:51:36 +0100
8e3b153f98 Merge pull request #393 from zuzak/gs2 Sam Nicholls 2013-04-20 13:35:45 -0700
489ea4e090 Merge 9d727a211e into 5f0faed078 #393 Douglas Gardner 2013-04-20 13:08:42 -0700
9d727a211e Complete project module (for now) #393 Douglas Gardner 2013-04-20 20:00:59 +0000
bd2d0a8953 getUser get->read Sam Nicholls 2013-04-20 20:40:30 +0200
5f0faed078 Merge pull request #391 from zuzak/patch-1 reality 2013-04-20 10:50:12 -0700
adcd5803b0 move some stuff to project.js Douglas Gardner 2013-04-20 17:42:34 +0000
4ed297ba15 Merge 123095f624 into 8d8d32fcc9 #391 Douglas Gardner 2013-04-20 10:38:32 -0700
123095f624 fix malformed JSON #391 Douglas Gardner 2013-04-20 17:38:00 +0000
ecd5b4b23c getallusers external reality 2013-04-20 16:34:02 +0000
135b6ecbba fix users not getting pushed to chan [#390] reality 2013-04-20 16:28:12 +0000
3cd4513fe4 fix module loader. admin sets config keys onload. I am incredibly annoyed. [#331] reality 2013-04-20 16:08:34 +0000
466cb12c94 getCurrentConfig, pushconfig, showconfig and setconfig databankerised [#331] reality 2013-04-20 13:50:47 +0000
4319ee18e1 ~addalias command for adding non-used nicks to user alias records [#373] reality 2013-04-20 11:21:04 +0000
8712216948 dat merge reality 2013-04-20 10:51:39 +0000
8d8d32fcc9 debugMode should be false by default reality 2013-04-20 10:26:04 +0000
95e7d0ee80 readd strings after weird git explosion Douglas Gardner 2013-04-20 00:59:31 +0000
f18c4d0f3a Merge branch 'master' of reality/depressionbot Douglas Gardner 2013-04-20 00:25:32 +0000
1123071952 Add timers to config Sam Nicholls 2013-04-20 02:23:44 +0200
44d42c5035 load strings first reality 2013-04-20 00:09:47 +0000
0f6a486fe7 bump stats lang reality 2013-04-20 00:04:28 +0000
e051714b40 Merge pull request #386 from Kagammor/master reality 2013-04-19 17:01:00 -0700
80bc248d36 Merge 1e30fcfac3 into 75b160f161 #386 Kagammor 2013-04-19 17:00:24 -0700
1e30fcfac3 Added Dutch translations for project module. #386 Niels Simenon 2013-04-20 01:59:48 +0200
75b160f161 merge reality 2013-04-19 23:37:26 +0000
cc0e2030f0 Fixed incorrect spelling correction. #385 Niels Simenon 2013-04-20 00:16:58 +0200
b857eaf426 Fixed JSON syntax threat. Niels Simenon 2013-04-20 00:13:42 +0200
ff52d7e6f1 Added Dutch translations. Niels Simenon 2013-04-20 00:05:46 +0200
7106d4dd8b Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus Douglas Gardner 2013-04-19 17:16:11 +0000
146e7afa5b Don't shit out if there's no highscore quote category reality 2013-04-19 17:06:19 +0000
e7e8b95562 Merge d7681d6301 into 24b7c2b6b4 #384 Jade 2013-04-19 09:29:02 -0700
d7681d6301 modified: modules/admin/strings.json #384 $U-N7\jade$ U-N7\jade 2013-04-19 11:24:26 -0400
bd81457f67 modified: modules/admin/strings.json modified: modules/command/strings.json modified: modules/dns/strings.json modified: modules/ignore/strings.json modified: modules/imgur/strings.json modified: modules/kick/strings.json modified: modules/link/strings.json modified: modules/poll/strings.json modified: modules/quotes/strings.json modified: modules/rain/strings.json modified: modules/reddit/strings.json modified: modules/report/strings.json modified: modules/spelling/strings.json modified: modules/users/strings.json $U-N7\jade$ U-N7\jade 2013-04-19 11:14:00 -0400
24b7c2b6b4 merge reality 2013-04-19 13:41:11 +0000
59b97befed Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus Douglas Gardner 2013-04-19 13:41:09 +0000
65302765f0 readd statos [Close #382] reality 2013-04-19 11:44:33 +0000
f57a91e481 remove stats [#382] reality 2013-04-19 11:42:00 +0000
bddb7ccce4 Add more configuration splurge Douglas Gardner 2013-04-19 10:55:20 +0000
a61a2300ab Tidy up the project module some more Douglas Gardner 2013-04-19 04:28:03 +0000
265764f257 Merge eb1d12ec83 into 75657c5782 #383 Douglas Gardner 2013-04-18 17:15:11 -0700
eb1d12ec83 Add hidden counter to imgur #383 Douglas Gardner 2013-04-19 00:02:39 +0000
75657c5782 Merge branch 'master' of github.com:reality/depressionbot reality 2013-04-18 23:11:07 +0000
5108b811a1 bump stats reality 2013-04-18 23:10:59 +0000
fd6b048d19 Merge pull request #381 from zuzak/gitstatus Sam Nicholls 2013-04-18 15:10:09 -0700
631e555bd2 Merge 940af07b78 into a5d65313a0 #381 Douglas Gardner 2013-04-18 14:41:20 -0700
b4fdfb5104 Merge branch 'master' of https://github.com/reality/depressionbot into gitstatus Douglas Gardner 2013-04-18 21:40:17 +0000
940af07b78 add links to milestones #381 Douglas Gardner 2013-04-18 21:37:17 +0000
a5d65313a0 Merge pull request #380 from zuzak/gitstatus reality 2013-04-18 11:58:31 -0700
263bdde4be Merge c1693a768f into 93a483a4b3 #380 Douglas Gardner 2013-04-18 11:57:43 -0700
93a483a4b3 Fix comments in project, make quotes use bot name & not fail if no quotes, reformatting[#379] reality 2013-04-18 18:57:04 +0000
c1693a768f Translations, progress bar fallback, lowercasing #380 Douglas Gardner 2013-04-18 18:20:58 +0000
ee28117276 Merge pull request #378 from zuzak/gitstatus reality 2013-04-18 11:06:07 -0700
9eb1b98fa1 Merge ec431bd257 into b2e51060f3 #378 Douglas Gardner 2013-04-18 11:04:07 -0700
ec431bd257 Merge remote-tracking branch 'origin/gitstatus' into gitstatus #378 Douglas Gardner 2013-04-18 18:00:45 +0000
fd61f09654 remove errant punctuation Douglas Gardner 2013-04-18 17:59:01 +0000
b2e51060f3 Merge pull request #377 from zuzak/gitstatus reality 2013-04-18 10:56:14 -0700
e9902935ce Merge 6cf1966967 into e498fc7959 #377 Douglas Gardner 2013-04-18 10:53:15 -0700
6cf1966967 rm overlooked .js call #377 Douglas Gardner 2013-04-18 17:53:13 +0000
e498fc7959 Merge pull request #372 from zuzak/imgur-history reality 2013-04-18 10:37:21 -0700
1534d1451c Remove cruft. Douglas Gardner 2013-04-18 17:36:43 +0000
2de70c4c3f Merge 5d41cc633c into 08685481a0 #372 Douglas Gardner 2013-04-18 10:36:24 -0700
08685481a0 Merge pull request #376 from zuzak/gitignore reality 2013-04-18 10:35:21 -0700
abac2fd97a Commit CSS. Remove text shadow. Douglas Gardner 2013-04-18 17:33:46 +0000
54beca1501 Add config options; remove closed milestone count Douglas Gardner 2013-04-18 17:06:25 +0000
c157ddf08c Added random quote to header Douglas Gardner 2013-04-18 16:54:09 +0000
ef2b50863c Renamed "git" "development" Douglas Gardner 2013-04-18 16:27:07 +0000
f7dbe77838 Format stuff Douglas Gardner 2013-04-18 16:12:01 +0000
985b53c768 Add milestone Douglas Gardner 2013-04-18 14:30:00 +0000
d3f8e295be convert to dbot.t; add Italian; add debugMode Douglas Gardner 2013-04-18 11:45:15 +0000
2a4698c982 push out WIP Douglas Gardner 2013-04-18 11:06:13 +0000
e6c6230f8e Merge d87d6eeeb0 into 787480647d #376 Douglas Gardner 2013-04-18 01:41:23 -0700
d87d6eeeb0 update gitignore #376 Douglas Gardner 2013-04-18 08:37:30 +0000
5d41cc633c calm down, man #372 Douglas Gardner 2013-04-17 21:30:05 +0000
787480647d Merge pull request #371 from zuzak/imgur-history reality 2013-04-17 14:13:00 -0700
6d338ac0f7 Merge c9fd314ba4 into eb151b658d #371 Douglas Gardner 2013-04-17 14:09:34 -0700
c9fd314ba4 tidy css #371 Douglas Gardner 2013-04-17 21:03:40 +0000
bbece26213 Convert history to list; add toggle for scrollbars Douglas Gardner 2013-04-17 20:55:34 +0000
46932f458c fix cap of 5 Douglas Gardner 2013-04-17 20:04:02 +0000
4c26a0fc3a add history Douglas Gardner 2013-04-17 20:02:36 +0000
b85bbe8d7c Merge b2570a7626 into eb151b658d #370 Douglas Gardner 2013-04-17 08:05:58 -0700
b2570a7626 add reddit functionality to imgu #370 Douglas Gardner 2013-04-17 13:45:01 +0000
b8d674dc89 commit WIP. Douglas Gardner 2013-04-17 01:00:31 +0000
eb151b658d Merge pull request #369 from zuzak/imgur4 reality 2013-04-16 14:42:33 -0700
5d9d58d5a0 Merge cd6678f12b into 4b935bcd9b #369 Douglas Gardner 2013-04-16 14:31:21 -0700
cd6678f12b change link to be monospace #369 Douglas Gardner 2013-04-16 21:30:07 +0000
4b935bcd9b config syntax reality 2013-04-16 21:22:23 +0000
06054bdbf1 revert web again reality 2013-04-16 21:19:52 +0000
2b2d256081 merge reality 2013-04-16 21:19:11 +0000
33e2e12086 recommit api key #368 Douglas Gardner 2013-04-16 21:08:00 +0000
2b9dbea855 improve imgur module Douglas Gardner 2013-04-16 21:03:50 +0000
e7540a3507 stats on web reality 2013-04-16 18:59:29 +0000
9b3e3ec48e fuck web/config.json reality 2013-04-16 18:07:11 +0000
52e6561f51 dirty hack til i sort the thing thing out reality 2013-04-16 18:06:03 +0000
dcf03287f8 forgit config file reality 2013-04-16 17:59:41 +0000
2f11e9fa0e count api/http/images generated by imgur reality 2013-04-16 17:58:37 +0000
3ffc44f444 Merge 3cdaa4b9a6 into 3b5ef9f55e #368 Douglas Gardner 2013-04-16 10:51:47 -0700