developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,577 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

2577 Commits

Author SHA1 Message Date
unknown 04d6fb8785 member roles edit 2013-01-18 11:09:38 +08:00
unknown 90c6c88f2f Merge branch 'member_plugin' of https://github.com/Rulingcom/orbit into member_plugin 2013-01-18 10:39:29 +08:00
unknown 2e4fb361d7 member roles edit 2013-01-18 10:37:55 +08:00
chris 1f944d23cd Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop 2013-01-16 01:35:57 +08:00
Rueshyna dca4f5d0be mv gallery_uploader 2013-01-16 01:35:38 +08:00
Rueshyna c44b4163e4 gprs byebye, location have two language, must have picture, long, lang have limit 2013-01-16 01:35:38 +08:00
Rueshyna 59b618ec35 mv gallery_uploader 2013-01-15 18:43:13 +08:00
Rueshyna ae25bdf028 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop 
* 'desktop' of https://github.com/Rulingcom/orbit:
  correct personal journal language, but now hava no language config
 2013-01-15 17:55:14 +08:00
Rueshyna f1b6771b34 gprs byebye, location have two language, must have picture, long, lang have limit 2013-01-15 17:47:00 +08:00
Fu Matthew 91afad23ba Merge branch 'new_widget_setting_interface' 2013-01-15 12:03:56 +08:00
Fu Matthew ba75c02622 fix wrong behavior of new interface when a new page is newed 2013-01-15 12:02:13 +08:00
Fu Matthew 8413e31048 add i18n 2013-01-15 10:25:55 +08:00
chris 634f647afa Set the version of mongo_session_store-rails3 to 3.0.6 2013-01-14 19:20:58 +08:00
chris ee529723ad Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface 2013-01-14 19:18:50 +08:00
Fu Matthew e1e003af6e Complete new interface 2013-01-14 19:18:25 +08:00
Fu Matthew 16cfd27fe9 apply view 2013-01-14 19:18:25 +08:00
chris 664ca35801 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin 2013-01-14 19:00:35 +08:00
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
Fu Matthew 46b1d55ff6 Complete new interface 2013-01-14 18:49:23 +08:00
unknown 6a5c1d9007 member role edit 2013-01-14 18:19:14 +08:00
chris f589439870 Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop 
Conflicts:
	config/routes.rb
 2013-01-14 18:06:56 +08:00
Rueshyna da283e136b correct personal journal language, but now hava no language config 2013-01-14 17:54:53 +08:00
Rueshyna 1b6bfdb80f modularize personal journal and pull relational setting in desktop/index.rb 2013-01-14 17:54:52 +08:00
Rueshyna 68e14a7898 move js file to relational module but have js require problem 2013-01-14 17:54:52 +08:00
Rueshyna 919f951981 restore js,journal_pages.js, 2013-01-14 17:54:52 +08:00
Rueshyna a183ac6041 fixed journal type page 2013-01-14 17:54:52 +08:00
Rueshyna bf31d0c3dd modularized personal journal 2013-01-14 17:54:52 +08:00
Rueshyna 758cab5ecd move journal code to persional_journal modulaar 2013-01-14 17:53:59 +08:00
Rueshyna 284bf34fec amend file value to correct format 2013-01-14 17:53:59 +08:00
chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back 
Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
 2013-01-14 17:46:27 +08:00
chris 141eb7e723 Add mobile but remove news in it 2013-01-14 17:38:44 +08:00
chris 03c8d42138 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin 2013-01-14 17:04:06 +08:00
chris 54d098baf2 Change translation 2013-01-14 17:02:51 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
chris 4e2cbac027 Remove bottom padding if no footer in mobile 
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
 2013-01-11 19:14:48 +08:00
chris 91d1487a04 Fix mobile banner, icons, announcement css 2013-01-11 18:34:20 +08:00
chris d00192f018 Fix for mobile icon and iphone5 fullscreen 2013-01-11 17:00:09 +08:00
Rueshyna c224d04a70 correct personal journal language, but now hava no language config 2013-01-11 16:11:46 +08:00
chris 5a4f681cfc Fix the tooltips overflow 2013-01-11 12:24:50 +08:00
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
chris b90e8efb1f Fix filter not collapsing 
Fix icon size for button
 2013-01-11 11:37:11 +08:00
chris a7d1cdbb75 Fix for link in ad banner 2013-01-11 11:28:13 +08:00
Rueshyna c888d9cae4 modularize personal journal and pull relational setting in desktop/index.rb 2013-01-11 10:55:19 +08:00
Fu Matthew 92f3be3200 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2013-01-10 18:18:02 +08:00
Fu Matthew b950ad64c0 fix for fronted editing not responding for announcement. 2013-01-10 18:17:27 +08:00
Fu Matthew ca51ebc08c apply view 2013-01-10 18:00:58 +08:00
chris e24f7a7880 Put back some field so ad_image can work 2013-01-10 11:08:57 +08:00
Rueshyna 08adb887c5 change *default* to *defulat* 2013-01-10 09:40:52 +08:00
chris c36f3152f5 Changes in css for structure icon and sidebar padding 2013-01-09 21:35:54 +08:00
chris 1c1839fc00 Remove useless code in de_image.rb 2013-01-09 21:17:50 +08:00