|  Spen | ced7a59555 | fix new ui archive and link frontend | 2013-11-05 11:27:35 +08:00 | 
				
					
						|  Spen | f85354c2b6 | fix  new ui link and archive frontend and widget index | 2013-10-04 11:51:36 +08:00 | 
				
					
						|  chris | 911cfdc980 | Move js into a file for status in form | 2013-09-11 18:38:56 +08:00 | 
				
					
						|  saurabhbhatia | 7216676c40 | Updated Sidebar and Preferences | 2013-09-09 10:18:14 +08:00 | 
				
					
						|  saurabhbhatia | b970ea1e0e | Updated Authorization for member, link, tag, archive | 2013-08-27 10:14:39 +08:00 | 
				
					
						|  chris | b3cdffb59e | Fix typo | 2013-07-27 15:57:14 +08:00 | 
				
					
						|  chris | fd432f30ba | Fix cktext_area and removing of files and links | 2013-07-27 15:50:34 +08:00 | 
				
					
						|  chris | 1dc7884ec0 | Changes for default index: - remove approvable and filterable
 - add display_option
 - change params
Update web link and gallery index | 2013-07-25 11:32:25 +08:00 | 
				
					
						|  chris | 0d0f85e7ad | Fix tooltip in form Change form_file | 2013-07-22 20:54:40 +08:00 | 
				
					
						|  Spen | 5d3bc07488 | archive and web_resouce for new ui Conflicts:
	app/assets/stylesheets/lib/main-forms.css | 2013-07-22 18:14:33 +08:00 | 
				
					
						|  chris | 856898016b | New UI changes(tags, categories, authorisations, module index…) To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) | 2013-07-02 16:46:44 +08:00 | 
				
					
						|  Spen | 07b3857465 | archive app Category Authorization fix | 2013-06-26 17:44:31 +08:00 | 
				
					
						|  Spen | 8751b15385 | archive app add Module Authorization & Category Authorization | 2013-06-26 15:35:35 +08:00 | 
				
					
						|  iCross | e48a1ffece | archive module: add sort to frontend module Conflicts:
	vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb | 2013-06-14 15:25:49 +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 | 
				
					
						|  chris | 253cca06cc | New widget for tag cloud | 2013-06-06 17:17:45 +08:00 | 
				
					
						|  Matt K. Fu | 30824d1620 | add search to archive | 2013-06-05 18:03:09 +08:00 | 
				
					
						|  chris | 127ab3845c | Changes for queries | 2013-05-03 12:12:19 +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 | 
				
					
						|  Spen | 536f0d30af | apps_translate_fix | 2013-04-23 11:09:20 +08:00 | 
				
					
						|  chris | ec1605358b | Fix sorting for archive | 2013-03-27 06:30:22 +08:00 | 
				
					
						|  chris | 41311c74d0 | Spen's changes in archive | 2013-03-21 14:38:04 +08:00 | 
				
					
						|  chris | 031cf927d5 | Sort archive by top and creation date | 2013-03-20 17:22:40 +08:00 | 
				
					
						|  chris | e71b002438 | Fix archive front end query for multiple categories | 2013-03-20 15:37:34 +08:00 | 
				
					
						|  chris | 90f08c96fc | Fix merge error: add missing delete route | 2013-03-20 02:11:29 +08:00 | 
				
					
						|  Rueshyna | 6abf53f34d | change page number of archive | 2013-03-19 23:43:28 +08:00 | 
				
					
						|  Rueshyna | 4e151690e9 | fixed archive bug, make it have page and category | 2013-03-19 23:42:39 +08:00 | 
				
					
						|  chris | f29ad27b56 | Fix pagination in archive back end | 2013-03-18 21:53:31 +08:00 | 
				
					
						|  chris | 2427bc5b69 | Update CSS for archive and put the call in widget index | 2013-03-13 17:21:39 +08:00 | 
				
					
						|  chris | b864cc0268 | Changes in I18n (except personal_conference and personal_journal) | 2013-03-12 18:13:48 +08:00 | 
				
					
						|  Spen | d7d480ac12 | archive edit & plugins edit | 2013-03-07 21:12:31 +08:00 | 
				
					
						|  Fu Matthew | 15b9839b76 | fix archive category fix page adding failed | 2013-03-04 14:40:29 +08:00 | 
				
					
						|  chris | 680d7908b9 | member plugin init edit | 2013-02-21 17:53:08 +08:00 | 
				
					
						|  unknown | f59da3ce81 | member plugin init edit | 2013-02-20 18:05:09 +08:00 | 
				
					
						|  unknown | bc44d38948 | member plugin edit | 2013-02-20 17:25:20 +08:00 | 
				
					
						|  chris | bc21840262 | Comment out delete link for archive category Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100 | 2013-02-19 17:49:20 +08:00 | 
				
					
						|  chris | 236f68ba84 | Fix archive module back end pagination and front end html | 2013-02-19 17:39:43 +08:00 | 
				
					
						|  Fu Matthew | 0a115906f1 | fix i18n,reload problems | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  Fu Matthew | b7d797f9dd | fix member sidebar add i18n for modules and default_widgets | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  Fu Matthew | a6f6dc271c | fix i18n,reload problems | 2013-02-18 15:13:31 +08:00 | 
				
					
						|  Fu Matthew | 29bb92f841 | fix member sidebar add i18n for modules and default_widgets | 2013-02-06 17:44:38 +08:00 | 
				
					
						|  unknown | 0b18cf48e3 | member roles edit | 2013-02-04 18:01:03 +08:00 | 
				
					
						|  Fu Matthew | 71d5abae2e | first version of app config and modified inits. | 2013-01-29 20:33:40 +08:00 | 
				
					
						|  Fu Matthew | bfaa22052f | Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb | 2013-01-24 16:30:02 +08:00 | 
				
					
						|  unknown | 781a0ad96e | member roles edit | 2013-01-18 11:25:11 +08:00 | 
				
					
						|  chris | de39bce4ce | Fix the tooltips | 2013-01-11 12:13:16 +08:00 | 
				
					
						|  chris | 41dff814fb | Change icons | 2013-01-09 21:17:50 +08:00 |