status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,195 Commits 23 Branches 35 Tags 26 MiB
Commit Graph

1195 Commits

Author SHA1 Message Date
Yukai Huang 75e28a1d5e Merge branch 't216-refactor-common' into 'frontend-next' 
T216 refactor common

See merge request !5
 2017-01-15 03:45:19 +00:00
Yukai Huang c0e8306961 Merge branch 'frontend-next' into t216-refactor-common 2017-01-15 11:33:22 +08:00
Yukai Huang 0f833f099f Update server google/dropbox config check 2017-01-14 19:05:54 +08:00
Yukai Huang b3ed444565 Merge branch 'frontend-next' into 'frontend-next' 
Update README.md for npm script

See merge request !6
 2017-01-14 08:01:57 +00:00
Yukai Huang 04292240d6 Minor style update 2017-01-14 15:47:13 +08:00
bananaappletw 77994508e6 Update README.md for npm script 2017-01-14 15:27:24 +08:00
Yukai Huang 98c0cfc6a7 Update README 2017-01-14 15:24:31 +08:00
Yukai Huang b4bed37d64 Add google apiKey & dropbox appKey to config.json 2017-01-14 14:17:20 +08:00
Yukai Huang 1ed1996639 Remove config.js from setup files 2017-01-13 23:37:16 +08:00
Yukai Huang a541569d7e Remove old config.js.example 2017-01-13 23:12:27 +08:00
Yukai Huang 2408ff4ba9 Add default value for config 2017-01-13 23:12:17 +08:00
Yukai Huang 0fca629c34 Rename common.js to login.js 2017-01-13 23:06:31 +08:00
Yukai Huang 3d6b319216 Merge branch 'master' into frontend-next 2017-01-13 22:53:33 +08:00
Yukai Huang c2a8911b9c Move config variable to lib/config 2017-01-13 22:46:38 +08:00
Wu Cheng-Han 3cf40a8dec Update README.md to describe allowemailregister config more clear 2017-01-13 00:51:40 +08:00
Wu Cheng-Han 86f0b10775 Fix permission dropdown text might out of range in smaller screen 2017-01-13 00:03:29 +08:00
Wu Cheng-Han 6be875263a Fix allowemailregister config typo and default should be true 2017-01-12 23:53:22 +08:00
Wu Cheng-Han 3ee65cd38e Fix for limited and protected permissions should forbid guest in realtime events 2017-01-12 23:45:51 +08:00
Max Wu 4851098477 Merge pull request #317 from SISheogorath/master+allowEmailRegister 
Add `allowemailregister` option
 2017-01-12 23:37:28 +08:00
Wu Cheng-Han 8b378d7847 Update to use shorter wording in limited and protected permissions 2017-01-12 23:36:23 +08:00
Sheogorath 747629e549 Add `allowemailregister` option 2017-01-12 13:54:45 +01:00
Wu Cheng-Han 5f65795e79 Fix permission order and keep wording consistency 2017-01-12 19:04:17 +08:00
Wu Cheng-Han 7e191acbde Fix author creation in operationCallback might cause unique constraint validation error 2017-01-12 17:18:24 +08:00
Wu Cheng-Han ffa14cfeef Fix sortOnlineUserList might not check property existence before comparsion 2017-01-12 17:17:36 +08:00
Wu Cheng-Han fc788e805e Fix SIGINT checkClean should only log error instead throw error 2017-01-12 17:17:01 +08:00
Wu Cheng-Han 0432fef267 Fix history list might check pagination on clear and open 2017-01-12 17:14:32 +08:00
Wu Cheng-Han 42d684329f Workaround text shadow for font antialias might cause cut off in Edge 2017-01-12 17:13:52 +08:00
Max Wu a8068d38d5 Merge pull request #313 from elct9620/feature/disable_anonymous_view 
WIP: Add options to limit anonymous view note
 2017-01-10 20:23:47 +08:00
蒼時弦也 d6be0cf755 Update limite icon to fa-id-card 2017-01-10 20:22:06 +08:00
蒼時弦也 a9fe43ac3a Update limited/protected permission icon 2017-01-10 17:22:57 +08:00
蒼時弦也 758607d378 Add fa-stack style to public/js/index.js 2017-01-10 15:15:12 +08:00
蒼時弦也 7b02c48d93 Adjust permission order to more clarly 2017-01-10 14:13:30 +08:00
蒼時弦也 be7696170f Fix syntax when use case 2017-01-10 10:19:18 +08:00
蒼時弦也 89b8ddeaba Add limited and protected permission 2017-01-10 10:02:37 +08:00
蒼時弦也 c21fb8e2a0 Recovery tariling spaces 2017-01-10 09:35:21 +08:00
蒼時弦也 f8e5b54767 Remove temporary change 2017-01-10 09:32:44 +08:00
Max Wu 258a59a77d Merge pull request #316 from neopostmodern/ldap-provider-name 
Allow displaying LDAP provider name on sign-in modal
 2017-01-09 23:17:55 +08:00
neopostmodern ff545b2688 Allow displaying LDAP provider name on sign-in modal 2017-01-09 12:49:23 +01:00
Max Wu b13635aac9 Merge pull request #279 from alecdwm/ldap-auth 
Support for LDAP server authentication
 2017-01-09 00:49:40 +08:00
Yukai Huang 3566d71aea Merge branch 'master' into frontend-next 2017-01-07 00:05:15 +08:00
Wu, Cheng-Han e2694d7a62 Merge branch 'Yukai/#4-es6-module' into 'frontend-next' 
導入 es6 語法

See merge request !4
 2017-01-06 14:54:37 +00:00
alecdwm 94abfaba7c removed comma 2017-01-06 07:21:59 +01:00
alecdwm e4fe93249f dark avatar backgrounds only 2017-01-06 07:18:22 +01:00
alecdwm b044c2ae19 Use randomcolor not seedrandom for avatar backgrounds 2017-01-06 07:08:07 +01:00
alecdwm 01361afa7a Profile pictures for LDAP users 2017-01-06 05:37:40 +01:00
蒼時弦也 9a23fec239 Update readme 2017-01-06 00:15:14 +08:00
蒼時弦也 1fbecbb03d Fix anonymouse view permission check 2017-01-05 23:37:10 +08:00
蒼時弦也 aaf1ff4b2f Add limit for constrain anonymous view note 2017-01-05 22:36:40 +08:00
Yukai Huang fce08cc164 Convert history.js to es6 2017-01-05 20:56:16 +08:00
Yukai Huang 71aece7429 Convert cover.js to es6 2017-01-05 18:10:55 +08:00