Commit Graph

Select branches

Hide Pull Requests

Develop

branch

master

simple_view

#1008

#1012

#1013

#1014

#1018

#102

#1022

#1027

#103

#104

#105

#1052

#1058

#106

#1065

#1066

#1067

#107

#1072

#1073

#1085

#1086

#1088

#1093

#1097

#1099

#11

#1100

#1107

#1117

#1120

#113

#113

#1131

#1137

#1138

#1139

#1142

#1143

#1146

#1147

#1150

#1151

#1156

#1162

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#1173

#1174

#1179

#118

#118

#1186

#1187

#1194

#1200

#1201

#1202

#121

#1211

#1214

#1216

#1218

#1220

#1226

#1228

#1229

#123

#1234

#1237

#1238

#124

#124

#1245

#1246

#1249

#125

#125

#1256

#1258

#1261

#1264

#1266

#1267

#127

#1277

#128

#1282

#1283

#1287

#129

#1296

#13

#130

#1303

#1306

#131

#1310

#1312

#1315

#1316

#1317

#1318

#1320

#1325

#1327

#133

#1330

#1334

#1335

#1337

#134

#1340

#1346

#1350

#1352

#1360

#1366

#1367

#1368

#1369

#1371

#1372

#1373

#1375

#1377

#1379

#139

#1393

#140

#1405

#1409

#141

#1418

#1419

#142

#142

#1425

#1429

#1433

#1437

#1438

#144

#1440

#1443

#145

#1458

#1459

#1460

#1467

#1480

#1487

#149

#15

#150

#1508

#151

#1511

#1516

#152

#153

#1539

#154

#1540

#1551

#1559

#156

#1561

#1562

#1563

#1565

#1570

#1571

#1580

#1585

#1586

#1588

#1590

#1591

#1592

#1593

#1596

#16

#160

#160

#1608

#1613

#1616

#162

#1620

#1623

#1624

#1632

#164

#164

#1650

#1653

#1654

#1655

#1659

#166

#1662

#1667

#167

#1673

#1676

#1681

#1682

#1683

#1684

#1685

#1688

#1689

#1690

#1694

#1696

#17

#1701

#1703

#1704

#1706

#1707

#171

#1710

#1713

#1714

#1720

#1722

#173

#1731

#1736

#1754

#1759

#1762

#1768

#1769

#177

#1771

#178

#179

#1796

#18

#1800

#1801

#181

#181

#1813

#1822

#184

#1852

#1865

#1877

#1879

#1880

#1882

#1885

#189

#1896

#190

#1904

#1907

#1909

#1922

#1926

#1927

#1946

#1949

#1955

#1957

#1968

#1972

#1977

#198

#1989

#1993

#1999

#2016

#2018

#2020

#2023

#2033

#2035

#2070

#2072

#2073

#2079

#208

#2089

#209

#209

#2099

#2106

#2109

#2112

#2117

#2124

#2125

#2128

#2131

#2132

#2143

#2147

#2149

#2152

#2158

#218

#2189

#220

#2202

#2203

#2204

#2205

#221

#2211

#2212

#2219

#222

#2220

#2223

#223

#2238

#2241

#225

#226

#2261

#2262

#2267

#227

#2270

#228

#2288

#229

#230

#232

#2320

#234

#234

#2347

#235

#2353

#236

#2361

#2366

#2375

#2377

#2395

#2396

#2408

#2409

#2420

#2421

#2424

#2429

#2430

#2435

#2436

#245

#2452

#2452

#2458

#246

#2463

#2465

#2467

#2468

#2470

#2479

#2485

#249

#2493

#2497

#2500

#2513

#253

#2535

#254

#2549

#255

#2550

#2550

#2551

#2553

#2557

#2559

#256

#2560

#2567

#2569

#2570

#2573

#2576

#2579

#258

#2580

#2582

#2591

#2594

#260

#2608

#261

#2622

#2628

#2630

#2632

#2633

#2635

#2636

#2638

#2639

#2644

#2645

#2646

#2663

#2666

#2668

#2671

#2672

#268

#2682

#2684

#2695

#2701

#271

#272

#2725

#273

#2731

#2732

#2734

#2736

#2742

#2744

#275

#2751

#2754

#2755

#2758

#2768

