Commit Graph

13011 Commits

Author SHA1 Message Date
barisusakli
2c5464760d #4668
allow admins/mods to edit even after postEditDuration has expired
2016-05-25 15:48:53 +03:00
Julian Lam
ba412f4a56 fully completed #4658 2016-05-24 23:04:57 -04:00
Julian Lam
149565169b closes #4658 2016-05-24 22:01:46 -04:00
Julian Lam
458c930bb9 Merge branch 'master' of github.com:NodeBB/NodeBB 2016-05-24 21:33:08 -04:00
Julian Lam
60af3b9b77 removed extra comma in object definition 2016-05-24 21:14:14 -04:00
Barış Soner Uşaklı
bae2458b86 Merge pull request #4676 from natejlee/patch-1
changed cls.getItem to equal cls.get
2016-05-24 20:34:18 +03:00
Nate Lee
07c59ae174 changed cls.getItem to equal cls.get from cls.set
based off of naming schema
2016-05-24 10:02:27 -07:00
barisusakli
dcb73f9647 use userCount 2016-05-24 17:52:28 +03:00
Julian Lam
79bcb9be10 fixes #4675 2016-05-24 10:42:56 -04:00
Julian Lam
afb0312f51 closes #4672 2016-05-24 10:37:45 -04:00
Julian Lam
92ab2699ba added some styling to allow mdl buttons to be stacked in ACP 2016-05-24 09:55:14 -04:00
NodeBB Misty
6878466404 Latest translations and fallbacks 2016-05-24 09:04:33 -04:00
barisusakli
5720dac803 #4175, #4298 2016-05-23 13:03:31 +03:00
barisusakli
8621bd953d Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-05-23 12:59:37 +03:00
barisusakli
54ccdf5262 closes #4651 2016-05-23 12:59:33 +03:00
Barış Soner Uşaklı
cf70c1d167 Merge pull request #4666 from akhoury/patch-5
CLS must be required first
2016-05-23 11:42:58 +03:00
barisusakli
38d1bde895 closes #4669 2016-05-23 11:39:35 +03:00
NodeBB Misty
6f544aba79 Latest translations and fallbacks 2016-05-22 09:03:09 -04:00
Barış Soner Uşaklı
86cab0787a closes #4668 2016-05-21 19:26:06 +03:00
NodeBB Misty
ecf9359fb3 Latest translations and fallbacks 2016-05-21 09:02:58 -04:00
Aziz Khoury
d34af3a796 CLS must be required first
to avoid issues. see https://gist.github.com/akhoury/acb852798e319b5ede93431e5910d3ef
2016-05-20 13:27:29 -04:00
NodeBB Misty
fac5856cc0 Latest translations and fallbacks 2016-05-20 09:02:28 -04:00
Julian Lam
95e757ea42 up mentions 2016-05-19 15:39:17 -04:00
Julian Lam
492a5ff730 proper year in copyright footer 2016-05-19 12:26:40 -04:00
barisusakli
eac2c44e5a update not following message 2016-05-19 18:31:36 +03:00
barisusakli
cfc4deb83a up themes 2016-05-19 17:09:05 +03:00
Julian Lam
192998c5c3 Revert "fixed link to documentation, @akhoury"
This reverts commit bc0359475c.
2016-05-19 10:02:45 -04:00
barisusakli
46d7994093 removed some dupe code 2016-05-19 16:32:29 +03:00
barisusakli
3f0ca31393 style changes 2016-05-19 16:07:19 +03:00
barisusakli
b56baf2530 up themes 2016-05-19 15:02:54 +03:00
barisusakli
23d134ba6c update text 2016-05-19 14:55:24 +03:00
barisusakli
9497459784 up themes 2016-05-19 14:42:24 +03:00
Barış Soner Uşaklı
ca835e35ba Merge pull request #4662 from NodeBB/topic-watching
topic watching
2016-05-19 14:34:42 +03:00
barisusakli
b02869b0f8 renamed reading to not-following
added more description text
2016-05-19 14:20:34 +03:00
barisusakli
11d3834eb9 better filtering
if topic is followed but category ignored show it in unread
2016-05-19 13:11:42 +03:00
barisusakli
7a044b4978 better filterIgnoringUids 2016-05-19 11:06:17 +03:00
barisusakli
a141f6f7ec updated category watch control 2016-05-18 20:02:34 +03:00
Dravere
2fd6391081 Made the session cookie aware of the possible relative path (#4663) 2016-05-18 12:43:46 -04:00
barisusakli
5d2e5377c5 fix tests 2016-05-18 19:22:26 +03:00
barisusakli
bf2133ed7c topic watching 2016-05-18 19:02:43 +03:00
Julian Lam
ef4a94857d fixed admin lockout timer for subfolder installs @barisusakli :trollface: 2016-05-18 11:05:25 -04:00
Barış Soner Uşaklı
917eb4bd79 up composer default 2016-05-17 23:55:51 +03:00
barisusakli
11be93a4d8 closes #4648 2016-05-17 15:45:47 +03:00
psychobunny
951ac17a90 up persona 2016-05-17 05:54:26 -04:00
Julian Lam
cd5e5e809f up mentions 2016-05-16 15:33:28 -04:00
Julian Lam
5d030dd8ab removed console log 2016-05-16 15:24:30 -04:00
Julian Lam
ffa051e828 added defaultLang support, #4655 2016-05-16 15:23:21 -04:00
Julian Lam
437770538c work-in-progress commit for #4655 2016-05-16 10:32:28 -04:00
Julian Lam
81bbe93640 fixes #4653 2016-05-16 08:22:28 -04:00
barisusakli
a4031df9b2 dont show SSO logins if its a confirmation screen 2016-05-16 14:22:07 +03:00