summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 't216-refactor-common' into 'frontend-next' Yukai Huang2017-01-1514-69/+45
|\
| * Merge branch 'frontend-next' into t216-refactor-commonYukai Huang2017-01-1518-69/+306
| |\
| * | Update server google/dropbox config checkYukai Huang2017-01-141-2/+2
| * | Minor style updateYukai Huang2017-01-142-4/+3
| * | Update READMEYukai Huang2017-01-141-13/+3
| * | Add google apiKey & dropbox appKey to config.jsonYukai Huang2017-01-141-2/+4
| * | Remove config.js from setup filesYukai Huang2017-01-133-7/+0
| * | Remove old config.js.exampleYukai Huang2017-01-131-11/+0
| * | Add default value for configYukai Huang2017-01-131-6/+6
| * | Rename common.js to login.jsYukai Huang2017-01-135-7/+14
| * | Move config variable to lib/configYukai Huang2017-01-132-24/+20
* | | Merge branch 'frontend-next' into 'frontend-next' Yukai Huang2017-01-141-1/+1
|\ \ \ | |_|/ |/| |
| * | Update README.md for npm scriptbananaappletw2017-01-141-1/+1
|/ /
* | Merge branch 'master' into frontend-nextYukai Huang2017-01-1318-69/+306
|\ \ | |/ |/|
| * Update README.md to describe allowemailregister config more clearWu Cheng-Han2017-01-131-2/+2
| * Fix permission dropdown text might out of range in smaller screenWu Cheng-Han2017-01-131-0/+3
| * Fix allowemailregister config typo and default should be trueWu Cheng-Han2017-01-121-1/+1
| * Fix for limited and protected permissions should forbid guest in realtime eventsWu Cheng-Han2017-01-121-2/+2
| * Merge pull request #317 from SISheogorath/master+allowEmailRegisterMax Wu2017-01-125-28/+35
| |\
| | * Add `allowemailregister` optionSheogorath2017-01-125-28/+35
| * | Update to use shorter wording in limited and protected permissionsWu Cheng-Han2017-01-122-4/+4
| * | Fix permission order and keep wording consistencyWu Cheng-Han2017-01-123-10/+10
| * | Fix author creation in operationCallback might cause unique constraint valida...Wu Cheng-Han2017-01-121-11/+19
| * | Fix sortOnlineUserList might not check property existence before comparsionWu Cheng-Han2017-01-121-4/+4
| * | Fix SIGINT checkClean should only log error instead throw errorWu Cheng-Han2017-01-121-1/+1
| * | Fix history list might check pagination on clear and openWu Cheng-Han2017-01-121-0/+2
| * | Workaround text shadow for font antialias might cause cut off in EdgeWu Cheng-Han2017-01-121-1/+1
| |/
| * Merge pull request #313 from elct9620/feature/disable_anonymous_viewMax Wu2017-01-105-20/+47
| |\
| | * Update limite icon to fa-id-card蒼時弦也2017-01-102-2/+2
| | * Update limited/protected permission icon蒼時弦也2017-01-102-10/+4
| | * Add fa-stack style to public/js/index.js蒼時弦也2017-01-101-4/+10
| | * Adjust permission order to more clarly蒼時弦也2017-01-103-10/+10
| | * Fix syntax when use case蒼時弦也2017-01-101-1/+1
| | * Add limited and protected permission蒼時弦也2017-01-105-16/+43
| | * Recovery tariling spaces蒼時弦也2017-01-102-11/+11
| | * Remove temporary change蒼時弦也2017-01-103-6/+0
| | * Update readme蒼時弦也2017-01-061-9/+10
| | * Fix anonymouse view permission check蒼時弦也2017-01-051-1/+4
| | * Add limit for constrain anonymous view note蒼時弦也2017-01-052-3/+5
| * | Merge pull request #316 from neopostmodern/ldap-provider-nameMax Wu2017-01-093-2/+7
| |\ \
| | * | Allow displaying LDAP provider name on sign-in modalneopostmodern2017-01-093-2/+7
| |/ /
| * | Merge pull request #279 from alecdwm/ldap-authMax Wu2017-01-0911-6/+191
| |\ \ | | |/ | |/|
| | * removed commaalecdwm2017-01-061-1/+1
| | * dark avatar backgrounds onlyalecdwm2017-01-061-1/+4
| | * Use randomcolor not seedrandom for avatar backgroundsalecdwm2017-01-062-4/+2
| | * Profile pictures for LDAP usersalecdwm2017-01-063-0/+35
| | * LDAP auth use email if providedalecdwm2016-12-141-1/+1
| | * LDAP signin form moved to main signin-modalalecdwm2016-12-144-42/+24
| | * LDAP login improvementsalecdwm2016-12-141-3/+9
| | * Tokens not required for ldap authalecdwm2016-12-141-4/+30