#2769

#2770

#2772

#2772

#2775

#2778

#278

#2784

#2788

#279

#2796

#2799

#2799

#2809

#2813

#282

#2827

#2827

#2828

#2828

#2833

#284

#2842

#2843

#2843

#2845

#2846

#2848

#2856

#2862

#2871

#2878

#288

#2883

#2884

#2885

#289

#289

#2892

#2896

#2898

#2898

#2899

#2899

#2902

#2909

#291

#2914

#292

#2921

#2926

#2929

#2929

#2933

#2934

#2936

#2941

#2948

#2948

#2953

#2954

#2955

#296

#2962

#2968

#2968

#2969

#2969

#2970

#298

#2986

#2987

#2988

#299

#2995

#2997

#2997

#2998

#2998

#30

#3000

#3000

#3008

#301

#3013

#3019

#3020

#3020

#3022

#3023

#303

#3035

#3036

#3042

#3053

#3061

#3062

#3063

#3075

#308

#3081

#3084

#3085

#3085

#3087

#3091

#3113

#3119

#3125

#3127

#313

#3132

#3142

#3142

#3154

#3158

#3159

#3160

#3163

#3168

#3169

#317

#3174

#3177

#3177

#3178

#319

#3193

#3195

#3196

#3199

#3200

#3203

#321

#3212

#3214

#3215

#3217

#3223

#3229

#3232

#3235

#3239

#3239

#324

#3240

#3242

#3251

#3253

#3254

#3259

#326

#3262

#3262

#3267

#3272

#3272

#3273

#3276

#3279

#3281

#3282

#3286

#3287

#3287

#3289

#3296

#3297

#3303

#3303

#3306

#3312

#3315

#3316

#3318

#3320

#3325

#3326

#3326

#3327

#3332

#3336

#3337

#3339

#3342

#3346

#3349

#3349

#335

#3350

#3351

#3352

#3352

#3353

#3353

#3355

#3358

#3358

#3362

#3365

#3366

#3369

#3369

#3370

#3370

#3374

#3376

#3376

#3381

#3381

#3383

#3387

#3390

#3394

#3394

#3397

#3399

#34

#3408

#3408

#3409

#3411

#3412

#3418

#3428

#3429

#343

#3433

#3441

#3442

#3443

#3452

#3454

#3456

#3458

#346

#3463

#3464

#3470

#3471

#3473

#3475

#3476

#3477

#3478

#3479

#3481

#3482

#3482

#3484

#3485

#3487

#3488

#3491

#3493

#3494

#3495

#3496

#3498

#3499

#350

#3501

#3504

#3504

#3505

#3506

#3507

#3507

#3508

#3509

#3509

#3511

#3511

#3513

#3516

#3523

#3524

#3525

#3526

#3529

#3530

#3531

#3531

#3532

#3532

#3533

#3533

#3534

#3536

#3540

#3541

#3542

#3550

#3555

#3555

#3562

#3578

#3581

#3584

#3584

#3585

#3587

#3588

#3589

#3591

#3591

#3593

#3595

#3595

#3597

#3598

#3599

#3600

#3601

#3602

#3603

#3605

#3607

#3607

#3611

#3611

#3612

#3612

#3613

#3614

#3615

#3616

#3617

#3618

#3619

#362

#362

#3620

#3621

#3622

#3623

#3624

#3624

#3625

#3626

#3627

#3628

#3629

#3630

#3630

#3631

#3632

#3633

#3634

#3635

#3635

#3636

#3637

#3637

#364

#3640

#3644

#3644

#3645

#3645

#3646

#3647

#3647

#3654

#3654

#3655

#3655

#3657

#3657

#3659

#3659

#3661

#3662

#3662

#3665

#3665

#3666

#3667

#3667

#3668

#3668

#3669

#3669

#3670

#3670

#373

#375

#38

#383

#394

#406

#41

#41

#413

#435

#453

#458

#458

#460

#460

#461

#47

#47

#470

#473

#48

#49

#495

#5

#50

#500

#500

#511

#511

#514

#518

#519

#519

#528

#529

#529

#530

#530

#535

#550

#552

#570

#591

#591

#596

#598

#598

#60

#605

#610

#618

#626

#628

#629

#629

#633

#634

#635

