Commit Graph

Select branches

Hide Pull Requests

master

#1

#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

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#19

#19

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#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

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#375

#375

#376

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#43

#430

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#480

#481

#481

#482

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#50

#50

#500

#500

#501

#501

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#742939

#75

#75

#76

#76

#77

#77

#78

#78

#780139

#786641

#788658

#788913

#79

#79

#791045

#791183

#794411

#8

#80

#80

#801369

#802025

#81

#81

#82

#82

#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

v2.2

v2.3

v2.4

v3.0

v3.1

v3.2

v3.3

v3.4

v4.0

v4.1

v4.2

v4.3

v4.3.1

v4.4

v4.5.0

v4.5.1

v4.6.0

v4.6.1

v4.6.2

v4.7.0

v4.7.1

v4.7.2

v4.7.3

v4.7.4

v4.7.5

v4.7.6

v4.7.7

v4.7.8

v4.7.9

Mono Color

• 5fbc84f944 全局代码格式化 lerry903 2018-12-01 18:00:21 +0800
• 6a592827e8 若依 3.1 v3.1 RuoYi 2018-12-01 16:14:19 +0800
• 828bd9b85e 重构 zhujj 2018-11-30 17:11:47 +0800
• d75b9f52a8 重构 zhujj 2018-11-30 14:48:16 +0800
• 451caf12fc 修正选中菜单项无效 RuoYi 2018-11-30 11:37:50 +0800
• 8b07c5ca5f 只能生成 zhujj 2018-11-29 18:39:35 +0800
• de6d66aaf9 优化 zhujj 2018-11-29 18:37:54 +0800
• ffe4312c33 Pre Merge pull request !47 from happy-panda/master happy-panda 2018-11-28 22:45:28 +0800
• cfa1b455ee 主题设置栏目皮肤 panmeicheng 2018-11-28 22:45:10 +0800
• 46b8940f0e 展示出主题设置栏目 panmeicheng 2018-11-28 21:53:13 +0800
• a47d5ac91a Merge branch 'master' of https://gitee.com/y_project/RuoYi panmeicheng 2018-11-28 21:51:13 +0800
• 7517b1baa9 !46 多余的标签 Merge pull request !46 from zhangmrit/ruoyi zhangmrit 2018-11-28 19:03:37 +0800
• 5d582331d3 多余的标签 zhangmrit 2018-11-28 18:32:55 +0800
• 87bf2585b5 Pre Merge pull request !44 from zhangmrit/master zhangmrit 2018-11-28 16:48:00 +0800
• 2d99d2c286 !45 补全@Override注解；修正注释中参数项； Merge pull request !45 from tenchiwuyo/master tenchiwuyo 2018-11-28 16:47:42 +0800
• d881d45829 补全@Override注解；修正注释中参数项； andy 2018-11-28 16:19:53 +0800
• 7324e954b4 本地配置 panmeicheng 2018-11-27 21:35:01 +0800
• 4e69a918e7 多余的标签 zhangmrit 2018-11-27 17:33:49 +0800
• d979733ffe Merge remote-tracking branch 'upstream/master' zhangmrit 2018-11-27 15:34:00 +0800
• 28ada814e5 Merge remote-tracking branch 'upstream/master' Ray Wang 2018-11-27 10:10:31 +0800
• 66aabcd2b4 !43 修复菜单,部门管理tree控件展开/折叠不可用问题 Merge pull request !43 from chenzz/Branch_bug_fix chenzz 2018-11-26 15:37:18 +0800
• 6128d816de 修复菜单,部门管理tree控件展开/折叠不可用问题 chenzz 2018-11-26 15:35:37 +0800
• f0fd7772d7 Pre Merge pull request !42 from chenzz/master chenzz 2018-11-26 14:49:32 +0800
• dcd7e524e4 修复菜单,部门管理tree控件展开/折叠不可用问题 升级springboot版本到2.1.0 chenzz 2018-11-26 14:40:28 +0800
• 870c2fba32 Merge remote-tracking branch 'upstream/master' Ray Wang 2018-11-26 09:44:15 +0800
• 553358aa12 新增提交静默更新表格方法 RuoYi 2018-11-25 17:27:57 +0800
• 650f89ac13 任务日志新增详细 RuoYi 2018-11-24 16:13:35 +0800
• 1292dcf579 Excel注解新增 height/width/suffix/defaultValue RuoYi 2018-11-24 08:54:01 +0800
• 1c1078565a Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-23 22:43:53 +0800
• 4d2d5defb9 Excel注解新增 dateFormat日期格式/readConverterExp读取内容转表达式 RuoYi 2018-11-23 22:43:20 +0800
• 75f27dc536 删出冗余代码 wangchl 2018-11-23 17:16:48 +0800
• d7d50643c8 去除测试代码 zhaocongcong 2018-11-23 16:08:05 +0800
• aa0e776cb4 Merge remote-tracking branch 'upstream/master' Ray Wang 2018-11-23 14:07:32 +0800
• aa06f1adc5 代码生成datas变量全局 RuoYi 2018-11-23 13:26:03 +0800
• a42c824e92 文件路径保持与packageName一致 RuoYi 2018-11-22 21:33:57 +0800
• 2039b4af8c 支持根据数据源生成代码 Ray Wang 2018-11-22 15:57:28 +0800
• 67e87bde94 在线用户服务修改 RuoYi 2018-11-22 13:03:57 +0800
• a2735adc57 !39 ruoyi-system模块下SysUserOnlineServiceImpl未实现ISysUserOnlineService Merge pull request !39 from TyroneGo/master 若依 2018-11-22 12:35:11 +0800
• 80bda1909c SysUserOnlineServiceImpl类没有实现ISysUserOnlineService Tyrone 2018-11-22 10:27:16 +0800
• e3ea6d7246 Pre Merge pull request !38 from 想飛的鳄鱼/master Administrator 2018-11-22 09:23:22 +0800
• a46738dd9d 会话获取Principal RuoYi 2018-11-22 09:28:06 +0800
• 8ac2a856b2 新增重置通知的定时调度 Administrator 2018-11-22 09:23:22 +0800
• 5e434a4d32 Merge branch 'master' of https://gitee.com/cronie/RuoYi.git Administrator 2018-11-22 09:21:01 +0800
• c96b73bbda 代码生成优化 RuoYi 2018-11-21 23:37:09 +0800
• 048b60b751 新增监控模块 Administrator 2018-11-21 17:32:19 +0800
• 861b49a415 解决定时调度无法调用父类方法的问题 Administrator 2018-11-21 17:30:07 +0800
• 4fed9a1e50 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-19 18:05:57 +0800
• b0495c23a6 修复热部署引起Null RuoYi 2018-11-19 18:05:44 +0800
• e3f6c9d544 在RUOYI-ADMIN模块中删除RUOYI-QUARTZ依赖，不想部署RUOYI-QUARTZ模块，则SysJobController和SysJobLogController编译错误，将这两个类移到RUOYI-QUARTZ模块中解决。 yqh 2018-11-19 17:07:31 +0800
• 007a4e5275 !36 注解丢失 Merge pull request !36 from 麦洛/master 若依 2018-11-19 17:06:20 +0800
• ddc3cbed30 Merge branch 'master' of https://gitee.com/cronie/RuoYi.git Administrator 2018-11-19 16:28:08 +0800
• bf01219420 添加丢失的 @Override注解 麦洛 2018-11-19 15:43:18 +0800
• 4acb2609fd 乱码 zhangmrit 2018-11-19 13:27:46 +0800
• 445c418752 乱码 zhangmrit 2018-11-19 13:26:54 +0800
• ea12623bb1 乱码 zhangmrit 2018-11-19 13:25:52 +0800
• 985bb2aa4d readme zhangmrit 2018-11-19 13:24:04 +0800
• 53b4ca26ce oss.sql zhangmrit 2018-11-19 13:16:45 +0800
• 71d30e6590 OSS模块集成 zhangmrit 2018-11-19 13:08:43 +0800
• 24cf79d822 新增创建人，创建时间 Administrator 2018-11-19 10:18:16 +0800
• d2c5da556a Merge remote-tracking branch 'origin/master' zhangmrit 2018-11-19 10:03:19 +0800
• 9600806e5f 合并 zhangmrit 2018-11-19 10:00:45 +0800
• bcb7ba19f9 系统用户会话命名sysUser RuoYi 2018-11-18 18:17:40 +0800
• d870710af1 系统用户会话命名sysUser RuoYi 2018-11-18 18:02:20 +0800
• fb87c428c9 支持多包扫描和注解扫描api zhangmrit 2018-11-16 18:24:24 +0800
• 3bb60bbaa8 新增trade模块 Administrator 2018-11-16 14:09:17 +0800
• 2b2dd8f36f 更新 README.md zhangmrit 2018-11-16 11:06:17 +0800
• 11fa736bf8 更新 README.md zhangmrit 2018-11-16 11:03:55 +0800
• 94e59f72de 集成通用mapper,修改多数据源切面，增加彩色日志，修改多环境处理 zhangmrit 2018-11-16 10:53:52 +0800
• 1d082b1ffc 新增打包文件 Administrator 2018-11-16 10:33:17 +0800
• ad3d283881 mengyu Administrator 2018-11-16 10:32:42 +0800
• ae7671b3d6 Merge branch 'master' of https://gitee.com/cronie/RuoYi.git Administrator 2018-11-16 10:31:45 +0800
• 6244e6bf18 全局ajax提示 RuoYi 2018-11-15 18:34:05 +0800
• 7739044bb7 新增MengYuServletInitializer Administrator 2018-11-15 17:16:37 +0800
• f3896051b3 新增trade模块 Administrator 2018-11-15 17:01:30 +0800
• 9c9c29f7ac 删除工程 Administrator 2018-11-15 16:28:56 +0800
• dd5980e380 Merge branch 'master' of https://gitee.com/cronie/RuoYi.git Administrator 2018-11-15 16:27:40 +0800
• 6b7281f114 新增mengyu模块 Administrator 2018-11-15 16:10:57 +0800
• c1be1659ea 增加关闭全屏 RuoYi 2018-11-15 15:33:03 +0800
• 6cda301f43 选项卡新增全屏显示 RuoYi 2018-11-15 13:35:41 +0800
• e5b314cc96 修复定时任务无法删除参数问题 wangchl 2018-11-15 12:07:20 +0800
• 3383418837 新增打包文件 RuoYi 2018-11-15 08:58:54 +0800
• 3a44c4e765 日志详细优化 RuoYi 2018-11-14 23:08:52 +0800
• 0c5da2cf17 上传头像提交修改 RuoYi 2018-11-14 18:29:59 +0800
• 98496ac4e6 Pre Merge pull request !35 from CharlesSong/master CharlesSong 2018-11-13 19:24:55 +0800
• 094e209922 1.shiro权限配置化 2.新增lombok依赖 CharlesSong 2018-11-13 19:21:38 +0800
• da07735edc Pre Merge pull request !25 from 四颗咖啡豆/fix_genDB_bug 四颗咖啡豆 2018-11-13 16:55:38 +0800
• ecfba42651 !34 BaseController迁移到framework模块的com.ruoyi.web.base路径下 Merge pull request !34 from CharlesSong/master CharlesSong 2018-11-13 16:55:24 +0800
• 26b4f598e2 为了便于二次开发依赖framework项目 1.BaseController迁移到framework com.ruoyi.web.base中 2.admin中的properties 放到root pom中 CharlesSong 2018-11-13 16:48:44 +0800
• 737c2d8515 前台日期格式转化 RuoYi 2018-11-13 13:07:00 +0800
• 8a005a088d 2018年度最受欢迎中国开源软件评选 请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1 RuoYi 2018-11-12 10:57:54 +0800
• dcc534bb2d 2018年度最受欢迎中国开源软件评选 请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1 RuoYi 2018-11-12 10:55:37 +0800
• ebc6a1ade2 登录失败清空验证码 RuoYi 2018-11-07 22:25:36 +0800
• 834089ef08 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-11-01 17:49:35 +0800
• d30b66b633 阿里云双11活动1折团 RuoYi 2018-11-01 17:49:23 +0800
• 6a4894e9d1 Merge branch 'master' of https://gitee.com/y_project/RuoYi RuoYi 2018-10-27 21:39:36 +0800
• a44aa5db42 校验cron表达式是否有效 RuoYi 2018-10-27 21:39:01 +0800
• 71c3274333 修改finalName RuoYi 2018-10-26 13:29:07 +0800
• 1961ca5197 添加warName RuoYi 2018-10-26 13:21:40 +0800
• ba2d7f418d 部署war包启动说明 RuoYi 2018-10-26 13:01:30 +0800
• 83b4c25137 扫描路径修改 RuoYi 2018-10-18 16:48:05 +0800