Commit Graph

13138 Commits

Author SHA1 Message Date
Julian Lam
a9c1ee5512 adding ban button to account info page 2016-08-08 12:10:35 -04:00
Julian Lam
9b8bbde0d3 tweak ACP email settings form syntax 2016-08-08 11:23:48 -04:00
barisusakli
aac0313f2e closes #4917 2016-08-08 13:21:05 +03:00
barisusakli
81910530fe Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-07 18:46:02 +03:00
barisusakli
bb05e6e393 closes #4916 2016-08-07 18:45:54 +03:00
NodeBB Misty
22e73b925f Latest translations and fallbacks 2016-08-07 09:04:13 -04:00
Ben Lubar
26df552d55 Add edit, delete, and topics:delete permissions for users acting on their own posts 2016-08-06 21:23:09 -05:00
Barış Soner Uşaklı
b0c55c86ed Merge pull request #4842 from acardinale/master
Added new core component for topic with tid
2016-08-07 01:02:59 +03:00
NodeBB Misty
83be60e707 Latest translations and fallbacks 2016-08-06 09:03:11 -04:00
Julian Lam
c00905035e up composer 2016-08-05 16:45:09 -04:00
barisusakli
b8687b53bd Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-05 22:35:30 +03:00
barisusakli
84025fa7fc closes #4801 2016-08-05 22:35:26 +03:00
psychobunny
af460426ad Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-05 15:27:25 -04:00
psychobunny
0e204f5ce5 missing lang key for zen mode 2016-08-05 15:27:21 -04:00
barisusakli
b07ae9a2ff Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-05 21:54:50 +03:00
barisusakli
2103880d61 only extend 5mins if less than 5mins left 2016-08-05 21:54:47 +03:00
Julian Lam
529611d278 up composer 2016-08-05 12:18:03 -04:00
Julian Lam
814fec22b2 up themes 2016-08-05 11:54:51 -04:00
barisusakli
a53f7f65db change homePageRoute logic 2016-08-05 16:45:46 +03:00
barisusakli
64d4addb02 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-05 16:32:49 +03:00
barisusakli
9cbfaa89e7 closes #4912 2016-08-05 16:32:44 +03:00
NodeBB Misty
d400b1a37f Latest translations and fallbacks 2016-08-05 09:02:29 -04:00
Julian Lam
c3f58104f6 up composer version 2016-08-04 17:56:59 -04:00
Julian Lam
dbb2ad29cb revert re: #4826 2016-08-04 17:35:33 -04:00
Julian Lam
9d25d4bd44 revert last change to ajaxify.js 2016-08-04 17:32:07 -04:00
psychobunny
90cb9ec041 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-04 16:34:40 -04:00
psychobunny
e03922fffa minor language change, since not actually logged out 2016-08-04 16:34:31 -04:00
Julian Lam
f593d925ae closes #4826, modifying ajaxify so it does not override links with target set explicitly 2016-08-04 16:17:51 -04:00
Julian Lam
f060c7a378 not using relative reference for tjs value 2016-08-04 15:48:23 -04:00
barisusakli
c3daee471a Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-04 21:12:08 +03:00
barisusakli
cb6db3625c closes #4906 2016-08-04 21:12:03 +03:00
psychobunny
8fdd82cc72 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-04 13:59:31 -04:00
psychobunny
837029f69e fixes crash when editing post 2016-08-04 13:59:22 -04:00
barisusakli
7f041a756d closes #4865 2016-08-04 20:58:04 +03:00
barisusakli
f222adb0a3 closes #4910 2016-08-04 19:40:48 +03:00
Julian Lam
e02134f981 closes #4911 2016-08-04 12:24:44 -04:00
NodeBB Misty
ff4fd8cf95 Latest translations and fallbacks 2016-08-04 09:04:27 -04:00
Julian Lam
7f689c2afd upped composer again 2016-08-03 14:56:09 -04:00
Julian Lam
602df0eeba updated composer version 2016-08-03 14:36:57 -04:00
Julian Lam
a88648126f upped composer and markdown 2016-08-03 13:13:06 -04:00
Julian Lam
7902987900 added jqueryUI to list of prefetched resources, and updated its loader to not use $.getScript(). Updated require.js files to use ?v= in the url argument for cache buster 2016-08-03 13:10:39 -04:00
Julian Lam
daa7dfacb8 up themes 2016-08-03 10:52:49 -04:00
NodeBB Misty
d2888b7c9e Latest translations and fallbacks 2016-08-03 09:02:31 -04:00
Julian Lam
5667279763 closes #4868 2016-08-02 17:56:09 -04:00
Julian Lam
dd8e5edbd7 closes #4895 2016-08-02 17:48:33 -04:00
psychobunny
fb278dd146 fix reconnection spinner on ACP 2016-08-02 17:03:00 -04:00
Julian Lam
027fce093b up composer 2016-08-02 15:18:40 -04:00
Julian Lam
077f90581b updated plugin tab labels, and added out of date plugin count 2016-08-02 14:57:25 -04:00
NodeBB Misty
0f60245659 Latest translations and fallbacks 2016-08-02 09:03:19 -04:00
barisusakli
42835c6442 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-02 13:46:25 +03:00