37 Commits

Author	SHA1	Message	Date
Christophe Vilayphiou	f8d1d7242d	Merge branch 'design_team' into dashboard	2012-02-23 16:05:33 +08:00
Christophe Vilayphiou	1a6e497b3d	Ika's changes	2012-02-23 15:53:15 +08:00
Christophe Vilayphiou	63d7810b35	Add isotope, categories for announcement page, sort for announcement	2012-02-23 15:52:58 +08:00
Christophe Vilayphiou	53ed4b0404	Initial changes in announcement for sorting and filtering	2012-02-23 15:51:33 +08:00
Christophe Vilayphiou	ba4d71a026	Changes in orbit_bar and js in announcements	2012-02-23 15:51:33 +08:00
Christophe Vilayphiou	48d94d5e15	Fix bug widget when no bulletins or web_links, put link in bulletins	2012-02-23 15:50:30 +08:00
Christophe Vilayphiou	ad27537cf7	Change pagination in bulletins	2012-02-23 15:50:30 +08:00
unknown	b0834c0c62	Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev ... Conflicts: app/views/layouts/module_widget.html.erb	2012-02-20 16:25:29 +08:00
unknown	e82fd405c9	remove bulletins_list	2012-02-20 16:23:54 +08:00
Christophe Vilayphiou	1146506063	Fix bug when no bulletins or web_links	2012-02-20 15:56:17 +08:00
Christophe Vilayphiou	cf038183b9	Ika's changes in modules	2012-02-20 08:48:27 +08:00
Christophe Vilayphiou	7d57b50e46	Widget for announcement and web_link with ajax reload and pagination	2012-02-20 08:34:36 +08:00
unknown	78a139ff38	update announcement & web_resource widget	2012-02-20 03:24:47 +08:00
Christophe Vilayphiou	a3f152b200	Changes for jquery 1.7 (.live -> .on), create module_layout	2012-02-20 03:24:05 +08:00
unknown	5da75161c4	announcemenet & web_resource widget	2012-02-16 17:52:49 +08:00
Christophe Vilayphiou	e0accbecaa	Changes into page_part edition. ... Can choose between 'text', 'public_r_tag' and 'widget'	2012-02-16 13:09:09 +08:00
unknown	edf236c1c7	edit tags	2012-02-15 15:38:27 +08:00
Christophe Vilayphiou	af3a2547e1	Change ModuleAppTag into "Module name"Tag.	2012-02-15 15:18:11 +08:00
Christophe Vilayphiou	d0c2856a3a	Fix relations error in tags	2012-02-15 11:42:19 +08:00
unknown	778a85ca2b	add tags	2012-02-15 10:37:07 +08:00
Christophe Vilayphiou	1913f0aca8	Add tinymce	2012-02-15 10:02:05 +08:00
Christophe Vilayphiou	3e70634add	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
Christophe Vilayphiou	f57e9f19f7	Changes for multiple i18n_variable in bulletin	2012-02-15 00:34:22 +08:00
Christophe Vilayphiou	55ae7de01c	Orbit-bar in front-end and back-end, side-bar and drop-down menu	2012-02-15 00:34:22 +08:00
unknown	70c97bc065	edit announcement widget	2012-02-13 17:09:38 +08:00
Christophe Vilayphiou	088bbe1853	Change announcement route	2012-02-13 17:09:37 +08:00
unknown	964d7b6054	announcement path error	2012-02-13 17:09:37 +08:00
Christophe Vilayphiou	8f885e8bb7	Use key not title for module_app in parser. ... Modify announcement routes.	2012-02-06 16:58:19 +08:00
unknown	f097f83f2b	announcement_category edit	2012-02-06 16:20:51 +08:00
Matthew Fu	3287b68354	Basic function for ad_banner	2012-02-01 14:27:51 +08:00
Christophe Vilayphiou	762c2f5e8a	Add key in module_app.rb to use instead of title for authorization	2012-01-30 18:12:18 +08:00
unknown	68ad208777	announcement widget page	2012-01-20 16:36:25 +08:00
unknown	2c8940e350	announcement widget page	2012-01-20 14:04:52 +08:00
unknown	4cfae9c107	announcement widget query	2012-01-18 21:34:26 +08:00
unknown	7e7fc69a37	add announcemet search & set top	2012-01-13 19:15:03 +08:00
unknown	4b838b5ef5	edit announcement upload & show	2012-01-12 18:38:50 +08:00
unknown	ec235bcaa3	merge with master	2012-01-11 20:31:52 +08:00