Fu Matthew
|
9630d0a841
|
Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface
|
2013-01-16 14:09:05 +08:00 |
|
Fu Matthew
|
9edf0dca54
|
ika re-redesign module widget
|
2013-01-16 14:07:09 +08:00 |
|
Fu Matthew
|
e1e003af6e
|
Complete new interface
|
2013-01-14 19:18:25 +08:00 |
|
Fu Matthew
|
46b1d55ff6
|
Complete new interface
|
2013-01-14 18:49:23 +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
|
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 |
|
chris
|
5a4f681cfc
|
Fix the tooltips overflow
|
2013-01-11 12:24:50 +08:00 |
|
chris
|
b90e8efb1f
|
Fix filter not collapsing
Fix icon size for button
|
2013-01-11 11:37:11 +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
|
d8f6ebb153
|
Fix icons
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
7434d36e9b
|
Ray's changes for icon size
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
933ac7b8fe
|
Ray's changes for icon css
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
fac4faad6c
|
Change date picker
|
2013-01-09 05:18:16 +08:00 |
|
chris
|
5b13c53ed9
|
Ika's changes in default_widget.css
|
2013-01-08 12:50:28 +08:00 |
|
chris
|
37740adb24
|
Add mobile but remove news in it
|
2013-01-07 03:03:38 +08:00 |
nccu
|
ac6da1340a
|
Ika's fix for width
|
2013-01-04 12:31:12 +08:00 |
|
nccu
|
ea2d38b23b
|
Ika's changes for css default widgets
|
2013-01-04 11:54:58 +08:00 |
|
chris
|
455a27437d
|
Changes for announcement widget style 2
|
2012-12-28 13:47:30 +08:00 |
|
chris
|
e9815c3d9b
|
Fix css bug when precompiling assets
|
2012-12-20 14:34:02 +08:00 |
|
chris
|
7ac6958690
|
Fix css bug when precompiling assets
|
2012-12-20 14:32:06 +08:00 |
|
chris
|
fc076a28bd
|
Remove useless css
|
2012-12-20 13:53:28 +08:00 |
|
chris
|
30268ab3bc
|
Remove useless css
|
2012-12-20 13:52:23 +08:00 |
|
chris
|
3a9106c10d
|
Add mobile but remove news in it
|
2012-12-20 03:21:50 +08:00 |
|
chris
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
devin
|
89e25fe7a2
|
view update
|
2012-12-07 04:21:26 +08:00 |
|
chris
|
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 |
OrbitServer
|
b1f2749000
|
Devin's changes to integrate the store
|
2012-12-06 23:11:23 +08:00 |
|
devin
|
5d76600154
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
756bfa563b
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
22c0eabca5
|
view update
|
2012-12-06 07:59:44 +08:00 |
|
devin
|
59c0cdd761
|
view update
not finish all required pages yet
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
d413f705a4
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
363ccdde4d
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
936101358c
|
journal update
|
2012-12-06 07:59:43 +08:00 |
|
devin
|
d03f5dc1ff
|
view update
|
2012-12-06 07:59:43 +08:00 |
|
chris
|
e68c52bc00
|
Changes for store back-end
|
2012-12-05 13:46:10 +08:00 |
|
chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +08:00 |
|
chris
|
036d7bbb0e
|
Module store
|
2012-11-29 02:02:37 +08:00 |
|
chris
|
06335f9bd1
|
Joshua's html
|
2012-11-29 00:59:46 +08:00 |
|
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
Harry Bomrah
|
9cc518b456
|
autocomplete done
|
2012-11-27 15:55:32 +08:00 |
Matthew K. Fu JuYuan
|
5b39d10ac6
|
user roles starts
|
2012-11-22 21:10:35 +08:00 |
|
Matthew K. Fu JuYuan
|
a85e5fcc0d
|
address field. js and style is broken
|
2012-11-20 09:53:36 +08:00 |
|
chris
|
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 |
|
Matthew K. Fu JuYuan
|
beb843f75b
|
add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
|
2012-11-04 20:42:58 +08:00 |
|
chris
|
cc5e238576
|
Fix after merge from NCCU, the translations still need to be cleaned
|
2012-10-30 11:08:26 +08:00 |