402 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sacha Greif	e871171769	fixed conflicts	2012-11-21 13:34:08 +09:00
Sacha Greif	92c57121ed	userLoaded -> userId	2012-11-21 13:32:58 +09:00
Tom Coleman	8641d52674	Moved canEdit logic into the router too.	2012-11-21 15:28:29 +11:00
Tom Coleman	628001eb50	Some more small fixes.	2012-11-21 15:15:30 +11:00
Tom Coleman	91c7da215c	Updated to latest router.	2012-11-21 14:56:17 +11:00
Tom Coleman	22ff9bcb2b	whoops	2012-11-21 14:32:21 +11:00
Tom Coleman	72d8115b1b	New router is working, to some degree. ... I switched over to router 2.0, and refactored the permissions a bit. There's still a bit of work needed to get the permissions fully up to speed.	2012-11-21 14:28:18 +11:00
SachaG	d2dcaf23bc	Merge pull request #31 from lyudmil/master ... Towards generic forms	2012-11-20 16:20:50 -08:00
Lyudmil Angelov	1d2422b3b3	Merge main line.	2012-11-20 16:00:27 +01:00
Lyudmil Angelov	c346015912	Refactor settings view code to apply correct naming conventions and use the compact helper syntax.	2012-11-20 15:52:27 +01:00
Lyudmil Angelov	5638fcc37e	Extract a generic Model class and refactor Setting to extend from it. Refactor ModelForm and settings code in accordance with changes.	2012-11-20 15:27:46 +01:00
Sacha Greif	57408db781	fixed notifications	2012-11-19 15:41:44 +09:00
Sacha Greif	3c6f20c679	reworking permissions system	2012-11-19 12:03:06 +09:00
Sacha Greif	758675f66c	do the same for comment, comment_reply, and comment_edit	2012-11-19 11:26:21 +09:00
Sacha Greif	a895c7114a	make router wait until subscription is ready for post and post_edit	2012-11-19 11:23:44 +09:00
Sacha Greif	5189251533	can now set post time	2012-11-19 11:03:15 +09:00
Sacha Greif	c27fb6b257	tweaking settings options	2012-11-18 09:04:32 +09:00
Sacha Greif	0b224f1ab2	moved json form data to settings form controller	2012-11-18 08:48:24 +09:00
Sacha Greif	64530543b7	refactoring settings form code and removing redudant libraries	2012-11-18 08:46:50 +09:00
Sacha Greif	db55645887	fixed conflicts	2012-11-17 13:24:19 +09:00
Lyudmil Angelov	6dd6651358	Complete the move of jsonform library files. The deletions were not ocmmitted the first time.	2012-11-13 22:14:06 +01:00
Lyudmil Angelov	bcb9ffdf9e	Refactor code to make it more readable. Move form options into a separate file.	2012-11-13 22:13:11 +01:00
Lyudmil Angelov	6a6486f698	Add handlers for updating and creating when submitting a ModelForm.	2012-11-13 21:09:22 +01:00
Lyudmil Angelov	81fab293d2	Move form submission logic into the form object.	2012-11-13 20:56:00 +01:00
Lyudmil Angelov	f7a12d29b6	Remove old form and use generated one.	2012-11-13 19:53:29 +01:00
Lyudmil Angelov	f5dc35e8b2	Make form submission work by convention instead of manually looking up input values.	2012-11-13 18:30:57 +01:00
Lyudmil Angelov	3e77059b34	Add correct default values to generated forms.	2012-11-13 18:07:31 +01:00
Lyudmil Angelov	f968a24efa	Make generated form look like old form.	2012-11-13 16:56:08 +01:00
Lyudmil Angelov	c6ec235c1e	Generate default form and allow user to overwrite options.	2012-11-13 15:54:52 +01:00
Lyudmil Angelov	43968f66d5	Set up jsonform and prepare to generate the settings form.	2012-11-13 13:14:50 +01:00
Sacha Greif	552441cde5	router spark bug thing	2012-11-02 13:34:32 +09:00
Sacha Greif	7a92ebbc15	working on bug	2012-11-02 13:16:24 +09:00
Sacha Greif	bd1960e7fe	bugfix	2012-11-01 10:27:34 +09:00
Sacha Greif	041023866c	cleaned up settings page	2012-10-30 17:02:53 +09:00
Sacha Greif	e885681c65	bugfix	2012-10-30 13:35:12 +09:00
Sacha Greif	fa3942fbd8	fix subscription bug; let admin add a post with a specific status	2012-10-30 13:33:52 +09:00
Sacha Greif	401f0bad1d	now checking for duplicate links and limiting to 30 posts per 24 hours	2012-10-30 12:01:11 +09:00
Sacha Greif	2601ecb048	make sure status is an int and not a string	2012-10-24 16:48:30 +09:00
Sacha Greif	8df2f53a35	added pending posts	2012-10-24 11:04:42 +09:00
Sacha Greif	7463d46f29	added email package	2012-10-23 14:33:27 +09:00
Sacha Greif	7afaee4e80	admin now able to change user and date	2012-10-23 12:24:38 +09:00
Sacha Greif	5628b1e298	use absolute value for limitRate	2012-10-22 20:32:34 +09:00
Sacha Greif	502b6fa676	fix date	2012-10-22 14:05:49 +09:00
Sacha Greif	1685afa2f5	made score update interval a settings	2012-10-22 14:00:47 +09:00
Sacha Greif	b454f59d53	added icons for left and right arrows	2012-10-22 09:45:26 +09:00
Sacha Greif	fc855e5fc8	added keyboard nav for digest	2012-10-22 09:28:42 +09:00
Sacha Greif	9aa75df069	Merge branch 'master' of github.com:SachaG/Telescope	2012-10-21 12:07:50 +09:00
Sacha Greif	fba0375f7a	git fetch merge test	2012-10-21 12:07:24 +09:00
Julien Chaumond	bbafe9a840	Update README.md	2012-10-19 13:39:11 +03:00
Sacha Greif	a886b00123	refactored part of the app to be clearer	2012-10-19 19:20:14 +09:00