726 Commits

Author	SHA1	Message	Date
barisusakli	7b91da067b	closes #5602	2017-04-18 14:21:28 -04:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	010473e5cc	Merge branch 'master' into patch-pitaj	2017-04-09 23:09:52 -06:00
Peter Jaszkowiak	0ef30e91ba	Use ace-builds npm package instead of vendor ... ace can be referenced as an r.js module, reduces acp bundle size	2017-04-08 19:05:10 -06:00
pichalite	4c89497cc4	Closes #5521	2017-04-07 20:57:00 +00:00
psychobunny	5985a8a7a3	closes #5574	2017-04-06 18:06:10 -04:00
psychobunny	e121a5a798	closes #5574	2017-04-06 17:57:01 -04:00
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04:00
Ben Lubar	7f713ee822	Admin option to allow all users to view votes (#5534) ... * Admin option to allow all users to view votes * Fix </strong></strong>	2017-03-17 14:08:47 -04:00
Julian Lam	860999fa6c	Merge remote-tracking branch 'origin/master' into develop	2017-03-10 15:44:29 -05:00
psychobunny	62f445ad7f	ACP: added tagsinput to other fields that are "comma separated"	2017-03-10 14:36:35 -05:00
psychobunny	debe34b96c	better styling for tagsinput in ACP and added it to general -> keywords	2017-03-10 14:25:37 -05: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	8da8e4d8c3	closes #5469	2017-03-09 16:50:26 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
psychobunny	2ccf60a6ec	fixed duplicate uninstall button	2017-03-01 13:49:55 -05:00
Julian Lam	58cbf44143	Merge branch 'master' into develop	2017-02-27 10:05:20 -05:00
Peter Jaszkowiak	007051c14c	Fix #5476	2017-02-25 19:51:49 -07:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
pichalite	1d5b3cc73f	ACP manage tags page UI changes	2017-02-23 20:45:05 +00:00
Julian Lam	a9f144230e	Merge branch 'master' into develop	2017-02-23 13:57:46 -05:00
psychobunny	7b7565ee8e	Merge pull request #5468 from pichalite/acp-groups ... ACP manage groups UI updates	2017-02-23 13:22:57 -05:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
pichalite	aea40902b0	Fix markup in category privileges template	2017-02-23 00:28:54 +00:00
pichalite	f09f1f6ed8	Fix ACP templates markup	2017-02-23 00:20:42 +00:00
pichalite	dcb0f18422	ACP manage groups UI updates	2017-02-22 20:28:56 +00:00
Peter Jaszkowiak	9f15008247	Address review issues	2017-02-17 11:19:30 -07:00
Peter Jaszkowiak	c75391f9f5	Sound system improvements ... - Fix sound ACP uploads - Display soundpack names with sound files - Soundpacks can have sounds with identical names - Link sounds during build step - Generate map of sound name to file name during build step - Change how soundpacks work. It's now done via a field in plugin.json	2017-02-16 22:58:15 -07:00
psychobunny	0667870286	set an active state for pageview options	2017-02-13 15:50:12 -05:00
psychobunny	3d1425605a	prettification of pageview stats	2017-02-13 15:40:20 -05:00
psychobunny	5e35170805	ghfw :rage1:	2017-02-13 15:28:56 -05:00
psychobunny	9e354a09d1	prettier stats on dashboard	2017-02-13 15:28:26 -05:00
barisusakli	387110fecc	closes #5315	2017-02-08 18:23:34 +03:00
Julian Lam	8a0a74d95e	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 16:03:54 -05:00
Julian Lam	b5daedb7a3	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 15:45:21 -05:00
Peter Jaszkowiak	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07:00
pichalite	6a073277ac	Fix ACP layout on tablets	2017-02-03 22:12:47 +00:00
Peter Jaszkowiak	360a35d0a6	Resolve merge conflicts	2017-02-02 22:15:26 -07:00
Stephan	374bc04cdb	fixed missing translation string	2017-01-23 04:06:01 +01:00
Julian Lam	48909e753c	Merge branch 'master' into develop	2017-01-17 10:46:14 -05:00
Dominic Lennon	3507e4ce0e	Adding closing <p>	2017-01-16 09:33:33 +00:00
Dominic Lennon	a06e39528f	Code review change	2017-01-16 08:48:53 +00:00
Peter Jaszkowiak	05b68391dd	Use /assets for client assets ... - Route `/assets` -> `build/public`, falling back on `public` - Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public` - r.js modules previously routed through express are now symlinked into `public/build/src/modules` - minfiles no longer served from a memory cache - use config `views_dir` setting everywhere template directory is used - fix cache buster `v=v=`	2017-01-14 22:38:40 -07:00
Dominic Lennon	ed19454eca	Adding more specific timing for session timings	2017-01-11 10:51:41 +00:00
Julian Lam	05fdd35818	removed menu item for flags management in ACP	2016-12-27 15:33:55 -05:00
Julian Lam	db20df0110	Merge branch 'master' into develop	2016-12-27 15:26:59 -05:00
barisusakli	476ec6e4ee	closes #5307	2016-12-22 20:33:08 +03:00
Julian Lam	29c7ae7645	Merge remote-tracking branch 'origin/master' into develop	2016-12-22 09:21:32 -05:00