Commit Graph

6012 Commits

Author SHA1 Message Date
Julian Lam
d18461c8eb wtf. Merge remote-tracking branch 'origin/chat-route' into chat-route
Conflicts:
	public/language/en_GB/modules.json
	src/controllers/accounts.js
	src/middleware/middleware.js
	src/routes/index.js
2014-07-05 15:46:37 -04:00
Julian Lam
89dc8c490a WIP 2014-07-05 15:01:25 -04:00
Julian Lam
0dad7adb8d issue #1788 - start 2014-07-04 22:04:20 -04:00
Julian Lam
b03bb3a32b issue #1788 - start 2014-07-04 19:54:47 -04:00
barisusakli
5097526ae0 pass express app to plugins, closes #1789 2014-07-04 18:25:08 -04:00
barisusakli
f288f80da6 meta.js refactor 2014-07-04 18:20:44 -04:00
Julian Lam
49b4af42e1 latest translations for Chinese Simplified 2014-07-04 16:01:42 -04:00
Julian Lam
507fc2cc56 latest persian translations 2014-07-04 16:01:42 -04:00
Julian Lam
ae37cdb048 latest chinese translations 2014-07-04 16:01:42 -04:00
barisusakli
80cb0cf7e0 plugins.js jslint 2014-07-04 14:43:08 -04:00
psychobunny
ddcca28cf0 pass allowRegistration in login API for #1786 2014-07-04 11:41:03 -04:00
Julian Lam
8432e3ff82 latest translations for persian 2014-07-03 15:02:37 -04:00
barisusakli
3e75a4397a fixes guest post data in topics 2014-07-03 09:42:39 -04:00
barisusakli
dcbed4e935 closes #1763
show alert if email not confirmed, clicking alert will send confirmation
email
2014-07-03 09:36:46 -04:00
Julian Lam
a960f53f92 latest translations 2014-07-03 09:21:18 -04:00
Julian Lam
699795621a Merge branch 'master' of github.com:nodebb/NodeBB 2014-07-03 09:19:47 -04:00
barisusakli
586aeaf53f added error checking to install.js for categories 2014-07-02 21:55:05 -04:00
barisusakli
5ea74ae9e9 closes #1776 2014-07-02 16:19:55 -04:00
barisusakli
5d0755c4a8 package.json 2014-07-02 16:13:28 -04:00
barisusakli
119d13053d move static to end 2014-07-02 16:13:27 -04:00
barisusakli
ec1196d288 use router for relative path 2014-07-02 16:13:27 -04:00
barisusakli
38494a2af0 pass in session directly 2014-07-02 16:13:26 -04:00
barisusakli
78c977e8f6 removed trailing slash 2014-07-02 16:13:26 -04:00
barisusakli
9e8584eee7 uploads 2014-07-02 16:13:25 -04:00
barisusakli
24ebf20d7e first commit 2014-07-02 16:13:25 -04:00
barisusakli
4b005a4037 crash fix 2014-07-02 15:01:14 -04:00
Julian Lam
9a9ce8684c latest translations and fallbacks 2014-07-02 12:24:52 -04:00
Barış Soner Uşaklı
c0227b46f5 Merge pull request #1775 from frissdiegurke/patch-1
fixed no href-attribute handled as external link
2014-07-01 16:52:31 -04:00
frissdiegurke
2d9bc7eee7 fixed no href-attribute handled as external link 2014-07-01 22:45:00 +02:00
barisusakli
e6c9647acf display user post topic stats in admin index 2014-07-01 16:30:06 -04:00
barisusakli
684f858415 closes #1772 2014-07-01 15:40:21 -04:00
barisusakli
64f680a0a3 action:chat.loaded hook 2014-07-01 15:05:07 -04:00
barisusakli
9a4e6aa01c closes #1774 2014-07-01 14:49:51 -04:00
Julian Lam
6057da57a2 Merge pull request #1771 from heidar/patch-1
Enable the correct modules in apache instructions
2014-06-30 22:21:49 -04:00
Heidar Bernhardsson
ea45500079 Enable the correct modules in apache instructions
See #1770 for more information.
2014-06-30 16:39:52 -07:00
barisusakli
6389bc762c fire post edit after hook after post is saved 2014-06-30 17:33:31 -04:00
barisusakli
c29dcc0ec9 fire topic edit action after topic is saved 2014-06-30 16:59:36 -04:00
barisusakli
b8b6ae7b2f moved upload route into API namespace 2014-06-30 16:33:10 -04:00
barisusakli
b41b311d94 another eachLimit 2014-06-30 15:45:39 -04:00
Julian Lam
7bb7bc8630 updated lithuanian 2014-06-30 15:21:10 -04:00
Julian Lam
ffd2ddc3e7 Revert "moved meta up"
This reverts commit 8c9feb85a4.
2014-06-30 14:55:23 -04:00
Julian Lam
cda3f9376d updated error text to show proper setup command 2014-06-30 14:55:21 -04:00
barisusakli
5ec289eee2 closes #1769 2014-06-30 14:19:06 -04:00
barisusakli
efcc42f170 added eachLimit to upgrade script 2014-06-30 14:07:30 -04:00
barisusakli
9ddff0ec4a fix language string 2014-06-29 23:29:13 -04:00
barisusakli
1b31f5b2ca single arrows wont go all the way to bottom 2014-06-29 22:35:22 -04:00
barisusakli
c9c68f8cbe move cursor to end 2014-06-29 16:47:11 -04:00
barisusakli
105acc0197 not used 2014-06-29 14:35:32 -04:00
barisusakli
8c9feb85a4 moved meta up 2014-06-29 14:30:51 -04:00
barisusakli
82a1215128 setOnEmpty 2014-06-29 14:29:32 -04:00