Commit Graph

26 Commits

Author SHA1 Message Date
chris 7c398ce4fe Changes for NTU General Affairs 2013-09-13 15:10:27 +08:00
iCross 5b7ac1a22b archive module: add sort feature to achive files 2013-06-06 22:20:27 +08:00
iCross c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb 2013-06-06 19:20:21 +08:00
Matt K. Fu 30824d1620 add search to archive 2013-06-05 18:03:09 +08:00
chris 167a71272a queries need to be rethink 2013-05-03 12:12:19 +08:00
Matt K. Fu 64101109dd disable all sorted_tags 2013-04-26 18:07:59 +08:00
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
chris 41311c74d0 Spen's changes in archive 2013-03-21 14:38:04 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
chris 236f68ba84 Fix archive module back end pagination and front end html 2013-02-19 17:39:43 +08:00
chris 3c85f3ef00 Make the archive module work (it needs more details) 2012-11-06 10:35:11 +08:00
chris dcdd730a01 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +08:00
unknown bc5235aa9f archive checkbox 2012-08-30 14:49:31 +08:00
unknown c739ab3984 new archive 2012-08-30 14:49:31 +08:00
unknown 8a5519073b new archive 2012-08-30 14:32:32 +08:00
unknown 29bcfa3139 archive checkbox 2012-08-30 14:19:51 +08:00
unknown d5cc9961e3 new archive 2012-08-30 14:14:53 +08:00
unknown 23a3a7eff6 update archive 2012-08-20 17:14:13 +08:00
Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
unknown d8b0613147 archive checkbox 2012-08-10 15:26:34 +08:00
unknown d5cc470e5d new archive 2012-08-10 15:23:56 +08:00
unknown 81fa2a7428 archive checkbox 2012-08-10 15:19:45 +08:00
unknown e8cea9f0ab new archive 2012-08-10 15:14:43 +08:00
unknown cc02ea511c archive checkbox 2012-05-16 01:13:39 +08:00
unknown 4e9bb1b583 new archive 2012-05-16 01:06:26 +08:00