Commit Graph

Select branches

Hide Pull Requests

1.6.x-dev

1.7.x-dev

1.x

1.x-dev

develop

master

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269678

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#279748

#28

#280

#280

#280969

#281

#281

#282

#282

#282062

#282155

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#30

#300

#300

#301

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#316

#317

#317

#318

#318

#319

#319

#32

#320

#320

#321

#321

#322

#322

#323

#323

#323483

#324

#324

#324764

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#329932

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#369

#369

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#374

#375

#375

#376

#376

#377

#377

#378

#378

#379

#379

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#390

#390

#391

#391

#392

#392

#393

#393

#393267

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#410

#410

#410319

#411

#411

#412

#412853

#412853

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#430

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#447

#448

#448

#449

#449

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#470

#470

#471

#471

#472

#472

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#480

#480

#481

#481

#482

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#487

#488

#488

#489

#489

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#50

#500

#500

#501

#501

#502

#502

#503

#503

#503687

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#509740

#51

#510

#510

#511

#511

#512

#512

#513

#513

#513639

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#520

#520

#521

#521

#521484

#522

#522

#523

#523

#524

#524

#524927

#525

#525

#526

#526

#527

#528

#528

#53

#54

#542379

#55

#56

#567131

#57

#58

#580846

#585451

#59

#593398

#6

#60

#61

#618948

#62

#62

#629178

#63

#63

#64

#65

#65

#650312

#651134

#652174

#657632

#657881

#66

#67

#67

#68

#68

#685711

#69

#69

#698327

#7

#70

#70

#71

#71

#72

#72

#721560

#73

#73

#74

#74

#75

#75

#76

#76

#762756

#764909

#765110

#769309

#77

#77

#771559

#78

#78

#79

#79

#8

#80

#80

#81

#81

#82

#82

#828435

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

V1.6.2.20260323

v0.1.0.20170721_beta

v1.0.0.20170808_beta

v1.0.0.20170816_beta

v1.0.0.20170915_beta

v1.0.0.20171026_beta

v1.0.0.20171206_beta

v1.0.0.20180117_beta

v1.0.0.20180119_beta

v1.0.0.20180204_beta

v1.0.0.20180222_beta

v1.0.0.20180308_beta

v1.0.0.20180310_beta

v1.0.0.20180314_beta

v1.0.0.20180327_beta

v1.0.0.20180401_beta

v1.0.0.20180406_beta

v1.0.0.20180417_beta

v1.0.0.20180506_beta

v1.0.0.20180513_beta

v1.0.0.20180618_beta

v1.0.0.20180630_beta

v1.0.0.20180806_beta

v1.0.0.20180911_beta

v1.0.0.20181031_beta

v1.0.0.20181127_beta

v1.0.0.20181210_beta

v1.0.0.20190111_beta

v1.0.0.20190301_beta

v1.0.0.20190318_beta

v1.0.0.20190407_beta

v1.0.0.20190410_beta

v1.0.0.20190418_beta

v1.0.0.20190510_beta

v1.0.0.20190628_beta

v1.0.0.20190705_beta

v1.0.0.20190930_beta

v1.0.0.20191101_beta

v1.0.0.20191212_beta

v1.0.0.20200228_beta

v1.0.0.20200506_beta

v1.0.0.20201001_beta

v1.0.0.20201008_beta

v1.2.0.20210125_beta

v1.2.0.20210401_beta

v1.2.1.20210731_beta

v1.2.2.20211011_beta

v1.3.2.20220113

v1.3.3.20220121

v1.3.4.20220530

v1.3.5.20221214

v1.4.0.20230711

v1.5.0.20240328

v1.5.1.20240903

v1.5.2.20240906

v1.5.3.20250217

v1.5.4.20250312

v1.6.0.20250331

v1.6.1.20250430

v1.6.3.20260520

v1.6.4.20260522

v1.6.5.20260602

Mono Color

