github.com/apolloconfig/apollo commits | Ecosyste.ms: OpenCollective

初始化private app namespace的权限放在transaction里面

10d17f875245c42236f6a2f62a0c061a6d32395e authored over 8 years ago by lepdou <[email protected]>

Merge pull request #326 from lepdou/ut

ut

4c64de670370ead7df77da72f379e7a366a4431a authored over 8 years ago by Jason Song <[email protected]>

bugfix 删除配置的时候锁开关没判断

835fdcbbdb1a49309bbbf8ec09464f71b4ac291b authored over 8 years ago by lepdou <[email protected]>

Merge pull request #329 from lepdou/history

判断是否添加重复key的时候,过滤掉已删除并且发布过的配置

189c2188d6ae81c9c3513e8c955700b5258c25f4 authored over 8 years ago by Jason Song <[email protected]>

判断是否添加重复key的时候,过滤掉已删除并且发布过的配置

7d90bee5d0e499199464d75e1439701b31fd2908 authored over 8 years ago by lepdou <[email protected]>

update

63774ac95ef23e5227f68ba9913c86e0114ad2b1 authored over 8 years ago by lepdou <[email protected]>

unit test

66c4f9547efaa536853f27c6bcea21502259fca3 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #327 from lepdou/history

刷新页面维持nav选择 & 发布历史兼容文本类型的NS

9f15c41d096e093febae9a0f6d0bba7a8ab155b9 authored over 8 years ago by Jason Song <[email protected]>

update

71b725af0c584630c84bda0559f9dd09fbd25788 authored over 8 years ago by lepdou <[email protected]>

update

b676c35dfbb62ebb3c27872cdb338e1f468ea2bd authored over 8 years ago by lepdou <[email protected]>

刷新页面维持nav选择 & 发布历史兼容文本类型的NS

88e2987d027be19ae300e4a35d54184baa09f035 authored over 8 years ago by lepdou <[email protected]>

update

13ce22abfbf59b8a0b0e99aaa5f5e29c52d48164 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #325 from lepdou/history

bugfix cluster sort

299049abefb83ba57539594845375de18af1505d authored over 8 years ago by Jason Song <[email protected]>

update

e2f3bcd21d4aaf95719e62b014b14c1e50f66c8a authored over 8 years ago by lepdou <[email protected]>

update

e026c4309c29e935df80980eccbec3b497f487ed authored over 8 years ago by lepdou <[email protected]>

bugfix cluster sort

e0cfa5af0b40797c2b9f5ada37767bc30247764a authored over 8 years ago by lepdou <[email protected]>

Merge pull request #324 from nobodyiam/config-as-file-merge

Add config file controller to support get config as plain properties file

35f07cfbbcedb15f17b28ba41d03e1726162724f authored over 8 years ago by 张乐 <[email protected]>

Add config file controller to support get config as plain properties file

f435f27d3403ea14d0c9af2f337f306cc4b31cf2 authored over 8 years ago by Jason Song <[email protected]>

update

f7093f7a1b2683a64eae6e080bc9f338f698fc06 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #323 from lepdou/history

release history & 多处优化

f5bc9f838def33aea7a5fc8ce5c3d3592d0a625b authored over 8 years ago by Jason Song <[email protected]>

release history & 多处优化

7f6ed42bef207b514dcaf9fae8a0fc8554ca1b35 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #322 from nobodyiam/upgrade-to-0.0.5

upgrade version to 0.0.5

d13244c8210a203c49227277584f60d2b922edd3 authored over 8 years ago by 张乐 <[email protected]>

upgrade version to 0.0.5

ecffc988d2963fd8cefb51b4e0b86391263c50da authored over 8 years ago by Jason Song <[email protected]>

Merge branch 'master' into 'release'

Master2Release

See merge request !3

380a038f41eea8e4fc85d78aeaede6cb7cdcb4dc authored over 8 years ago by vss宋顺 <[email protected]>

update

0138823fb928e8505721e0eeb4fb260eedc12af6 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #321 from lepdou/bugfix_0711

