Commit Graph

5394 Commits

Author SHA1 Message Date
psychobunny
27ad7e41c9 process.env is an object 2015-04-01 14:49:11 -04:00
Barış Soner Uşaklı
925b12ca22 startsWith 2015-04-01 14:47:38 -04:00
Barış Soner Uşaklı
ca332d23c0 wait for createIndex errors 2015-04-01 12:28:10 -04:00
Julian Lam
f8fb5a1d9f Merge pull request #2837 from atomoc/master
Add parameters for create categories
2015-04-01 11:57:46 -04:00
psychobunny
4a9498e105 closes #2916 2015-04-01 11:49:46 -04:00
Сергей Савельев
ce743be779 Delete errors 2015-04-01 18:25:27 +03:00
Сергей Савельев
6b3b44e2fc Delete errors 2015-04-01 18:22:55 +03:00
Сергей Савельев
18c5354ec7 Merge branch 'master' of https://github.com/atomoc/NodeBB 2015-04-01 15:11:19 +03:00
Сергей Савельев
621ae9c91a Add admin hooks for get categories 2015-04-01 15:11:15 +03:00
Сергей Савельев
63db2a539e Merge pull request #4 from NodeBB/master
123
2015-04-01 15:10:18 +03:00
barisusakli
2fd4bcde3f added req.uid user id for logged in users, 0 for guests 2015-04-01 00:23:57 -04:00
barisusakli
878e548296 renamed end to stop globally
fixed getting favourites for admins
2015-03-31 23:40:58 -04:00
barisusakli
27bab3330a pass data to getCategoryTopics, renamed end to stop 2015-03-31 22:59:34 -04:00
barisusakli
7a3b4c08e0 closes #2922 2015-03-31 21:14:36 -04:00
Сергей Савельев
f7a3428bf8 Merge pull request #3 from NodeBB/master
123
2015-03-31 23:07:21 +03:00
Julian Lam
47a7ab15be refactored translator system to be a require.js module, and not a global 2015-03-31 15:11:59 -04:00
Barış Soner Uşaklı
c4569d533d added filter:categories.build 2015-03-31 11:14:12 -04:00
barisusakli
b2087f94e2 closes #2904 2015-03-30 13:31:08 -04:00
Сергей Савельев
a70f1b09e4 m 2015-03-30 12:11:01 +03:00
barisusakli
8026b3c7d8 closes #2911 2015-03-28 15:26:23 -04:00
Julian Lam
c706638b5d updating groups access control so:
1. Guests can no longer receive the moderate bit
  2. If you attempt to grant the moderate privilege to a public group, a confirmation modal appears
  3. A lock icon is present next to all private groups
2015-03-28 11:23:51 -04:00
Julian Lam
89442c91c6 fixed bug where privilege state was not correctly calculated for MongoDB installs, and fixed columnCount not being present when a the privilege list is refreshed 2015-03-28 10:19:43 -04:00
Julian Lam
8e17f34de4 lol. 2015-03-27 20:51:38 -04:00
barisusakli
8d6d1c32e7 allow plugins to update additional fields with filter:user.updateProfile 2015-03-27 14:01:59 -04:00
Julian Lam
f0f31e077f added exposeUid middleware to core 2015-03-27 13:30:18 -04:00
cismous
68cf6833b7 remove unneeded argument 2015-03-27 23:59:39 +08:00
barisusakli
ed8d60b76b move registered-users/guests to top remove admins from priv settings 2015-03-26 18:33:05 -04:00
Barış Soner Uşaklı
41db2dcd14 removed idle added recent tags presence info 2015-03-26 16:32:28 -04:00
Julian Lam
0d044c34c1 removed old code that was adding unneeded html to the template 2015-03-26 13:14:20 -04:00
Julian Lam
f4803c21ac added missing partial 2015-03-26 13:12:21 -04:00
Barış Soner Uşaklı
5ce72f4920 dont add guests to users:repuration zset 2015-03-26 13:03:23 -04:00
Barış Soner Uşaklı
e0b4a35a25 dont add guests to users:postcount zset 2015-03-26 13:00:26 -04:00
Barış Soner Uşaklı
c9b98306e0 dont require everything in folder
dont want rooms.js to be public
2015-03-26 12:42:25 -04:00
Barış Soner Uşaklı
30104b898c dont allow vote spam 2015-03-26 12:22:39 -04:00
barisusakli
e528f52cfb closes #2757 2015-03-25 23:06:56 -04:00
barisusakli
77e956861a #2486
various fixes for socket.io cluster
display user presence correctly
2015-03-25 22:33:19 -04:00
Julian Lam
1a58ea6520 closed #2695 2015-03-25 20:04:45 -04:00
Julian Lam
d95f5a9ae0 added help block to category purge button, updated iconSelect library to use templates in a better way, hooked up iconSelect for category mgmt, #2463 2015-03-25 19:29:24 -04:00
Julian Lam
202789fa8d added back category creation, #2463 2015-03-25 18:08:15 -04:00
Julian Lam
7cdfe143ab fixed bug where cid was hardcoded, and switched format back to storing group names, not slugs, #2887 2015-03-25 17:41:54 -04:00
Julian Lam
4f2c7382c5 passing in the column count so a message can be displayed to users when no users have privs in a category, #2887 2015-03-25 17:34:16 -04:00
Julian Lam
9dece4a1db added some missing files from previous commits, fixed setParent mechanic which broke after I refactored, #2463 2015-03-25 17:21:38 -04:00
Julian Lam
25cb1f9284 Merge remote-tracking branch 'origin/master' into categories_revamp 2015-03-25 16:10:27 -04:00
Julian Lam
d3af278123 removed old code that was no longer necessary, updated privilege table to show all groups (similar to previous behaviour), fixes #2887 2015-03-25 16:09:38 -04:00
Barış Soner Uşaklı
36942125e6 closes #2894
also mark user online if they post a reply
2015-03-25 15:51:11 -04:00
Julian Lam
9b84a887d3 a huge frickin' number of changes for #2887. This is part of #2463 2015-03-25 15:43:57 -04:00
Julian Lam
815ea88fa5 readded some missing classes, fixed some styling on category.tpl, fixed image uploading code 2015-03-25 11:58:21 -04:00
Julian Lam
765f15096b removed wrapping .row around tables in acp/manage/categories 2015-03-25 11:35:38 -04:00
Julian Lam
a1621145d5 Merge branch 'master' into categories_revamp
Conflicts:
	public/less/admin/admin.less
	public/src/admin/manage/categories.js
	src/controllers/admin.js
	src/views/admin/manage/categories.tpl
	src/views/config.json
2015-03-25 11:16:37 -04:00
EvSpirit
2ea840e65d #2886 Check subcategories when showing category recent topics 2015-03-24 21:58:35 +03:00