Commit Graph

4649 Commits

Author SHA1 Message Date
barisusakli
9685cb7fe0 removed broken post update 2014-03-13 15:23:02 -04:00
barisusakli
161c7f1875 closes #1201 2014-03-13 15:13:47 -04:00
barisusakli
175230e337 closes #1205 2014-03-13 14:08:58 -04:00
barisusakli
2bb5918b6c closes #1208 2014-03-13 13:49:22 -04:00
psychobunny
e3df487173 cleanup 2014-03-13 02:06:59 -04:00
psychobunny
79bacfe164 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-13 00:52:12 -04:00
psychobunny
6563a72b5b fixed emailer templates 2014-03-13 00:49:32 -04:00
barisusakli
7668b95c66 register.js cleanup 2014-03-12 23:18:54 -04:00
barisusakli
d8e00f95a2 moved user search to its own file 2014-03-12 22:11:48 -04:00
barisusakli
383b68e7fc user js refactor 2014-03-12 21:57:25 -04:00
barisusakli
cc0ac29b36 categories refactor 2014-03-12 21:41:53 -04:00
barisusakli
970639274e fixes image uploads
if images had special regex characters in them upload text was failing
2014-03-12 21:18:39 -04:00
barisusakli
90e398e5c9 user js refactor, category fix
if a category that didn't exist was request with category/1231 or
api/category/1231 it was crashing.
2014-03-12 20:53:48 -04:00
Julian Lam
67ef155c60 fixing image uploads 2014-03-12 20:03:20 -04:00
psychobunny
b2986f2a4e removing use strict from forum/topic.js until its refactored properly 2014-03-12 18:32:40 -04:00
psychobunny
bdfe12f365 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 18:30:17 -04:00
psychobunny
35ac0bb793 linted app.js 2014-03-12 18:30:13 -04:00
psychobunny
dd7433bab6 fixed active users icon in thread 2014-03-12 18:30:06 -04:00
barisusakli
3f5c51174d refactored user.js
took out notifications, email and reset code to separate files
2014-03-12 18:00:33 -04:00
psychobunny
f47f146320 moved out uploads and users from controllers/admin into their own files 2014-03-12 17:59:29 -04:00
psychobunny
641ec3ef82 moved duplicate upload validation code into its own fn 2014-03-12 17:46:03 -04:00
psychobunny
0bbff06cfa use middleware.authenticate instead of checking in each fn 2014-03-12 17:39:10 -04:00
psychobunny
01cda60704 moved admin upload functions into controllers/admin; re-organized routes/admin to look like routes/index; removed unused deps 2014-03-12 17:34:59 -04:00
psychobunny
01077cb35b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 17:11:20 -04:00
psychobunny
0d625761be fixing bug introduced @ da0355ef79 (multiple widget areas defined = explosion) 2014-03-12 17:11:13 -04:00
barisusakli
0f19578523 removed dupe body 2014-03-12 17:08:06 -04:00
psychobunny
bdc7a19bd7 don't attempt to parse a non-existing widget area 2014-03-12 16:51:59 -04:00
psychobunny
58fe16e15c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:31:29 -04:00
psychobunny
7fc2e627c5 linting templates.js; got rid of some unused server-side code 2014-03-12 16:31:26 -04:00
Julian Lam
e611a8174e linting setting.js again and abstracting out saveField 2014-03-12 16:21:19 -04:00
psychobunny
0a293be823 linting categories.js and footer.js 2014-03-12 16:18:48 -04:00
psychobunny
d183e58771 linting admin/groups 2014-03-12 16:17:00 -04:00
psychobunny
6ea760d636 linting admin/index; admin/languages 2014-03-12 16:15:39 -04:00
psychobunny
2d65a746e4 linting admin/settings 2014-03-12 16:14:18 -04:00
psychobunny
81de895c0e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:12:27 -04:00
psychobunny
b515995432 removed unnecessary switch case 2014-03-12 16:12:23 -04:00
Julian Lam
4da1a2da97 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 16:11:49 -04:00
Julian Lam
1e0ec5dd47 appending relative path to user images for subfolder installs 2014-03-12 16:11:33 -04:00
psychobunny
8e4c23149c more re-organization of routes/index.js 2014-03-12 16:07:54 -04:00
psychobunny
e9fb2f4135 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:02:03 -04:00
psychobunny
44a91fe9ea linting admin/themes 2014-03-12 16:01:58 -04:00
barisusakli
2220483915 notifications 2014-03-12 15:59:02 -04:00
Julian Lam
5647354421 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 15:51:49 -04:00
Julian Lam
ca2e9d7d9e linting and moving xregexp back to .js 2014-03-12 15:51:24 -04:00
psychobunny
bff722925f Merge pull request #1206 from BitBangersCode/plugin-templates-fix
Fix importing of templates served by plugins
2014-03-12 15:46:53 -04:00
MrWaffle
c1a580c51d Fix importing of templates served by plugins 2014-03-12 20:45:07 +01:00
Julian Lam
738ada9b16 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 15:41:26 -04:00
Julian Lam
816d9e5d12 minifying xregext lib 2014-03-12 15:41:21 -04:00
psychobunny
fdb9b889ec Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 15:20:23 -04:00
psychobunny
fb1ddc3d9b minifying colorpicker.js 2014-03-12 15:20:20 -04:00