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

1069 Commits

Author SHA1 Message Date
Sheogorath 9ea66e8820 Add documentation for new permissions 2017-01-21 19:18:56 +01:00
Max Wu 6dfc186691 Merge pull request #326 from hackmdio/es6-integration 
ES6 integration
 2017-01-21 14:31:41 +08:00
Wu Cheng-Han fc00fa7434 Add link to features on profile dropdown 2017-01-21 14:24:51 +08:00
Yukai Huang 0e479111e5 Merge branch 'master' into es6-integration 2017-01-21 14:05:51 +08:00
Wu Cheng-Han a669c201be Fix template partial path 2017-01-21 14:04:54 +08:00
Wu Cheng-Han 09a7bcbdef Refactor templates and rearrange its path 2017-01-21 13:08:29 +08:00
Yukai Huang 74b04d08b5 Merge branch 'master' into es6-integration 2017-01-21 12:55:45 +08:00
Yukai Huang 93d6fe6d7c Revert useless linebreak 2017-01-21 12:53:29 +08:00
Wu Cheng-Han 6e8ff3de23 Fix redundant parameter to removeColumn in db migration scripts 2017-01-21 12:53:18 +08:00
Wu Cheng-Han 5e1d022e13 Add screenshot on index page 2017-01-21 12:52:26 +08:00
Wu Cheng-Han e98278492e Fix meta error not clear on before rendering 2017-01-21 12:50:02 +08:00
Yukai Huang 26d8942852 Revert experimental vue for now 2017-01-21 12:30:55 +08:00
Yukai Huang 4bbe035beb Merge branch 'master' into frontend-next 2017-01-21 12:08:52 +08:00
Max Wu 1de4242473 Merge pull request #321 from DrMurx/gracefulSigtermHandling 
Handle SIGTERM the same way SIGINT is handled
 2017-01-20 09:39:04 +08:00
Jan Kunzmann 20dc3127b1 Handle SIGTERM the same way SIGINT is handled 2017-01-20 02:13:09 +01:00
Wu Cheng-Han 1473437295 Refactor checkViewPermission to fix limited & protected permission check bug and fix code style 2017-01-16 23:47:53 +08:00
Wu Cheng-Han e00daee6c0 Update to prevent all empty link change hash 2017-01-16 12:42:21 +08:00
Wu Cheng-Han 3c0667813c Fix missing config in hackmd response 2017-01-16 12:41:34 +08:00
Wu Cheng-Han 091e7271e0 Fix pagination should hide on refresh history 2017-01-16 12:24:40 +08:00
Wu Cheng-Han 53223b5e2c Update index layout to add profile on navbar 2017-01-16 12:06:04 +08:00
Wu Cheng-Han f2ee897699 Fix to prevent hash change on click nav item on index 2017-01-16 12:04:11 +08:00
Wu Cheng-Han 5751578275 Update to remove history pagination animation on refresh 2017-01-15 17:23:33 +08:00
Wu Cheng-Han f2a441061b Fix checkLoginStateChanged might fall into infinite loop while calling loginStateChangeEvent 2017-01-15 17:23:19 +08:00
Yukai Huang a9a38c3d75 Recover config change in 0f833f0 2017-01-15 11:58:00 +08:00
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