Bugfix update item cant lock namespace

be8cfed52b00a93ec3fb46c3ac6ec4370827e590 authored over 8 years ago by Jason Song <[email protected]>

update

da2d9db56fe16872d446604c06f37615e4068ad5 authored over 8 years ago by lepdou <[email protected]>

bugfix

0919747e174fb6fba4d01db8b729077ca6841d04 authored over 8 years ago by lepdou <[email protected]>

Merge branch 'master' into 'release'

Master2Release

See merge request !2

daf5d8cb906d680fffe9650e4fd98d7afb19bc7c authored over 8 years ago by zl张乐(IT) <[email protected]>

Merge pull request #320 from lepdou/bugfix_0711

private app namespace dont need prefix

9f07d812d16f1364c6c9df8e151b4f63233957fc authored over 8 years ago by Jason Song <[email protected]>

private app namespace dont need prefix

05ceebadfcbf0d28a58135767106130f6088ec9f authored over 8 years ago by lepdou <[email protected]>

Merge pull request #319 from lepdou/bugfix_0711

Bugfix

1b7a4aa036e19b36c7e12c0681dda58792230b3b authored over 8 years ago by Jason Song <[email protected]>

bugfix

5395c802e6f342542a08e7bec471012576a55cad authored over 8 years ago by lepdou <[email protected]>

Merge pull request #317 from qmwu2000/master

add ApolloDataSourceProvider

2aa333d84714d5b4291317a9b37597587f32344a authored over 8 years ago by Jason Song <[email protected]>

Merge branch 'master' of git.dev.sh.ctripcorp.com:apollo/apollo

0c515c27e77c9d37c1f107eb195e19510a7bd867 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #318 from lepdou/bugfix0708

bugfix when create app namespace jump to permission page

39455953a8da720582d395bfb8deb53dda891508 authored over 8 years ago by Jason Song <[email protected]>

bugfix when create app namespace jump to permission page

9ca5e2d8789bf057ffd3ea4f9e72ac4db6e72f76 authored over 8 years ago by lepdou <[email protected]>

add ApolloDataSourceProvider

de3b726cbbb7a5ea82aa2c87c225fcf58823a603 authored over 8 years ago by Frankie Wu <[email protected]>

Merge pull request #316 from nobodyiam/filter-properties-comment

filter out properties comment for config file

58fcb8adcbc04e3ccb8cfade0cc294fa9fdbaf44 authored over 8 years ago by 张乐 <[email protected]>

filter out properties comment for config file

edcd974f1a3d455aaf039a609e7a351a338042ac authored over 8 years ago by Jason Song <[email protected]>

Merge branch 'master' of github.com:ctripcorp/apollo

f6071f4f8d70ba62b0207000e08c4789dfc147c1 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #315 from lepdou/namespace-as-file-format-2

bugfix

29f2ad9428c60ea24e05ae93987090def464ec5d authored over 8 years ago by Jason Song <[email protected]>

重构 item update api

6a80f25438d5109b47b93aeb662363e4f80f11f0 authored over 8 years ago by lepdou <[email protected]>

update

81dc3b9ce4b435ce3607bab376758cf2a168ba41 authored over 8 years ago by lepdou <[email protected]>

fix create app namespace format maybe null

8314ed1a200a9868b28201b9a8991c91da36305a authored over 8 years ago by lepdou <[email protected]>

update item call new api

05fb4738ddeeb6c9a4071ec729fc431a881a7583 authored over 8 years ago by lepdou <[email protected]>

Merge branch 'master' of github.com:ctripcorp/apollo

7e1355d140b3a9bc7a6ef583c4194119e4eede3c authored over 8 years ago by lepdou <[email protected]>

fix text modal update commit bug

66ca68f35feb4b9154206cbfd86b9e0377da561e authored over 8 years ago by lepdou <[email protected]>

Merge pull request #314 from lepdou/namespace-as-file-format-2

bugfix

20abd55d17e065bf4f298ae158a2f98ecead121f authored over 8 years ago by Jason Song <[email protected]>

