summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #125 from jccrofty30/readme_updateMax Wu2016-05-151-1/+1
|\ | | | | Add GitLab to Third-Party integration section.
| * Remove GitLab from common.js row.Jason Croft2016-05-151-1/+1
| |
| * Add GitLab to Third-Party integration section.Jason Croft2016-05-151-2/+2
|/
* Fix for help modal css style conflictsCheng-Han, Wu2016-05-151-11/+11
|
* Fix export snippet should check data before sending request and fix some ↵Cheng-Han, Wu2016-05-153-13/+11
| | | | code styles
* Fix some code styles and user avatar style for PR #122Cheng-Han, Wu2016-05-153-4/+4
|
* Add back missing code for 1f4e1f09b639d49ebe818fd2b4d6e98f78ef2d38Cheng-Han, Wu2016-05-151-1/+1
|
* Merge pull request #122 from jccrofty30/avatar_on_historyMax Wu2016-05-153-0/+8
|\ | | | | Add avatar to History page.
| * Add avatar to History page.Jason Croft2016-05-123-0/+8
| |
* | Add some reminder for snippet before modal ajaxCheng-Han, Wu2016-05-151-1/+3
| |
* | Fix signin template logic for PR #121Cheng-Han, Wu2016-05-151-2/+2
| |
* | Add db migrations for PR #121Cheng-Han, Wu2016-05-155-0/+31
| |
* | Fix merge conflictsCheng-Han, Wu2016-05-151-4/+0
| |
* | Merge branch 'jccrofty30-gitlab_snippets'Cheng-Han, Wu2016-05-158-6/+348
|\ \
| * | Merge branch 'gitlab_snippets' of https://github.com/jccrofty30/hackmd into ↵Cheng-Han, Wu2016-05-158-6/+348
|/| | | | | | | | | | | | | | | | | | | | jccrofty30-gitlab_snippets # Conflicts: # lib/response.js
| * | Show only projects where user is creator, has project access >= 20, or has ↵Jason Croft2016-05-132-2/+9
| | | | | | | | | | | | group access.
| * | Apply "snippets_enabled only" logic to import modal.Jason Croft2016-05-131-5/+14
| | | | | | | | | | | | | | | Better parsing for snippet import. Add python filetype.
| * | Filter out projects that don't have snippets enabled.Jason Croft2016-05-121-0/+3
| | |
| * | Revert last change.Jason Croft2016-05-121-1/+1
| | |
| * | Only pull projects the user owns.Jason Croft2016-05-121-1/+1
| | |
| * | Retrieve GitLab avatar.Jason Croft2016-05-121-0/+3
| | |
| * | Merge remote-tracking branch 'origin/master' into gitlab_snippetsJason Croft2016-05-1210-13/+149
| |\| | | | | | | | | | | | | | | | # Conflicts: # bower.json # public/views/body.ejs
| * | Enable snippet exporting.Jason Croft2016-05-123-7/+103
| | |
| * | Can now select from available projects and snippets to build import URL.Jason Croft2016-05-124-4/+86
| | |
| * | Check to make sure GitLab is configured before showing import option.Jason Croft2016-05-111-0/+4
| | |
| * | End-point to get GitLab data.Jason Croft2016-05-111-0/+16
| | |
| * | Add accessToken saving.Jason Croft2016-05-111-4/+14
| | |
| * | Fully-fleshed snippetImportModalJason Croft2016-05-111-3/+5
| | |
| * | Allow importing from GitLab snippetJason Croft2016-05-111-21/+48
| | |
| * | Remove skeleton functionsJason Croft2016-05-111-83/+0
| | |
| * | Add accessToken columnJason Croft2016-05-111-1/+4
| | |
| * | Define events for snippet actionsJason Croft2016-05-091-0/+45
| | |
| * | Define snippet import modalJason Croft2016-05-091-0/+20
| | |
| * | Skeletons for GitLab actions.Jason Croft2016-05-091-0/+83
| | |
| * | Attach to snippet classes.Jason Croft2016-05-091-1/+3
| | |
| * | Add GitLab options.Jason Croft2016-05-091-0/+12
| | |
| * | Start extending to support GitLab authentication.Jason Croft2016-05-098-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary dependency. Add baseURL parameter for self-hosted GitLab Add necessary require. Add block for GitLab auth. Fix typo Update font-awesome dependency for GitLab icon. Use a color closer to GitLab orange. More direct TODO
* | | Merge branch 'jccrofty30-gitlab_authentication'Cheng-Han, Wu2016-05-158-0/+45
|\ \ \
| * | | Merge PR #118Cheng-Han, Wu2016-05-158-0/+45
|/| | |
| * | | Retrieve GitLab avatar.Jason Croft2016-05-121-0/+3
| | | |
| * | | Start extending to support GitLab authentication.Jason Croft2016-05-117-0/+42
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary dependency. Add baseURL parameter for self-hosted GitLab Add necessary require. Add block for GitLab auth. Fix typo Update font-awesome dependency for GitLab icon. Use a color closer to GitLab orange. More direct TODO
* | | Update to move dropbox app key setting to common.js and will auto load ↵Cheng-Han, Wu2016-05-157-43/+39
| | | | | | | | | | | | client-side related scripts
* | | Merge branch 'janniklorenz-master'Cheng-Han, Wu2016-05-156-29/+65
|\ \ \ | |/ / |/| |
| * | Merge PR #101Cheng-Han, Wu2016-05-156-29/+65
|/| |
| * | Fix google drive configJannik Lorenz2016-04-231-6/+6
| | |
| * | Fix error page (missing googleDrive config)Jannik Lorenz2016-04-231-1/+2
| | |
| * | Hide Dropbox and Google Drive in Import/ Export when disabledJannik Lorenz2016-04-235-12/+43
| | |
| * | Show Sign In button only when enabledJannik Lorenz2016-04-231-23/+27
| | |
* | | Add help and help modal with contacts, documents, cheatsheetCheng-Han, Wu2016-05-115-6/+139
| | |
* | | Update font-awesome to 4.6.2Cheng-Han, Wu2016-05-115-5/+5
| | |