developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
500 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

60 Commits

Author SHA1 Message Date
Christophe Vilayphiou 436c866a6f admin now can post without fact check 2012-03-27 15:10:29 +08:00
Christophe Vilayphiou 422a49f56c Ray's changes in announcenment back-end 2012-03-27 15:03:00 +08:00
Christophe Vilayphiou 662c8c7a8a fix with what ray needs for the fact_check form 2012-03-23 12:00:48 +08:00
Christophe Vilayphiou bb14a7736f Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check 2012-03-22 20:04:42 +08:00
Matt Fu 34a4e47057 Fact check program completed,Lin checked 2012-03-22 14:33:59 +08:00
Christophe Vilayphiou 0e8f8b3424 Add missing category when redirect to front-end for bulletin back-end index 2012-03-21 12:58:13 +08:00
Christophe Vilayphiou 3aa7c5120d Put tinymce in its own js file. 
To use on a text area just add the class "tinymce_textarea".
 2012-03-21 12:41:32 +08:00
Christophe Vilayphiou 5d7202af8b Modify bulletin back-end index to show announcement in front-end 2012-03-21 12:37:52 +08:00
Christophe Vilayphiou c4d541d3b9 Remove code from back_end/bulletins/show 2012-03-21 12:36:52 +08:00
Matt Fu 6700114955 after merge 2012-03-19 10:55:58 +08:00
Matt Fu 9c8b0235b0 add new files 2012-03-19 10:55:58 +08:00
unknown a755eb184b fix announcement links & files 2012-03-16 16:49:25 +08:00
unknown 7d553acaec fix announcement link & files 2012-03-16 15:53:57 +08:00
Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
 2012-03-16 14:55:21 +08:00
unknown 6f6e84b015 fix dashboard & announcement 2012-03-16 14:44:57 +08:00
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
unknown 00ab773942 fix dashboard & announcement 2012-03-14 20:05:03 +08:00
Christophe Vilayphiou 79c8b3861b Fix link in widget 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 4dd9b7ffa4 Fix announcement pagination in front-end 2012-03-07 18:16:59 +08:00
Matt Fu cceb785a8d change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Matthew Kaito Juyuan Fu 3bcd7ea349 Exp with object_auth 2012-02-29 18:50:23 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu 438dc0ad3d i18n vars for announcement 2012-02-29 11:54:48 +08:00
Matt Fu b83a783a26 Add translation files for Announcement 2012-02-29 11:12:34 +08:00
Christophe Vilayphiou 7f9a7edc98 Changes in bulletins widget and front-end, add categories to link 2012-02-28 04:24:09 +08:00
Christophe Vilayphiou fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
 2012-02-27 18:56:15 +08:00
Christophe Vilayphiou 0029ef2b5a Fix bug due to image_filename -> image_identifier 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou 70b4c83cf5 Fix bugs and changes for nccu 2012-02-24 19:11:51 +08:00
Christophe Vilayphiou f4d663c67d Temporary changes for announcement form 2012-02-24 15:35:21 +08:00
Christophe Vilayphiou dcc64a20d2 Finish sorting for announcements 2012-02-24 15:30:49 +08:00
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 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
unknown 5da75161c4 announcemenet & web_resource widget 2012-02-16 17:52:49 +08:00
unknown edf236c1c7 edit tags 2012-02-15 15:38:27 +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