bugfix private xml namespace cant modify

2883f493645152c3ab688db3010f86826c22c46c authored over 8 years ago by lepdou <[email protected]>

change edittext min rows to 20

6287a046ce41f69c827faff753316e25a9aaaa43 authored over 8 years ago by lepdou <[email protected]>

bugfix when create app namespace jump to permission page

a540c9493b874459f50c2f48442826eabc829dc4 authored over 8 years ago by lepdou <[email protected]>

bugfix when create app namespace jump to permission page

a93ec78ba6c961fdd9db8ad4d3c29b9e8e3639a1 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #313 from lepdou/namespace-as-file-format-2

bugfix appnamespace format null

ff15667686626c76bc248e6615249c23b8451a6f authored over 8 years ago by Jason Song <[email protected]>

bugfix appnamespace format null

a8ecf47cb551e51d1daf0a76ceb5e37f7d87ef9e authored over 8 years ago by lepdou <[email protected]>

Merge pull request #312 from lepdou/namespace-as-file-format-2

bugfix when add item value is null

0d5a5241324294c11e06b0bc69271989c2c8f999 authored over 8 years ago by Jason Song <[email protected]>

bugfix when add item value is null

5d404bd9eae1eef924fba28747a90e1c95aeab46 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #311 from nobodyiam/version-to-0.0.5-SNAPSHOT

Version to 0.0.5 snapshot

8bc7b70fb980686cd3514a5d4849cee0ab78887b authored over 8 years ago by 张乐 <[email protected]>

version upgrade to 0.0.5-SNAPSHOT

d3e24d8447d39d824826e1768c2e7c7c39075f8b authored over 8 years ago by Jason Song <[email protected]>

adjust ut timeout

7ac1d674d168a6a5ccb31b7b56bee1b6ee0bc9e8 authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #310 from lepdou/namespace-as-file-format-2

namespace as file

5f13408211cf91a8cca334a98e4b7151622bc5c1 authored over 8 years ago by Jason Song <[email protected]>

not found lock return null

1665f492cca4d4d09ce6084c50a80facc84eb277 authored over 8 years ago by lepdou <[email protected]>

change namespacePrefix to namespace

e7d91c7d0dc7ad60f7474d0f7a144f78dd1e42eb authored over 8 years ago by lepdou <[email protected]>

update

3da14c8c0afdb0c4b072197fccdb468153959192 authored over 8 years ago by lepdou <[email protected]>

rename createOrUpdate to create

cd4e4759c20e3b4deea4d41647ff61ec31ee49f7 authored over 8 years ago by lepdou <[email protected]>

admin server add update item api

b0513014409191575b0ff4cc118b4f5cbb9f4341 authored over 8 years ago by lepdou <[email protected]>

namespace as file

5c6081a024d9e1ecdfc66d48a4aafe49747f1df6 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #309 from nobodyiam/fix-client-url-encoding

Fix client url encoding

060126fd84f4eee7869a46a68bd76adde8c68226 authored over 8 years ago by 张乐 <[email protected]>

upgrade to version 0.0.4

eccc3a30e32069e4bb8bfb5d995449323343faaa authored over 8 years ago by Jason Song <[email protected]>

fix client url encoding issue

31a0fcdefeb02220664fed027bf691e30094bb94 authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #308 from nobodyiam/version-0.0.3

upgrade version to 0.0.3

3b7e50ecfb97a5a64c3d6689f67867c0256feb5f authored over 8 years ago by 张乐 <[email protected]>

upgrade version to 0.0.3

c150a5091b6982102aa2dba41ec5ea4b3feb4b3e authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #307 from nobodyiam/client-misc-fix

use java string builder for toString methods

701f2c4b7c926d6d728b0596c1beab9fdd5feb52 authored over 8 years ago by Jason Song <[email protected]>

use java string builder for toString methods

f3ea13b3c5ab6ed932ec84bb3b7e2ee7941efcab authored over 8 years ago by Jason Song <[email protected]>

Merge branch 'release' of git.dev.sh.ctripcorp.com:apollo/apollo into release