#639

#642

#649

#65

#651

#655

#663

#668

#669

#670

#671

#673

#674

#675

#675

#686

#700

#702

#703

#706

#709

#722

#725

#731

#744

#746

#747

#749

#751

#752

#756

#757

#758

#761

#765

#769

#772

#774

#776

#777

#783

#8

#803

#806

#811

#817

#819

#823

#826

#829

#836

#85

#851

#854

#855

#865

#868

#869

#87

#871

#872

#878

#88

#88

#887

#888

#90

#906

#908

#911

#92

#922

#927

#932

#934

#938

#941

#943

#945

#955

#956

#958

#961

#976

#977

#978

#980

#984

#986

#988

#994

#996

#997

0.6.0

0.6.10

0.6.11

0.6.12

0.6.13

0.6.14

0.6.15

0.6.16

0.6.17

0.6.18

0.6.19

0.6.2

0.6.20

0.6.21

0.6.22

0.6.23

0.6.24

0.6.25

0.6.26

0.6.3

0.6.4

0.6.5

0.6.6

0.6.7

0.6.8

0.6.9

Mono Color

• 897c1648bb Add fix for #58 remove trailing spaces OzzieIsaacs 2016-08-27 10:32:53 +02:00
• 8a9b4e7fc7 remove print Cervinko Cera 2016-08-08 21:04:09 +02:00
• 0f8c308973 Fix for deleting kindle mail adresee #54 Cervinko Cera 2016-08-08 21:01:38 +02:00
• eb8b9bf166 Fix for missing metadata in pdf files Cervinko Cera 2016-08-07 23:34:23 +02:00
• ae1ecf6542 Fix for missing metadata in pdf files Cervinko Cera 2016-08-07 23:32:55 +02:00
• 52ba2adf73 Merge pull request #48 from OzzieIsaacs/patch-1 cervinko 2016-08-07 22:51:06 +02:00
• 79f373d4e6 Merge pull request #49 from OzzieIsaacs/patch-2 cervinko 2016-08-07 22:38:10 +02:00
• df5ab3d294 Merge pull request #50 from OzzieIsaacs/patch-3 cervinko 2016-08-07 22:32:02 +02:00
• 8159cf6b1a Merge remote-tracking branch 'upstream/master' Cervinko Cera 2016-08-07 22:29:21 +02:00
• 829e926770 Add PyPDF2 to vendor Cervinko Cera 2016-08-07 22:12:32 +02:00
• 2b2d485730 upload more than pdf fixes Cervinko Cera 2016-08-07 22:10:00 +02:00
• fee60bb21d Merge branch 'lemmsh-upload_more_than_pdf' Cervinko Cera 2016-08-07 18:47:00 +02:00
• f5773cc75f resolve conflicts with PR 30 Cervinko Cera 2016-08-07 18:46:38 +02:00
• f02ea3b880 Merge pull request #38 from jgillman/update-google-font-protocol cervinko 2016-08-07 14:05:38 +02:00
• 59136a9cc2 Linux path problem solved (finally) OzzieIsaacs 2016-08-07 10:32:45 +02:00
• 5a0faf9950 Now working on linux, too OzzieIsaacs 2016-08-04 09:29:16 +02:00
• 9aac40bfc4 Fix #20 OzzieIsaacs 2016-08-03 13:14:24 +02:00
• 3b5be5dbc4 Update db.py OzzieIsaacs 2016-08-03 07:37:53 +02:00
• da83af092a Fix for #46 encoding issue OzzieIsaacs 2016-08-03 07:35:58 +02:00
• 624737d2e2 Fix for #45 DB_ROOT not found OzzieIsaacs 2016-08-03 07:28:14 +02:00
• f2de1d4c47 change google fonts to local wuqi 2016-07-20 10:41:04 +08:00
• 26c293308c mouse wheel wuqi 2016-07-19 14:48:11 +08:00
• b846cc11d8 fix some error wuqi 2016-07-19 10:59:46 +08:00
• a7117228aa Update Google Font protocol to HTTPS Joel Gillman 2016-07-18 11:10:45 -07:00
• 3a54ff0eb4 browser icon change back wuqi 2016-07-16 17:26:40 +08:00
• ab97ead264 merge test wuqi 2016-07-16 17:17:43 +08:00
• 350f4e21e6 Add txt reader wuqi 2016-07-16 16:44:47 +08:00
• d051a1dbeb Fix login/logout redirect with reverse proxy janeczku 2016-07-15 14:29:57 +02:00
• f95ac38c54 Fix redirects with reverse proxy janeczku 2016-07-15 01:28:12 +02:00
• 34e11fab79 Support reverse proxy subdirectory janeczku 2016-07-14 02:12:21 +02:00
• d0c9bf9e0e Add shebang janeczku 2016-07-14 01:52:06 +02:00
• 9a8d795eff Update epub reader and pdf reader wuqi 2016-07-09 16:54:13 +08:00
• 8a9c97bf69 fb2 uploading Pavel Yakunin 2016-06-18 16:51:16 +03:00
• 8b5bd61467 fb2 uploading Pavel Yakunin 2016-06-18 16:50:32 +03:00
• 82574d2118 Support SMTP without authentication janeczku 2016-06-17 21:32:00 +02:00
• 91eb7129ac Update epub.js janeczku 2016-06-17 21:22:09 +02:00
• 62f9120a0f Merge branch 'zip-check' janeczku 2016-06-17 20:59:51 +02:00
• e42f768909 Check if epub file exists before trying to extract janeczku 2016-06-17 20:59:44 +02:00
• bd686ad6ed Merge branch 'disable-autocomplete' janeczku 2016-06-17 20:01:53 +02:00
• 374cfd866d Disable autocomplete in user edit janeczku 2016-06-17 20:01:44 +02:00
• 46c83bbe8b Fix recursive path creation janeczku 2016-06-17 20:01:27 +02:00
• 062dc4649e Merge branch 'fix-kindle' janeczku 2016-06-17 14:43:02 +02:00
• af1691f919 Fix missing import janeczku 2016-06-17 14:42:39 +02:00
• 43d6077815 cleanup Pavel Yakunin 2016-06-05 22:32:26 +03:00
• 18e341d650 epub uploading Pavel Yakunin 2016-06-05 22:28:30 +03:00
• dc5074a865 default upload logic Pavel Yakunin 2016-06-05 19:52:28 +03:00
• 44df873f33 logging, tmp cleanup Pavel Yakunin 2016-06-05 19:42:18 +03:00
• 027e103ce3 refactoring to make adding new formats possible Pavel Yakunin 2016-06-05 18:41:47 +03:00
• db70e47557 Merge pull request #18 from cervinko/feature-advanced-search Jan B 2016-05-22 14:05:40 +02:00
• c26eb6aa08 add exclude tags to advanced search Cervinko Cera 2016-05-03 14:27:38 +02:00
• 80c3c19c01 some fixes for advanced search Cervinko Cera 2016-05-03 11:00:45 +02:00
• 7fce28790d add search_form.html Cervinko Cera 2016-05-02 23:25:21 +02:00
• 431b6009a5 add advanced search Cervinko Cera 2016-05-02 22:43:50 +02:00
• 1e2a6f2ffb Fix session.rollback on admin account creation janeczku 2016-04-29 22:54:38 +02:00
• 3719b7e4eb Add ANON_BROWSE configuration option janeczku 2016-04-29 22:30:33 +02:00
• 554bc6aaf5 Merge pull request #17 from cervinko/feature-rights-management Jan B 2016-04-29 22:17:30 +02:00
• 3833079973 assign admin all rights in create_admin_user() Cervinko Cera 2016-04-27 19:50:04 +02:00
• 8f4c444929 add basic auth for feed sites Cervinko Cera 2016-04-27 18:29:45 +02:00
• f7e868044e Move vendored libraries to vendor directory janeczku 2016-04-27 17:45:04 +02:00
• f6cf9ac7f7 Update readme.md janeczku 2016-04-27 17:37:19 +02:00
• fe1ab44a58 Add GPL v3 License janeczku 2016-04-27 17:29:57 +02:00
• f66d7ce29b add permission for changing own password Cervinko Cera 2016-04-27 16:00:58 +02:00
• bc35250f28 permission fix in user_edit.html Cervinko Cera 2016-04-27 10:39:52 +02:00
• c7b7b3866e add user-permission management Cervinko Cera 2016-04-27 10:35:23 +02:00
• 5d6f18f4c3 Merge branch 'fix-gitignore' janeczku 2016-04-21 23:14:05 +02:00
• 727a49db6f Add gitignore, config.ini.example janeczku 2016-04-21 23:13:41 +02:00
• 7424418cdf Merge pull request #16 from cervinko/feature-custom_columns Jan B 2016-04-21 23:00:00 +02:00
• 0e4574da91 revert config.ini Cervinko Cera 2016-04-21 20:55:08 +02:00
• b2146ba4b9 add support for is_multiple custom columns Cervinko Cera 2016-04-21 19:18:52 +02:00
• 3f1a54ea59 fix typo in detail.html Cervinko Cera 2016-04-21 14:46:19 +02:00
• 6359ab73a7 remove config.ini Cervinko Cera 2016-04-21 14:42:30 +02:00
• b7f71e563e fix for custom column 'rating' Cervinko Cera 2016-04-21 12:59:49 +02:00
• 931981a37a fix for custom column 'rating' Cervinko Cera 2016-04-21 12:46:26 +02:00
• a21a9d6510 save rating as rating*2 in db and show rating/2 in interface Cervinko Cera 2016-04-21 09:04:08 +02:00
• f57c9c5951 remove if clauses for int and float in edit_book.html Cervinko Cera 2016-04-20 23:53:55 +02:00
• 27d5a79efb remove some commented code and debug prints Cervinko Cera 2016-04-20 19:42:24 +02:00
• 6a3115ebd5 support for custom columns Cervinko Cera 2016-04-20 19:19:44 +02:00
• 9324c554bf support for custom columns Cervinko Cera 2016-04-20 19:12:18 +02:00
• 9a1f48967c support for custom columns Cervinko Cera 2016-04-20 19:10:01 +02:00
• 704198655b custom columns unfinished Cervinko Cera 2016-04-20 18:56:03 +02:00
• 202cbc26a7 custom columns unfinished Cervinko Cera 2016-04-20 00:20:02 +02:00
• 0ee46e4b5e custom columns unfinished Cervinko Cera 2016-04-17 18:03:47 +02:00
• 6c40bfdd08 add config.ini_example and remove config.ini from git Cervinko Cera 2016-04-20 19:25:16 +02:00
• 82271a78c9 config ini test Cervinko Cera 2016-04-20 19:00:17 +02:00
• 135818d18c reset config.ini Cervinko Cera 2016-04-20 18:58:34 +02:00
• 66cea6a3a6 fix for edit page after upload - reset config.ini Cervinko Cera 2016-04-20 08:00:28 +02:00
• cfd5b3ab12 fix for edit page after upload - reset config.ini Cervinko Cera 2016-04-20 07:54:28 +02:00
• 649d54b0f9 fix for edit page after upload Cervinko Cera 2016-04-20 00:30:50 +02:00
• e0432a9ad7 fix for edit page after upload Cervinko Cera 2016-04-20 00:29:53 +02:00
• 2207622bbf fix for edit page after upload Cervinko Cera 2016-04-20 00:23:14 +02:00
• 8d2a865436 Catch file permission errors when uploading PDF JanB 2016-04-17 17:42:22 +02:00
• df480160da Handle race in database creation when running multiple WSGI instances JanB 2016-04-17 17:30:55 +02:00
• 24b2b0a1ce Merge pull request #13 from cervinko/development Jan B 2016-04-17 16:58:46 +02:00
• 96a40a6812 Merge branch 'development' of github.com:cervinko/calibre-web into development Cervinko Cera 2016-04-15 23:54:17 +02:00
• 88b134151d show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver Cervinko Cera 2016-04-15 23:37:09 +02:00
• 826159c432 show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver Cervinko Cera 2016-04-15 23:35:18 +02:00
• 7d148c0a74 show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver Cervinko Cera 2016-04-15 23:37:09 +02:00
• a9801371b6 show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver Cervinko Cera 2016-04-15 23:35:18 +02:00
• 76c7cdf465 Add config option for upload feature JanB 2016-04-15 19:39:25 +02:00
• 952d389dc5 Ship config.ini with defaults; log errors to file; fix OPDS catalog name JanB 2016-04-15 18:23:00 +02:00