Commit Graph

17105 Commits

Author SHA1 Message Date
Julian Lam
2fd4edc0e2 Merge branch 'develop' into upgrades-refactor 2017-03-10 15:44:40 -05:00
Julian Lam
860999fa6c Merge remote-tracking branch 'origin/master' into develop 2017-03-10 15:44:29 -05:00
psychobunny
9dc54f801e up persona 2017-03-10 14:55:52 -05:00
psychobunny
286d0ab203 prevent tagsinput initialization from flagging as unsaved 2017-03-10 14:40:10 -05:00
psychobunny
5ca9e5e14c ACP: distinguish <small> from regular text 2017-03-10 14:36:35 -05:00
psychobunny
62f445ad7f ACP: added tagsinput to other fields that are "comma separated" 2017-03-10 14:36:35 -05:00
barisusakli
bb146e049c fix lint 2017-03-10 22:36:09 +03:00
psychobunny
debe34b96c better styling for tagsinput in ACP and added it to general -> keywords 2017-03-10 14:25:37 -05:00
barisusakli
3b41c40b93 refactor deleter code to use unixtimestamp 2017-03-10 22:22:08 +03:00
psychobunny
447b7b02ca use tagsinput for #5439 instead 2017-03-10 14:12:17 -05:00
psychobunny
f2eb4b8083 closes #5439 2017-03-10 14:03:07 -05:00
psychobunny
5aa45e9181 up persona 2017-03-10 13:37:02 -05:00
psychobunny
b3f8428691 closes #5510 2017-03-10 13:36:24 -05:00
psychobunny
a67d48e719 #5513 (#5520)
closes #5513
2017-03-10 12:50:19 -05:00
Misty (Bot)
dc4d394cd5 Latest translations and fallbacks 2017-03-10 09:22:19 +00:00
barisusakli
5e0de4b8fb closes #5517 2017-03-10 12:22:10 +03:00
psychobunny
8da8e4d8c3 closes #5469 2017-03-09 16:50:26 -05:00
psychobunny
fd8e647ef5 closes #5506 2017-03-09 16:47:07 -05:00
barisusakli
0c7dee05ef fix lint 2017-03-10 00:38:34 +03:00
barisusakli
92fa9fecb6 add mongodb connection options #3670
increase reconnect tries
add keepAlive setting
set autoReconnect to true, should be on by default
2017-03-10 00:31:50 +03:00
barisusakli
0c8058ba9d closes #5516 2017-03-09 22:36:28 +03:00
barisusakli
1c1d97dd54 up spam be gone 2017-03-09 21:32:43 +03:00
barisusakli
74d2835a1f escape body class parts 2017-03-09 20:18:42 +03:00
barisusakli
3d719eec99 enable sigs after test 2017-03-09 20:18:30 +03:00
barisusakli
8d493bf3b0 post parse test 2017-03-09 19:52:48 +03:00
barisusakli
c619b850ce fix tests 2017-03-09 17:28:19 +03:00
barisusakli
57691d9ad8 test for system group rename 2017-03-09 17:18:30 +03:00
barisusakli
f092b7754e only create 1 alert for chat spam error 2017-03-08 22:43:02 +03:00
barisusakli
32d37465fb limit size of select 2017-03-08 20:09:35 +03:00
barisusakli
47af3eb7e5 use the real count 2017-03-08 19:49:32 +03:00
psychobunny
9f2e5e9c4b closes #4685 2017-03-08 11:31:58 -05:00
Julian Lam
db0a42d808 Merge branch 'master' into develop 2017-03-08 09:41:40 -05:00
Julian Lam
364b819a42 moving sanity checks above contentLen calculation 2017-03-08 09:41:32 -05:00
Julian Lam
dede304ee2 Merge branch 'master' into develop 2017-03-08 09:33:02 -05:00
Julian Lam
fdb4766728 wow. 2017-03-08 09:32:55 -05:00
Julian Lam
f35bf91e3b Merge branch 'master' into develop 2017-03-08 09:20:00 -05:00
Julian Lam
5359a14bac better handling of redactor post length calculation on post edit 2017-03-08 09:19:45 -05:00
barisusakli
6f49509645 fix newSet on redis 2017-03-08 15:09:58 +03:00
Misty (Bot)
92ad6bb4e8 Latest translations and fallbacks 2017-03-08 09:22:29 +00:00
Julian Lam
04b66787ea removed hardcoded stepsize of 1 for chart, so it can space the ticks out properly 2017-03-07 20:53:54 -05:00
Julian Lam
bacbb6c75f holy moly it took me an hour to find this missing method that got removed in a bad merge conflict resolution... 2017-03-07 20:16:59 -05:00
Julian Lam
793555a344 Merge branch 'master' into develop 2017-03-07 14:35:49 -05:00
Julian Lam
1102ca8ebb fix issue where an auto-redirect to SSO on login route was failing if invoked via API call (ajaxify) 2017-03-07 14:35:38 -05:00
barisusakli
743a3fb442 fix test 2017-03-07 20:58:43 +03:00
barisusakli
e7ced2457e clone query object 2017-03-07 20:26:49 +03:00
barisusakli
1301fb1f34 on chat leave close the modal 2017-03-07 19:51:52 +03:00
barisusakli
8a123f7c1c closes #5509 2017-03-07 16:13:09 +03:00
barisusakli
b7e6104bbc closes #5511 2017-03-07 15:59:50 +03:00
barisusakli
69c6ee5834 closes #5483 2017-03-07 13:38:31 +03:00
barisusakli
992e3128bd closes #5499 2017-03-07 13:09:19 +03:00