devin chen
|
dc5f24ab22
|
starting new branch ( add rules in .gitignore for SASS cache folder )
|
2013-04-17 14:16:24 +08:00 |
devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +08:00 |
chris
|
dd10b3147c
|
Fix js bug and asset url after merge
|
2013-04-17 14:14:24 +08:00 |
|
devin
|
cae43e8acd
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-04-17 14:14:23 +08:00 |
|
devin
|
c8aa50ee87
|
Lots of Update
1. CSS to SCSS
2. Journal Paper update
Conflicts:
Gemfile.lock
app/assets/javascripts/orbitdesktop.js
app/assets/stylesheets/desktop/desktop-main.css
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
|
2013-04-17 14:14:23 +08:00 |
 Harry Bomrah
|
dae3f069ff
|
app manager changed plus some changes
|
2013-04-17 11:09:56 +08:00 |
|
Harry Bomrah
|
b1d7d5345e
|
section page fixed..
|
2013-04-17 11:08:58 +08:00 |
|
devin
|
0d5ab20efa
|
add browser compatibility page
|
2013-04-17 11:07:45 +08:00 |
Rueshyna
|
625f2e9ad6
|
have done conference author filter, journal haven't been done, yet
|
2013-04-17 11:04:52 +08:00 |
|
devin
|
84dfb44e78
|
tinyscrollbar css minor update
|
2013-04-17 10:56:15 +08:00 |
|
devin
|
db2b371744
|
tinyscrollbar minor update
|
2013-03-05 17:22:53 +08:00 |
|
Harry Bomrah
|
3182f5c9a8
|
merging
|
2013-03-05 11:20:01 +08:00 |
|
devin
|
4e24223c78
|
desktop CSS update
|
2013-03-05 09:39:01 +08:00 |
|
Harry Bomrah
|
b8ee748723
|
Lot of changes in gridster
|
2013-03-04 12:37:29 +08:00 |
|
Rueshyna
|
8f1d7b55ab
|
authors auto-complete
|
2013-03-04 12:16:46 +08:00 |
|
Harry Bomrah
|
e9c0f443b7
|
Lot of changes in gridster
|
2013-02-26 11:47:39 +08:00 |
|
Harry Bomrah
|
edd2c1f522
|
css minor changes.
|
2013-02-25 11:08:57 +08:00 |
|
Harry Bomrah
|
9f362d9ae6
|
gridster, url code fixed, views removed.
|
2013-02-25 11:08:56 +08:00 |
|
chris
|
680d7908b9
|
member plugin init edit
|
2013-02-21 17:53:08 +08:00 |
unknown
|
bc44d38948
|
member plugin edit
|
2013-02-20 17:25:20 +08:00 |
|
chris
|
d19ba7b1c6
|
Change css mobile for 3 columns
|
2013-02-19 18:31:34 +08:00 |
|
chris
|
b1a11b4dad
|
Remove isotope
|
2013-02-04 18:01:42 +08:00 |
|
chris
|
c33a723a2a
|
Fix css bug when precompile
|
2013-02-04 18:01:00 +08:00 |
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 |
|
chris
|
72e26fd92a
|
Fix css bug when precompile
|
2013-01-16 02:37:49 +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 |