Commit Graph

9165 Commits

Author SHA1 Message Date
Julian Lam
e340b9fffe fixed save/delete/purge in category ACP, #2463 2015-03-25 17:51:46 -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
60b19a9d62 Merge remote-tracking branch 'origin/master' into categories_revamp 2015-03-25 17:23:17 -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
Barış Soner Uşaklı
4a18a041c9 #2894 no need to remove if there are no new posts 2015-03-25 16:20:27 -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
Barış Soner Uşaklı
f928b87997 use component, add user.watch title 2015-03-24 15:46:15 -04:00
Barış Soner Uşaklı
08ec35820d Merge pull request #2890 from EvSpirit/master
#2886 Check subcategories when showing category recent topics
2015-03-24 15:16:50 -04:00
EvSpirit
2ea840e65d #2886 Check subcategories when showing category recent topics 2015-03-24 21:58:35 +03:00
EvSpirit
0fcd4dee58 #2886 Check subcategories when showing category recent topics 2015-03-24 21:39:28 +03:00
psychobunny
11710987a4 fixed navigator pagination 2015-03-24 14:20:01 -04:00
Julian Lam
fcbc02d48a better local function name in install.js 2015-03-24 13:47:47 -04:00
Barış Soner Uşaklı
203d4d052a fixed my logic fail 2015-03-24 13:21:54 -04:00
Barış Soner Uşaklı
c7b5cd48ba closes #2773 2015-03-24 13:10:18 -04:00
psychobunny
d39c2924e4 found a rogue topic class selector 2015-03-24 12:56:01 -04:00
Barış Soner Uşaklı
29fd89407c closes #2872
show the last posts content and user in topic feeds
2015-03-24 12:55:27 -04:00
psychobunny
705111a1d9 chat/icon component 2015-03-24 12:21:19 -04:00
Barış Soner Uşaklı
f6d0ad9b0f Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0 2015-03-24 12:16:31 -04:00
Julian Lam
4dbb1c08b6 added default host port and db settings for mongo, if not set in config file 2015-03-24 11:08:06 -04:00
Barış Soner Uşaklı
fc28cbf887 filter cids with a single .filter thanks @julianlam 2015-03-24 10:59:21 -04:00
Julian Lam
06d547a6cb fixed bug in privilege settings where categories near the end of a list were not having their permissions read properly if earlier categories were disabled, #2887 2015-03-24 10:52:36 -04:00
barisusakli
b268927cf9 removedu if from filter:parse,post, parse strip teaser content 2015-03-23 19:32:32 -04:00
psychobunny
7c9e76132d topic/follow component fix 2015-03-23 14:42:45 -04:00
barisusakli
9754dc8be0 open user link in new tab 2015-03-21 15:32:11 -04:00
psychobunny
4ec43f662c don't actually need to restart nodebb to apply skins 2015-03-21 13:10:57 -04:00
barisusakli
6b950d0596 fix endsWith if check 2015-03-20 19:42:59 -04:00
barisusakli
810d3be512 closes #2593 2015-03-20 19:36:18 -04:00
barisusakli
4c31535c4b closes #2799 2015-03-20 18:47:08 -04:00
barisusakli
6c0e07c384 Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0 2015-03-20 17:52:04 -04:00
barisusakli
38726243fe closes #2879 2015-03-20 16:13:34 -04:00
barisusakli
04ed79e587 fix profile image upload on subfolder install 2015-03-20 14:48:19 -04:00
barisusakli
c8e0eab34e escape data on room enter 2015-03-20 13:46:05 -04:00
barisusakli
7dde229517 added filter:teasers.get 2015-03-20 12:21:27 -04:00
barisusakli
ea91518f30 slugs lowercase duh 2015-03-19 23:03:36 -04:00
Barış Soner Uşaklı
9e7af15bbc Merge pull request #2876 from cismous/master
remove comma
2015-03-19 23:01:41 -04:00
barisusakli
9d62709f7c doggy.gif 2015-03-19 22:59:12 -04:00
barisusakli
a51b7257c7 fix group name in tests 2015-03-19 22:46:40 -04:00
barisusakli
8b5643fe90 system and hidden groups cant be renamed 2015-03-19 22:42:16 -04:00
barisusakli
e5bea19f56 renamed groupname 2015-03-19 22:35:24 -04:00
barisusakli
649ef93768 its called foo :dull 2015-03-19 22:21:08 -04:00
barisusakli
e4431f62b2 fix group update text 2015-03-19 22:07:36 -04:00
barisusakli
358f6f61f7 closes #2803, closes #2883
options.unescape was not used correctly
fix groups.update so it  doesnt overwrite data if some fields are not
passed in
2015-03-19 21:43:53 -04:00
psychobunny
d2dae2d62f standardize showSelect amongst category and topic_list routes 2015-03-19 16:15:39 -04:00