Commit Graph

11295 Commits

Author SHA1 Message Date
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
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ı
027f9e5a83 dont need start time anymore 2015-03-19 15:27:27 -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
psychobunny
8fbb085718 Merge remote-tracking branch 'origin/master'
Conflicts:
	public/src/client/topic/postTools.js
2015-03-19 15:06:14 -04:00
psychobunny
f2c220988b fix for posting in multiple threads bug 2015-03-19 15:05:11 -04:00
Barış Soner Uşaklı
b1478ad5da dont add events multiple timest to #content 2015-03-19 15:05:00 -04:00
Julian Lam
82f7ca5e0f added a path to follow notification 2015-03-19 14:56:27 -04:00
psychobunny
bc056f0724 can remove this line as well 2015-03-19 14:22:00 -04:00
psychobunny
5d7ce0011a no need for setTimeout in ajaxify 2015-03-19 14:21:23 -04:00
psychobunny
85e3cb9f0d Merge remote-tracking branch 'origin/persona' 2015-03-19 14:10:28 -04:00
psychobunny
87ffc2cff9 topic/pinned and topic/locked components 2015-03-19 14:05:41 -04:00
psychobunny
4ca6364dd4 removed .category-item selectors 2015-03-19 13:58:29 -04:00
psychobunny
10eb617c6d category and category/topic components; removed #topic-container selectors 2015-03-19 13:56:12 -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
psychobunny
aeb7548a9d because this works 2015-03-19 12:58:09 -04:00
Barış Soner Uşaklı
6417a55918 up dbsearch version 2015-03-19 12:47:28 -04:00
Barış Soner Uşaklı
877b2d51fc Merge remote-tracking branch 'origin/search-cid-uid' 2015-03-19 12:33:02 -04:00
Barış Soner Uşaklı
0cc900bdcf closes #2878 2015-03-19 12:32:05 -04:00
Julian Lam
8e38840768 also passing in uid in topic delete and restore hooks 2015-03-19 11:34:51 -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
a1b6019efe disable/enable reply buttons on lock/unlock 2015-03-18 20:43:57 -04:00
barisusakli
783bcb9bd6 some component fixes closes #2881 2015-03-18 20:20:32 -04:00
barisusakli
5bc2e7dac2 closes #2309 2015-03-18 17:50:53 -04:00
psychobunny
41f5afa887 fix for post-bar reply button 2015-03-18 17:48:14 -04:00
psychobunny
721ee09b19 removed deprecation notice 2015-03-18 17:41:55 -04:00
Julian Lam
5951079926 latest translations 2015-03-18 16:18:17 -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
psychobunny
e9d9e14eb4 components - fixed a bug with bottom post bar now showing up 2015-03-18 14:55:16 -04:00