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 |
|
EvSpirit
|
0fcd4dee58
|
#2886 Check subcategories when showing category recent topics
|
2015-03-24 21:39:28 +03: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 |
|
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 |
|
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 |
|
barisusakli
|
9754dc8be0
|
open user link in new tab
|
2015-03-21 15:32:11 -04:00 |
|
barisusakli
|
810d3be512
|
closes #2593
|
2015-03-20 19:36:18 -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 |
|
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
|
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 |
|
Barış Soner Uşaklı
|
0ebad0fe10
|
Merge pull request #2843 from FokkeZB/patch-1
Skip setTimeout if it doesn't exist (Node 0.10.x with SSL)
|
2015-03-19 15:56:14 -04:00 |
|
Barış Soner Uşaklı
|
9edfcb0053
|
dont save user obj in db
|
2015-03-19 15:55:56 -04:00 |
|
psychobunny
|
6acfec9d25
|
add teaser content to category view
|
2015-03-19 15:50:28 -04:00 |
|
Julian Lam
|
eee2aa8051
|
making sure to pass in userData to notifications.create on user follow
|
2015-03-19 15:46:33 -04:00 |
|
Barış Soner Uşaklı
|
8b429a2e05
|
removed path
|
2015-03-19 15:26:51 -04:00 |
|
Barış Soner Uşaklı
|
cc92d09498
|
generateNotificationPaths
|
2015-03-19 15:24:46 -04:00 |
|
psychobunny
|
8c0dfa1217
|
data/category partial
|
2015-03-19 15:11:02 -04:00 |
|
Julian Lam
|
82f7ca5e0f
|
added a path to follow notification
|
2015-03-19 14:56:27 -04:00 |
|
Barış Soner Uşaklı
|
d05ef6ddbc
|
closes #2822
|
2015-03-19 13:28:15 -04:00 |
|
Julian Lam
|
5a4fa18e98
|
fixed digests so they aren't prematurely exiting, and will send again :shipit:
|
2015-03-19 13:20:56 -04:00 |
|
Barış Soner Uşaklı
|
0bbebbe4b1
|
Merge remote-tracking branch 'origin/master' into search-cid-uid
|
2015-03-19 10:59:39 -04:00 |
|
barisusakli
|
5bc2e7dac2
|
closes #2309
|
2015-03-18 17:50:53 -04:00 |
|
barisusakli
|
254fcff01f
|
forgot db require
|
2015-03-18 15:18:07 -04:00 |
|
barisusakli
|
6c58bd9520
|
closes #2871
|
2015-03-18 15:16:37 -04:00 |
|