Commit Graph

5532 Commits

Author SHA1 Message Date
Julian Lam
7dffc2a2e9 moving chat timestamp to top of message, not end 2014-05-15 16:33:36 -04:00
barisusakli
29420d6f82 fixed indents 2014-05-15 10:49:53 -04:00
barisusakli
bb34834742 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-05-15 10:38:52 -04:00
barisusakli
3e86bdb38f more work on #1518
still needs more work, category is next
2014-05-15 10:38:02 -04:00
Julian Lam
45926b308c added korean language files to NodeBB, thanks @g6123! 2014-05-15 09:43:14 -04:00
유성매직
e600bee52b added Korean translation 2014-05-15 22:22:04 +09:00
barisusakli
822cf56af1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-05-15 07:48:46 -04:00
barisusakli
292e4bbdd6 fixed post privilege privilege 2014-05-15 07:48:21 -04:00
psychobunny
9040813b0d closes #1530 2014-05-14 19:00:05 -04:00
psychobunny
3b00417d99 added colorPicker to branding inputs 2014-05-14 18:51:06 -04:00
psychobunny
4cf6ebda7b updated enableColorPicker to accept either a jQ obj or a string; updated it to be able to initialize several inputs at once 2014-05-14 18:50:50 -04:00
psychobunny
29137299c2 added public/src/admin.js; moved enableColorPicker into admin.enableColorPicker 2014-05-14 18:46:11 -04:00
psychobunny
e2312c8330 branding settings on ajaxify fixed 2014-05-14 18:30:25 -04:00
psychobunny
a5a2e6f04e update BS brand colors in ACP 2014-05-14 18:05:28 -04:00
barisusakli
4234057821 first pass for #1518
this only handles postTools privileges, topic and category will follow
2014-05-14 17:53:27 -04:00
psychobunny
ec5cdd178a added function to update branding colors 2014-05-14 17:15:22 -04:00
psychobunny
70b5f9addc some regex to scour the CSS and figure out the branding colors 2014-05-14 17:07:31 -04:00
psychobunny
d734f9f230 removed unused faq.rst 2014-05-14 15:33:32 -04:00
psychobunny
a48403dd22 updated faq 2014-05-14 15:33:31 -04:00
barisusakli
f29dda4b92 fixed 1 more 2014-05-14 14:59:35 -04:00
barisusakli
3643fbc212 fixes 2 privilege issues 2014-05-14 14:56:46 -04:00
Julian Lam
52cb62960f added reset code to disable ONE plugin, updated FAQ 2014-05-14 11:20:23 -04:00
Julian Lam
cd9abcde74 updated package deps in 0.4.x branch so it doesn't pull theme versions that are too new
Conflicts:
	package.json
2014-05-14 00:30:10 -04:00
Julian Lam
66225237a0 view_deleted fix for privs 2014-05-13 21:22:06 -04:00
Julian Lam
34b522f36d missed a bunch of "editable" checks 2014-05-13 21:21:24 -04:00
barisusakli
ac65655384 fixed missing return 2014-05-13 21:13:54 -04:00
Julian Lam
6604a29f74 upgrade script for new privilege system 2014-05-13 19:03:20 -04:00
Julian Lam
b5d4e62e70 fixed bug in privileges system, thanks TravisCI! 2014-05-13 18:18:08 -04:00
Julian Lam
759775ecbe Merge remote-tracking branch 'origin/master' 2014-05-13 18:00:01 -04:00
Julian Lam
87cb1699fd arbitrarily increasing lavender's minver too 2014-05-13 17:59:42 -04:00
Julian Lam
2d20478b8d updated vanilla version req. 2014-05-13 17:59:07 -04:00
Julian Lam
5b3318608e updated text copy -- closed #933 2014-05-13 17:58:01 -04:00
Julian Lam
87f4566e06 more fixed to privs, and ACP modal 2014-05-13 17:06:58 -04:00
Julian Lam
d54ecea506 more privilege changes 2014-05-13 17:06:58 -04:00
Julian Lam
7c8b442dcd more updates to privileges revamp 2014-05-13 17:06:58 -04:00
Julian Lam
72ca0d6d40 got privilege selection working for users and groups 2014-05-13 17:06:58 -04:00
Julian Lam
186943ced1 removing old html in js 2014-05-13 17:06:58 -04:00
Julian Lam
7fe0ab6022 migrated views in js into partials 2014-05-13 17:06:58 -04:00
barisusakli
4f11ac9664 fixed missing comma 2014-05-13 16:45:37 -04:00
barisusakli
da72924187 removed duplication 2014-05-13 16:44:44 -04:00
Julian Lam
0e20350ca7 0.4.3 2014-05-13 16:40:19 -04:00
Julian Lam
ea6576c6f3 latest translations and fallbacks 2014-05-13 16:39:56 -04:00
psychobunny
97d256c372 cleanup 2014-05-13 12:09:21 -04:00
barisusakli
c5d9a68b4b closes #1445 2014-05-12 18:42:13 -04:00
barisusakli
fc00586f0e 0 disables flags for ban 2014-05-12 14:53:53 -04:00
barisusakli
c7744d7a64 closes #1483 2014-05-12 14:51:39 -04:00
psychobunny
9efc341772 updated docs for alert closefn/clickfn 2014-05-12 13:03:49 -04:00
psychobunny
240932dd80 add cursor: pointer if alert's clickfn is defined 2014-05-12 13:02:48 -04:00
psychobunny
3c7b433e3a linting settings.js 2014-05-12 12:59:34 -04:00
psychobunny
a121ec716a Merge pull request #1517 from frissdiegurke/patch-1
fix call of expandObjBy with undefined
2014-05-12 12:17:15 -04:00