summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #723 from marcbachmann/update-uuidHEADorigin/masterorigin/HEADmasterHoussam Haidar2016-11-282-3/+3
|\
| * chore(package): update uuid to version 3.0.0Marc Bachmann2016-11-232-3/+3
|/
* Fix undefined avatar/email valueHoussam Haidar2016-09-261-0/+3
* Open images in a new tabHoussam Haidar2016-09-201-1/+8
* Block window.openerHoussam Haidar2016-09-091-2/+2
* Fix possible SVG xss by forcing downloadHoussam Haidar2016-08-101-1/+2
* Update README.mdHoussam Haidar2016-08-021-1/+1
* Update README.mdHoussam Haidar2016-08-021-1/+1
* Updated travis file to only run on latest node.jsSimon Bartlett2016-07-191-5/+1
* Merge pull request #706 from sdelements/fix/remove_migrooseHoussam Haidar2016-07-198-240/+31
|\
| * Update dependenciesSimon Bartlett2016-07-191-20/+20
| * Fixed cleanupReqFiles not calling callbackSimon Bartlett2016-07-191-8/+10
| * Dropped migrooseSimon Bartlett2016-07-197-212/+1
|/
* Merge pull request #705 from danielefranceschi/masterHoussam Haidar2016-07-191-0/+84
|\
| * italian translationdanny2016-07-191-0/+84
|/
* Add passphrase setting for httpsHoussam Haidar2016-07-161-1/+2
* Merge pull request #700 from alexdorn87/masterHoussam Haidar2016-06-251-4/+0
|\
| * Fix the uploaded file's path erroralexdorn872016-06-241-4/+0
* | Merge pull request #701 from balping/masterHoussam Haidar2016-06-251-2/+2
|\ \ | |/ |/|
| * Fixing #657Balázs Kovács2016-06-251-2/+2
|/
* Merge pull request #698 from sdelements/fix/dockerHoussam Haidar2016-06-151-1/+3
|\
| * Add builtAssets to docker setupHoussam Haidar2016-06-141-1/+3
|/
* Fix default locale settingsHoussam Haidar2016-06-142-3/+4
* Fix heroku mongodb env varHoussam Haidar2016-06-141-0/+3
* Merge pull request #692 from isayme/masterHoussam Haidar2016-05-201-0/+3
|\
| * donot check migration when migrations.length is 0isayme2016-05-191-0/+3
|/
* Bump to 0.4.70.4.7Houssam Haidar2016-05-102-1/+13
* Merge branch 'develop'Houssam Haidar2016-05-101-2/+2
|\
| * Update depsHoussam Haidar2016-05-101-2/+2
* | Merge branch 'develop'Houssam Haidar2016-05-091-1/+1
|\ \ | |/
| * Fix connect-mongo es5 issueHoussam Haidar2016-05-091-1/+1
* | Merge pull request #687 from sdelements/developHoussam Haidar2016-05-0410-33/+33
|\ \ | |/
| * Fix lodash and multer issuesHoussam Haidar2016-04-039-14/+14
| * Update packagesHoussam Haidar2016-04-031-19/+19
|/
* Update README.mdHoussam Haidar2016-03-141-1/+1
* Update README.mdHoussam Haidar2016-03-141-1/+1
* Merge pull request #685 from cloudron-io/masterHoussam Haidar2016-03-141-0/+2
|\
| * Add cloudron letschat app to README.mdGirish Ramakrishnan2016-03-121-0/+2
|/
* Merge pull request #679 from mastizada/masterHoussam Haidar2016-02-171-0/+84
|\
| * [az] Azerbaijani locale addedEmin Mastizada2016-02-181-0/+84
|/
* Merge pull request #678 from halilkaya/masterHoussam Haidar2016-02-171-0/+84
|\
| * Turkish localization addedHalil Kaya2016-02-171-0/+84
|/
* Merge pull request #676 from kaakaa/fix-locale-jaHoussam Haidar2016-02-111-2/+8
|\
| * fix japanese translationkaakaa2016-02-111-2/+8
|/
* Merge pull request #673 from milouse/fix/french_translationHoussam Haidar2016-02-031-1/+2
|\
| * Add lacking new placeholder from #667Étienne Deparis2016-02-031-1/+2
|/
* Fix rooms-list in Chrome 48Houssam Haidar2016-01-291-0/+2
* Fix chrome 48 header bugHoussam Haidar2016-01-261-1/+5
* Bump version to 0.4.60.4.6Houssam Haidar2016-01-222-1/+12
* Fix message width issueHoussam Haidar2016-01-221-0/+2
* Fix userlist display bug in Chrome 48Houssam Haidar2016-01-222-1/+3
* Merge pull request #667 from RobThree/masterHoussam Haidar2016-01-223-7/+11
|\
| * Restore tabs (See #667)RobThree2016-01-221-80/+80
| * Fix annoying content-security-policy console warningRobThree2016-01-221-1/+1
| * Placeholder translatable and minor improvements for NL translationRobThree2016-01-222-78/+82
|/
* Merge pull request #658 from yzaguirre/masterHoussam Haidar2016-01-032-3/+87
|\
| * Fixed a characterDavid Yzaguirre2016-01-021-1/+1
| * Grabs fullpath directory with path.resolveDavid Yzaguirre2016-01-021-3/+4
| * Spanish translation correctionDavid Yzaguirre2016-01-021-4/+4
| * Added Spanish translationDavid Yzaguirre2016-01-011-0/+83
| * Changed require-tree constructor argument with fullpath directoryDavid Yzaguirre2016-01-011-3/+3
|/
* Bump version to 0.4.50.4.5Houssam Haidar2015-12-222-1/+8
* Fix some issues with NODE_PATHHoussam Haidar2015-12-221-2/+2
* Merge pull request #643 from milouse/fix/french_translationHoussam Haidar2015-12-181-33/+39
|\
| * Better french translation for existing strings. Is now up-to-date with master...Étienne Deparis2015-11-301-33/+39
|/
* Bump version0.4.4Houssam Haidar2015-10-262-1/+7
* Merge pull request #628 from sonnyp/feature/node_xmpp_updateHoussam Haidar2015-10-2614-28/+46
|\
| * Update node-xmpp-serverSonny Piers2015-10-2614-28/+46
* | Merge branch 'develop'0.4.3Houssam Haidar2015-10-092-1/+13
|\ \ | |/
| * Bump version to 0.4.3Houssam Haidar2015-10-092-1/+13
* | Merge pull request #591 from sdelements/developHoussam Haidar2015-10-098-225/+197
|\ \ | |/
| * Merge branch 'develop' of github.com:sdelements/lets-chat into developHoussam Haidar2015-10-090-0/+0
| |\
| | * Merge branch 'master' into developSimon Bartlett2015-09-211-1/+1
| | |\
| | * \ Merge branch 'master' into developSimon Bartlett2015-09-213-2/+85
| | |\ \
| * | \ \ Merge branch 'release/0.4.3' into developHoussam Haidar2015-10-099-27/+112
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into release/0.4.3origin/release/0.4.3Houssam Haidar2015-10-099-27/+193
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Fixed passport dependenciesSimon Bartlett2015-09-301-2/+2
* | | | | Fixed passport.socketio dependencySimon Bartlett2015-09-241-1/+1
* | | | | Fixed passport dependenciesSimon Bartlett2015-09-212-9/+5
* | | | | Updated travis fileSimon Bartlett2015-09-211-3/+3
* | | | | Updated travis fileSimon Bartlett2015-09-211-0/+3
* | | | | Updated Travis to run on node 0.10, 0.12 and 4.xSimon Bartlett2015-09-211-0/+2
* | | | | Updated NPM packages and eslintrcSimon Bartlett2015-09-213-23/+22
* | | | | Updated travis file to use node 0.12Simon Bartlett2015-09-211-1/+3
| |_|_|/ |/| | |
* | | | Fixed XMPP message ID bugSimon Bartlett2015-09-211-1/+1
| |_|/ |/| |
* | | Fixed XMPP message ID bugSimon Bartlett2015-09-211-1/+1
* | | Merge pull request #598 from AlithAnar/masterHoussam Haidar2015-09-031-0/+83
|\ \ \
| * | | Added Polish translationGrzegorz Pasieka2015-09-021-0/+83
* | | | Merge pull request #599 from andreyors/patch-1Houssam Haidar2015-09-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Follow the russian language rules.Andrey O.2015-09-021-1/+1
|/ / /
| | * Fix z-index issueHoussam Haidar2015-10-091-1/+1
| * | Proper text chopping for FFHoussam Haidar2015-08-282-9/+14
| * | Runnin' through the 6ix with my FF woesHoussam Haidar2015-08-271-0/+7
| * | Merge branch 'master' into developHoussam Haidar2015-08-272-2/+83
| |\ \ | |/ / |/| |
* | | Fix htmlentities appearing in document titleHoussam Haidar2015-08-271-2/+1
* | | Merge pull request #593 from MOZGIII/lang-ruHoussam Haidar2015-08-271-0/+82
|\ \ \
| * | | Added Russian translationMOZGIII2015-08-161-0/+82
| | * | Fix safari issueHoussam Haidar2015-08-252-1/+2
| | |/
| | * New send button stylingHoussam Haidar2015-08-252-3/+18
| | * Make room browser use new room-headerHoussam Haidar2015-08-254-48/+36