1d405c3ffe 
								
							 
						 
						
							
							
								
								Add "tag" icon to orbit bar  
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
				
					
						
							
							
								 
						
							
								5ab4bbd367 
								
							 
						 
						
							
							
								
								add ad_banner inner page,pic title.  
							
							
							
						 
						
							2013-01-09 16:54:33 +08:00  
				
					
						
							
							
								 
						
							
								fac4faad6c 
								
							 
						 
						
							
							
								
								Change date picker  
							
							
							
						 
						
							2013-01-09 05:18:16 +08:00  
				
					
						
							
							
								 
						
							
								e3d34263e3 
								
							 
						 
						
							
							
								
								Schedule job for tag_cloud  
							
							
							
						 
						
							2013-01-08 12:36:50 +08:00  
				
					
						
							
							
								 
						
							
								a34da20e48 
								
							 
						 
						
							
							
								
								Merge branch 'master' into desktop  
							
							... 
							
							
							
							* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ... 
							
						 
						
							2013-01-07 16:44:05 +08:00  
				
					
						
							
							
								 
						
							
								4ee683aa9b 
								
							 
						 
						
							
							
								
								fixed desktop route  
							
							
							
						 
						
							2013-01-07 16:38:02 +08:00  
				
					
						
							
							
								 
						
							
								83935aaa60 
								
							 
						 
						
							
							
								
								Add translations  
							
							
							
						 
						
							2013-01-07 10:42:17 +08:00  
				
					
						
							
							
								 
						
							
								6c6bda988d 
								
							 
						 
						
							
							
								
								Add mobile version in site settings  
							
							
							
						 
						
							2013-01-07 03:57:36 +08:00  
				
					
						
							
							
								 
						
							
								37740adb24 
								
							 
						 
						
							
							
								
								Add mobile but remove news in it  
							
							
							
						 
						
							2013-01-07 03:03:38 +08:00  
				
					
						
							
							
								 
						
							
								9745bcf7f1 
								
							 
						 
						
							
							
								
								Remove mysql  
							
							
							
						 
						
							2013-01-07 03:02:16 +08:00  
				
					
						
							
							
								 
						
							
								a70110f787 
								
							 
						 
						
							
							
								
								make default widget works without init  
							
							
							
						 
						
							2013-01-03 19:38:14 +08:00  
				
					
						
							
							
								 
						
							
								cb3a9ea98b 
								
							 
						 
						
							
							
								
								change sub_menu to header in site setting  
							
							
							
						 
						
							2013-01-03 14:46:02 +08:00  
				
					
						
							
							
								 
						
							
								ec96a2e0e7 
								
							 
						 
						
							
							
								
								Add page counter  
							
							
							
						 
						
							2012-12-28 10:36:18 +08:00  
				
					
						
							
							
								 
						
							
								0655baab19 
								
							 
						 
						
							
							
								
								make longer devise timeout  
							
							
							
						 
						
							2012-12-27 15:05:53 +08:00  
				
					
						
							
							
								 
						
							
								fcbba6660b 
								
							 
						 
						
							
							
								
								Only one parser for front end  
							
							... 
							
							
							
							Separate site map for i18n 
							
						 
						
							2012-12-19 17:15:31 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9dde79414d 
								
							 
						 
						
							
							
								
								all sections and sections megerd  
							
							
							
						 
						
							2012-12-07 12:38:23 +08:00  
				
					
						
							
							
								 
						
							
								ff435a4af4 
								
							 
						 
						
							
							
								
								Change the design for the whole site form designs index  
							
							
							
						 
						
							2012-12-07 12:14:31 +08:00  
				
					
						
							
							
								 
						
							
								6f1748d2b3 
								
							 
						 
						
							
							
								
								- template list/show is loaded from central server  
							
							... 
							
							
							
							- buy a template downloads and creates it in DB
