Commit Graph

8834 Commits

Author SHA1 Message Date
Julian Lam
00f3084b8e closes #2792, closes #2791, closes #2788, closes #2787, closes #2786, closes #2785, closes #2784, closes #2783
Squashed commit of the following:

commit ca5064a4effa3904ce936b521b169bba8d24f1a1
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 26 08:19:32 2015 -0500

    Revert "added ajaxify popstate cache, so back/forward will just put back the already loaded page"

    This reverts commit 77d154bb8b.

commit ae07fc56c156074de8048bb627f5d9be849c8ad1
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 26 08:19:24 2015 -0500

    Revert "on click, topics are marked read from the unread page. Also fixed an issue where isPopState kept getting set to true, causing issues"

    This reverts commit d8c9ec0d40.

    Conflicts:
    	public/src/client/unread.js

commit 96ee3631d7e4e1fc2c1b7632d86684fecd1e430f
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 26 08:18:25 2015 -0500

    Revert "actually fixed isPopState error"

    This reverts commit e6701c5a1f.
2015-02-26 08:19:57 -05:00
psychobunny
0c8e0ca46f linted /meta 2015-02-25 19:28:43 -05:00
psychobunny
b0628c2df8 missing semi-colons in database/ 2015-02-25 19:27:13 -05:00
psychobunny
32ce785e5a somebody was trying to save trees by reducing whitespace
burn the trees
2015-02-25 19:16:24 -05:00
psychobunny
26245133f3 linted client-side core modules 2015-02-25 19:15:02 -05:00
psychobunny
241f5b0224 linted client side modules 2015-02-25 19:13:03 -05:00
psychobunny
cb1e2c9fef linting client side modules 2015-02-25 19:09:39 -05:00
psychobunny
c3541dbc95 linting acp 2015-02-25 19:05:29 -05:00
psychobunny
f6d90782a8 hinting 2015-02-25 19:03:32 -05:00
psychobunny
c1b45bc0ea #2779 when duplicating categories, rename category:name to indicate it is duplicate
otherwise :rage1: when somebody deletes the wrong category
2015-02-25 18:54:11 -05:00
psychobunny
5020e864fc #2779 also copy icon 2015-02-25 18:52:26 -05:00
psychobunny
59d176fa7b closes #2779 2015-02-25 18:29:23 -05:00
barisusakli
a0c3ddc555 fix navigator 2015-02-25 18:00:03 -05:00
psychobunny
5a8babdde5 up'd vanilla's version 2015-02-25 17:52:45 -05:00
psychobunny
d545492b67 navigation: moved target to properties 2015-02-25 17:51:50 -05:00
psychobunny
b1f835b053 Merge remote-tracking branch 'origin/master' into sortable-menu 2015-02-25 17:44:02 -05:00
psychobunny
b788e134d1 added compatibility for deprecated filter:header.build
remove after 0.7.x
2015-02-25 17:43:31 -05:00
psychobunny
bc7729fbb3 console.logs 2015-02-25 17:27:05 -05:00
psychobunny
2b57ef3d4b fixed a bug with draggable 2015-02-25 17:26:44 -05:00
psychobunny
1b250b8f57 linting 2015-02-25 17:23:02 -05:00
psychobunny
2ff59278c9 navigation cleanup 2015-02-25 17:22:41 -05:00
psychobunny
aa58302a27 type check before escape/unescape 2015-02-25 17:22:25 -05:00
psychobunny
e90f3bf7c8 fix typo in install data 2015-02-25 17:22:12 -05:00
psychobunny
1774cf0b15 allow language strings in menu items 2015-02-25 17:12:17 -05:00
psychobunny
be06162f0d translator.unescape 2015-02-25 16:59:38 -05:00
psychobunny
33e4a2f1ec translator.escape 2015-02-25 16:55:38 -05:00
psychobunny
6c0efa09c0 bugfix 2015-02-25 16:52:50 -05:00
psychobunny
d806cd134f sortable menus, done 2015-02-25 16:47:19 -05:00
psychobunny
809ed255d1 drag & drop routes 2015-02-25 16:19:14 -05:00
Julian Lam
f00589c8ba removing 'see all chats' from chats list, as it is in menu.tpl now 2015-02-25 16:07:03 -05:00
Julian Lam
37d426dddb npnp, I totally meant to remove a method that's still in use... 2015-02-25 15:56:52 -05:00
Julian Lam
ec075ca608 suppressing alertSuccess when clicking into topics from unread page 2015-02-25 15:50:20 -05:00
Barış Soner Uşaklı
73505e9bd0 closes #2247 2015-02-25 15:37:33 -05:00
psychobunny
afc690d67b upon saving, copy over route properties from defaults 2015-02-25 15:29:26 -05:00
psychobunny
a9f175a2bb ability to sort navigation 2015-02-25 15:18:57 -05:00
psychobunny
a2e3179ea4 nav - enable / disable 2015-02-25 15:16:51 -05:00
psychobunny
1ae0a8a1bf typo 2015-02-25 15:01:45 -05:00
psychobunny
c3701bcea7 loading and saving navigation 2015-02-25 15:01:28 -05:00
psychobunny
fbc0a11c87 nav - basic ACP setup 2015-02-25 14:50:45 -05:00
Julian Lam
e6701c5a1f actually fixed isPopState error 2015-02-25 14:33:46 -05:00
Julian Lam
d8c9ec0d40 on click, topics are marked read from the unread page. Also fixed an issue where isPopState kept getting set to true, causing issues 2015-02-25 14:33:46 -05:00
Julian Lam
77d154bb8b added ajaxify popstate cache, so back/forward will just put back the already loaded page 2015-02-25 14:33:46 -05:00
Barış Soner Uşaklı
094cd6df32 closes #2777 2015-02-25 14:17:38 -05:00
psychobunny
8256d2b997 bugfix 2015-02-25 14:15:50 -05:00
psychobunny
307204fc38 nav - added enabled/disabled 2015-02-25 14:12:16 -05:00
Julian Lam
55262b399a tweaks and refactoring for #2774 2015-02-25 14:10:00 -05:00
psychobunny
6c77adfd3c tjs 0.1.21 * 2015-02-25 14:05:16 -05:00
psychobunny
431a7f3300 tjs 0.1.20 2015-02-25 14:02:33 -05:00
psychobunny
40008a9e85 Merge remote-tracking branch 'origin/master' into sortable-menu 2015-02-25 13:56:57 -05:00
psychobunny
6cea047518 loading navigation, complete 2015-02-25 13:55:26 -05:00