• 60f6f2007e 修正普通表单搜索隐藏时selectpage宽度不能自适应 pppscn 2018-07-21 16:22:04 +0800
• 627bcf978f Pre Merge pull request !68 from 特伦C/master 特伦C 2018-07-20 07:42:19 +0800
• fde144057d 防止非查询字段而导致的append报错的问题 terranc 2018-07-20 07:40:35 +0800
• 30e44443c9 Pre Merge pull request !67 from 啊狠大虾/master 啊狠大虾 2018-07-16 23:30:33 +0800
• 965bc243e9 fdsf 啊狠大虾 2018-07-16 23:30:09 +0800
• f5a42d16ed Merge remote-tracking branch 'karson/master' PPPSCN 2018-07-02 21:38:48 +0800
• 1da35ed06d Pre Merge pull request !63 from 清天君/master 朴新教育 2018-07-02 21:37:47 +0800
• f1cabaff19 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-07-02 21:37:47 +0800
• a9e217232a Pre Merge pull request !69 from YTOTW/master Karson 2018-07-02 21:37:37 +0800
• 3683728023 修复switch.stub丢失的BUG Karson 2018-07-02 21:37:37 +0800
• e14cd6bc28 Pre Merge pull request !63 from 清天君/master 朴新教育 2018-07-02 16:09:16 +0800
• 6d15f8a064 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-07-02 16:09:16 +0800
• 3eb938e722 修复Layer样式丢失的BUG Karson 2018-07-02 16:09:05 +0800
• 05219af9f8 Merge remote-tracking branch 'karson/master' PPPSCN 2018-07-02 13:26:37 +0800
• 21d8f73ffa Pre Merge pull request !63 from 清天君/master 朴新教育 2018-07-01 23:28:38 +0800
• 3878d3ae58 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-07-01 23:28:38 +0800
• fc2f8774e7 修复Layer样式丢失的BUG Karson 2018-07-01 23:28:28 +0800
• 9b54755f5c Pre Merge pull request !63 from 清天君/master 朴新教育 2018-07-01 23:27:01 +0800
• f8ffd21356 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-07-01 23:27:01 +0800
• 66edd96c02 修复Layer样式丢失的BUG Karson 2018-07-01 23:26:51 +0800
• db052b31a4 Pre Merge pull request !63 from 清天君/master 朴新教育 2018-07-01 10:54:07 +0800
• f255aed851 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-07-01 10:54:07 +0800
• e9d26ea603 修复Layer皮肤在部分方法下不启作用的BUG 修复Layer.msg的显示错位 优化Layer.tab的显示样式 Karson 2018-07-01 10:53:54 +0800
• eac65452c0 Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-30 16:40:20 +0800
• ff83dd8c40 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-30 16:40:20 +0800
• b65452c7c3 修复通用搜索在启用自定义搜索时的BUG Karson 2018-06-30 16:40:11 +0800
• b539aa10cb Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-30 15:07:51 +0800
• c18454ffb8 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-30 15:07:51 +0800
• 4198f126a9 新增多个FormBuilder用于生成组件的方法 修复datetimerange的format特殊情况下失效的BUG 优化layer-footer的显示 新增CRUD一键生成switcher组件 v1.0.0.20180630_beta Karson 2018-06-30 15:07:41 +0800
• 9dfbd27fcb Merge remote-tracking branch 'karson/master' PPPSCN 2018-06-29 16:22:49 +0800
• 280245add5 Merge remote-tracking branch 'karson/master' PPPSCN 2018-06-29 16:15:24 +0800
• 9c4916a315 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-27 13:57:30 +0800
• cdfac32540 Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-27 13:57:29 +0800
• 1b08595857 新增模型支持目录结构命名 新增Table.api.formatter.normal格式化 优化CRUD删除模式移除空目录 优化多个表格内容格式化方法 Karson 2018-06-27 13:57:19 +0800
• ea06d5f2d0 Merge remote-tracking branch 'karson/master' PPPSCN 2018-06-26 00:09:40 +0800
• b441ee6e27 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-25 23:22:46 +0800
• 37e9a58f0a Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-25 23:22:45 +0800
• 52712b644e 新增alert-success-light等样式类 优化压缩基础CSS文件 Karson 2018-06-25 23:22:33 +0800
• a021baaf7a Merge remote-tracking branch 'karson/master' PPPSCN 2018-06-25 11:43:39 +0800
• ddd0cafb44 Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-24 23:45:33 +0800
• d939d5e94f Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-24 23:45:33 +0800
• 98e5f32429
  Merge pull request #31 from gh81997167/master Karson 2018-06-24 23:44:40 +0800