- changes in designs index 
							
						 
						
							2012-12-06 23:20:27 +08:00  
				
					
						
							
							
								 
						
							
								0c2d922996 
								
							 
						 
						
							
							
								
								Add path for i18n  
							
							
							
						 
						
							2012-12-06 17:27:36 +08:00  
				
					
						
							
							
								 
						
							
								4ae7ac8388 
								
							 
						 
						
							
							
								
								clean route table about desktop  
							
							
							
						 
						
							2012-12-06 07:59:42 +08:00  
				
					
						
							
							
								 
						
							
								2983b181e6 
								
							 
						 
						
							
							
								
								Fix some translations  
							
							
							
						 
						
							2012-12-04 01:03:28 +08:00  
				
					
						
							
							
								 
						
							
								7822ffc33d 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								5986817e16 
								
							 
						 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								8a7ae3f061 
								
							 
						 
						
							
							
								
								correct user passwd and sent json to front-end  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								e2da22b29c 
								
							 
						 
						
							
							
								
								Clean translations  
							
							
							
						 
						
							2012-12-04 00:17:12 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
				
					
						
							
							
								 
						
							
								036d7bbb0e 
								
							 
						 
						
							
							
								
								Module store  
							
							
							
						 
						
							2012-11-29 02:02:37 +08:00  
				
					
						
							
							
								 
						
							
								06335f9bd1 
								
							 
						 
						
							
							
								
								Joshua's html  
							
							
							
						 
						
							2012-11-29 00:59:46 +08:00  
				
					
						
							
							
								 
						
							
								730c29bf49 
								
							 
						 
						
							
							
								
								change layout  
							
							
							
						 
						
							2012-11-28 14:28:41 +08:00  
				
					
						
							
							
								 
						
							
								5e04ec70a3 
								
							 
						 
						
							
							
								
								make a 'real' fake data  
							
							
							
						 
						
							2012-11-26 11:52:11 +08:00  
				
					
						
							
							
								 
						
							
								8a79d7ff2e 
								
							 
						 
						
							
							
								
								member selects  
							
							
							
						 
						
							2012-11-26 10:25:34 +08:00  
				
					
						
							
							
								 
						
							
								1e89c30150 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP  
							
							
							
						 
						
							2012-11-26 05:02:58 +08:00  
				
					
						
							
							
								 
						
							
								996a69f595 
								
							 
						 
						
							
							
								
								add co-author json  
							
							
							
						 
						
							2012-11-23 10:44:48 +08:00  
				
					
						
							
							
								 
						
							
								5b39d10ac6 
								
							 
						 
						
							
							
								
								user roles starts  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								868d1c2201 
								
							 
						 
						
							
							
								
								fix for json and some other bugs  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								645f25d446 
								
							 
						 
						
							
							
								
								make fake data  
							
							
							
						 
						
							2012-11-22 16:34:20 +08:00  
				
					
						
							
							
								 
						
							
								73e76f2477 
								
							 
						 
						
							
							
								
								routes fixed  
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
				
					
						
							
							
								 
						
							
								6a9426c9c8 
								
							 
						 
						
							
							
								
								add co-author page and new it, but can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								1279af0c11 
								
							 
						 
						
							
							
								
								fix and hide for visitors,except for album  
							
							
							
						 
						
							2012-11-21 18:31:57 +08:00  
				
					
						
							
							
								 
						
							
								d7599f1ccf 
								
							 
						 
						
							
							
								
								add edit function  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								5eb8cc4063 
								
							 
						 
						
							
							
								
								finished some method of list and journal  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								c1da80761e 
								
							 
						 
						
							
							
								
								Remove wrong mongo port  
							
							
							
						 
						
							2012-11-20 12:04:34 +08:00  
				
					
						
							
							
								 
						
							
								192e52b5de 
								
							 
						 
						
							
							
								
								Remove middle site  
							
							
							
						 
						
							2012-11-20 10:06:07 +08:00  
				
					
						
							
							
								 
						
							
								a85e5fcc0d 
								
							 
						 
						
							
							
								
								address field. js and style is broken  
							
							
							
						 
						
							2012-11-20 09:53:36 +08:00  
				
					
						
							
							
								 
						
							
								be448d42c9 
								
							 
						 
						
							
							
								
								add_more ok  
							
							
							
						 
						
							2012-11-20 09:52:50 +08:00  
				
					
						
							
							
								 
						
							
								a56d80698f 
								
							 
						 
						
							
							
								
								desktop api update..  
							
							
							
						 
						
							2012-11-12 15:11:36 +08:00  
				
					
						
							
							
								 
						
							
								43d969a72b 
								
							 
						 
						
							
							
								
								Fix attribute_field_helper and comment admin in I18n  
							
							
							
						 
						
							2012-11-06 17:51:42 +08:00  
				
					
						
							
							
								 
						
							
								b40d4702d5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into various_bugs  
							
							... 
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 
						
							2012-11-06 11:44:00 +08:00  
				
					
						
							
							
								 
						
							
								da5e7f670e 
								
							 
						 
						
							
							
								
								Desktop Widgtes updates..  
							
							
							
						 
						
							2012-11-06 10:36:34 +08:00