d9ed6af8c14301cb6c4986345d5abfa080dc8753 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #306 from lepdou/0627_0701

fix user search

8a0c7f3ac6b175073d778ccd7e1c2708681bd4f6 authored over 8 years ago by 张乐 <[email protected]>

update

41b04ad157351df77dc16e06e21568a41359680d authored over 8 years ago by lepdou <[email protected]>

fix user search

259a9f7ea7fc61786a49825c08006eab40783aa0 authored over 8 years ago by lepdou <[email protected]>

Merge branch 'release' of git.dev.sh.ctripcorp.com:apollo/apollo into release

ea8406986d717e7100a36aa049ec601f624aa0a9 authored over 8 years ago by lepdou <[email protected]>

fix when namespace.lock.switch off

75199e3baa4f5d1d5cae18a74f0734762b6278f2 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #305 from lepdou/0627_0701

fix when namespace.lock.switch off

cd27534a10143ffa005d914b9c11c57d4575eea7 authored over 8 years ago by 张乐 <[email protected]>

update

41bfee442461c08c3ce0ee7136047fa5ae2c07b6 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #304 from lepdou/0627_0701

namespace 一次发布只能被一个人修改

31fe0649ee241693c5b9efbbde0212ca6db47bc4 authored over 8 years ago by 张乐 <[email protected]>

namespace 一次发布只能被一个人修改

1087841545efdbb38c558ebcc409771e56c47352 authored over 8 years ago by lepdou <[email protected]>

项目权限文案

ad8aa2292271d694469d663d36a0988e9aebc0a2 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #303 from lepdou/0627_0701

项目权限文案

1b550c482ab3f41db0e7d1b8c1c9bd141307897a authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #302 from lepdou/0627_0701

namespace permission bugfix

355d53865c2c4b9644cf291cda595074d250a099 authored over 8 years ago by Jason Song <[email protected]>

namespace permission bugfix

c9ff9dce304ed3e6fc10fdfc3e01ab2911f61a23 authored over 8 years ago by lepdou <[email protected]>

已授权校验 & 创建app 用户模糊搜索

f763525b707c9379232611fc71813692162f9211 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #301 from lepdou/0627_0701

已授权校验 & 创建app 用户模糊搜索

bec6a785f9c5fc1a2d6013025d7bbc8d8ac2dc50 authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #300 from nobodyiam/assign-role-result

return users assigned and adjust rest template timeout

a474d5caaafa2e5986783f813357e1976de85e78 authored over 8 years ago by 张乐 <[email protected]>

get timeout config from server config service

a0a6a43bb66a08b774ea626c6813ecd64556c4c5 authored over 8 years ago by Jason Song <[email protected]>

return users assigned and adjust rest template timeout

bf722d5c93dc09bfa4dc7c499306515ea3597c39 authored over 8 years ago by Jason Song <[email protected]>

Merge pull request #299 from lepdou/0627_0701

用户模糊搜索流程优化

789120085dcc51487081c047ef8c0f059f544983 authored over 8 years ago by Jason Song <[email protected]>

update

0496d7e37a78650feaf8368cc3454f5e3086e801 authored over 8 years ago by lepdou <[email protected]>

用户模糊搜索流程优化

219aff4a142f78a7699a381d19b5e9db6e36423c authored over 8 years ago by lepdou <[email protected]>

Merge pull request #298 from nobodyiam/client-local-config

adjust local cache directory logic

2f620e6f60d93ed866234935e8d384da66fa1f68 authored over 8 years ago by 张乐 <[email protected]>

adjust local cache directory logic

513636192a36e1e84cb957be693a4a968dfafc3f authored over 8 years ago by Jason Song <[email protected]>

update

7c45675156bcd0ccb7d3fbff88cda2b2fbda9421 authored over 8 years ago by lepdou <[email protected]>

Merge pull request #297 from lepdou/0620_27

sync config

43db632208d15961af4bc93d2fd9ec7326804e1e authored over 8 years ago by Jason Song <[email protected]>