• 7248efd45b Pre Merge pull request !65 from 清天君/admin_locked 朴新教育 2018-06-24 23:39:35 +0800
• b539a29be2 Pre Merge pull request !63 from 清天君/master 朴新教育 2018-06-24 23:39:35 +0800
• d54583e946 !66 修复执行install命令主机不是127.0.0.1的时候安装失败问题 Merge pull request !66 from 小埋酱/master 幻灵姬风 2018-06-24 23:39:29 +0800
• 03f6ba62d6 修复执行install命令主机不是127.0.0.1的时候安装失败问题 kira 2018-06-23 23:51:26 +0800
• f4604e1265 修复执行install命令主机不是127.0.0.1的时候安装失败问题 kira 2018-06-23 23:42:38 +0800
• 9eb5d791ab Merge remote-tracking branch 'karson/master' PPPSCN 2018-06-18 21:34:57 +0800
• 3920be0f2b 新增短信发送单IP总数限制 新增$selectpageFields字段用于控制selectpage的字段 修复指定语言不起作用的Bug 修复Selectpage过滤字段不起作用的Bug 优化跳转页面,允许页面停留显示 优化弹窗内部显示,去除min-height限制 优化Citypicker城市数据，使用最新数据源 优化install.php错误提醒 优化部分多语言显示 v1.0.0.20180618_beta Karson 2018-06-18 11:31:35 +0800
• 36271ab07b 严格匹配 eviltrue 2018-06-13 09:55:31 +0800
• bbaca6254b 蓝色主题 PPPSCN 2018-06-11 13:43:00 +0800
• e0df8ad34d Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-31 22:33:01 +0800
• 4bb1cbd2dd 优化默认生成的CRUD列表中TD不换行 优化通用搜索显示 Karson 2018-05-31 21:07:53 +0800
• 045647c407 修复searchList使用二维数组数据源时排序丢失的BUG 修复后台插件管理登录状态失效的处理和判断 优化列表页通用搜索样式和排版调整 修复关联搜索使用find_in_set时的BUG 优化CRUD在生成中文数据时的编码问题 Karson 2018-05-31 20:26:35 +0800
• 08a580c965 Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-27 12:01:25 +0800
• de8ea27542 新增按钮visible配置 修复commonsearch中兼容配置 修复安装数据库在启用严格模式下无法导入的BUG Karson 2018-05-26 22:27:15 +0800
• 2a332e3939 管理系统》权限管理》管理员管理的隐藏功能改为锁定功能，锁定以后用户不能再登录。 zhangqingtian@pxjy.com 2018-05-17 12:04:13 +0800
• 81f7850046 重建分支，还原管理员锁定功能 zhangqingtian@pxjy.com 2018-05-17 11:58:19 +0800
• 45ccd336ee 管理系统，权限管理，管理员管理的隐藏功能改为锁定功能，锁定以后用户不能再登录。 zhangqingtian@pxjy.com 2018-05-17 11:48:49 +0800
• efbcba4132 权限管理角色权限分配，jstree列表选项样式调整，取消固定width:80px，防止选项文字过多，显示不完整。 zhangqingtian@pxjy.com 2018-05-17 10:16:27 +0800
• 6aa13bb48a Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-16 19:52:51 +0800
• ddd75e44c0 移除添加规则中冗余元素 Karson 2018-05-16 18:29:54 +0800
• 2ad4650730 修复后台关闭当前选项卡未激活前一选项卡的BUG 修复在移动端包含tooltip需要点击两次的BUG Karson 2018-05-16 17:13:30 +0800
• cb77b7c985 新增Table.api.formatter.toggle，文件大小格式化，更新后需要压缩打包后台的JS zhangqingtian@pxjy.com 2018-05-16 11:08:14 +0800
• 320c8e10ce Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-14 15:04:50 +0800
• 7d68471c42 手机端左右滑动切换菜单 TC_ZK 2018-05-14 08:27:46 +0800
• ac6aa072a2 新增Table.api.formatter.toggle切换 Karson 2018-05-13 22:59:41 +0800
• 47d2a430f3 !61 增加 env 配置示例 Merge pull request !61 from F4NNIU/add_env_sample F4NNIU 2018-05-13 17:18:57 +0800
• 37fce92178 增加 env 配置示例 F4NNIU 2018-05-13 16:52:48 +0800
• afbe9d2770 修复在自定义后以路径时二级菜单下的BUG Karson 2018-05-13 16:42:24 +0800
• 0d78f12ac0 !59 php5.* opcache扩展判断 Merge pull request !59 from 大饼博士/master 大饼博士 2018-05-13 15:55:03 +0800
• 1f9a6e4eb5 更新版本号 v1.0.0.20180513_beta Karson 2018-05-13 15:47:05 +0800
• 6e408fb2d1 新增二级菜单,可在config.php中开启或关闭 新增渲染状态时搜索匹配 优化渲染图片时点击打开 修复渲染日期时非整型字段的BUG 优化通用搜索功能 优化后台显示基础大小为13px Karson 2018-05-13 15:46:11 +0800
• 29935d481e 增加 env 参考配置 F4NNIU 2018-05-11 23:12:49 +0800
• c62c0dfdc2 php5.* opcache加载判断 大饼博士 2018-05-11 12:11:28 +0800
• bbad609e0e Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-08 12:28:24 +0800
• 3fac3ae3c3 修复插件管理图片无法展示的BUG Karson 2018-05-08 10:53:44 +0800
• 14c78fe3c4 Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-07 21:06:14 +0800
• 2a990d3ceb 修复插件管理支付弹窗为空的BUG Karson 2018-05-07 12:36:48 +0800
• ca0b1a9719 !31 直播流用户名 Merge pull request !31 from Chao Xing/xingchao Chao Xing 2018-05-07 12:16:59 +0800
• e4fa93ac5b '直播流用户名' xingchao 2018-05-07 12:16:05 +0800
• 6268040e6f !30 直播 Merge pull request !30 from Chao Xing/xingchao Chao Xing 2018-05-07 11:55:29 +0800
• 46e12d9847 '直播' xingchao 2018-05-07 11:54:38 +0800
• 386cf47785 !29 有直播流可以直播 Merge pull request !29 from Chao Xing/xingchao Chao Xing 2018-05-07 11:52:27 +0800
• b525fd1b49 '有直播流可以直播' xingchao 2018-05-07 11:50:39 +0800
• b65792df4c !28 去注释 Merge pull request !28 from Chao Xing/xingchao Chao Xing 2018-05-07 11:34:39 +0800
• 0f25bd16ac '去注释' xingchao 2018-05-07 11:33:40 +0800
• 4e97cd3558 !27 添加直播流 Merge pull request !27 from Chao Xing/xingchao Chao Xing 2018-05-07 11:29:03 +0800
• 85adc4f880 '添加直播流' xingchao 2018-05-07 11:27:31 +0800
• 766f24b08e Merge remote-tracking branch 'karson/master' PPPSCN 2018-05-07 09:49:33 +0800
• ea0c09b755 !26 活跃直播流 Merge pull request !26 from Chao Xing/xingchao Chao Xing 2018-05-06 11:28:54 +0800
• b69b0022af 'stream_addr' xingchao 2018-05-06 11:27:56 +0800
• aa5d979c28 !25 活跃直播流 Merge pull request !25 from Chao Xing/xingchao Chao Xing 2018-05-06 11:25:04 +0800
• 634c2b9095 'stream_addr' xingchao 2018-05-06 11:24:03 +0800
• 882d15f852 !24 活跃直播流 Merge pull request !24 from Chao Xing/xingchao Chao Xing 2018-05-06 11:22:59 +0800
• b2ccc14fae 'stream_addr' xingchao 2018-05-06 11:21:59 +0800
• f57eb0be7c !23 活跃 Merge pull request !23 from Chao Xing/xingchao Chao Xing 2018-05-06 11:01:09 +0800
• 5ab960492c 'stream_addr' xingchao 2018-05-06 10:58:19 +0800
• 58cbe6d19e !22 活跃直播流 Merge pull request !22 from Chao Xing/xingchao Chao Xing 2018-05-06 10:51:26 +0800
• 9557929665 'stream_addr' xingchao 2018-05-06 10:49:16 +0800