chris
|
72e26fd92a
|
Fix css bug when precompile
|
2013-01-16 02:37:49 +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 |
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
|
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 |
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 |
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
|
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 |
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 |
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 |
chris
|
02e5e52159
|
Translation typo
Remove test values in ad_image form
Remove NeedReset
|
2013-01-09 21:17:50 +08:00 |
chris
|
48ce2278d0
|
Update disable time when separated picker new or reset date
|
2013-01-09 21:17:50 +08:00 |
chris
|
b49251afee
|
Date picker separated: reset time when reset date
|
2013-01-09 21:17:50 +08:00 |
chris
|
1d405c3ffe
|
Add "tag" icon to orbit bar
|
2013-01-09 21:17:50 +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 |
Fu Matthew
|
d0f474c2ab
|
fix wrong i18n
|
2013-01-09 17:13:25 +08:00 |
Fu Matthew
|
5ab4bbd367
|
add ad_banner inner page,pic title.
|
2013-01-09 16:54:33 +08:00 |
chris
|
1d80b39dcb
|
Fix no responding when trying to access front end page
|
2013-01-09 11:23:18 +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
|
e3d34263e3
|
Schedule job for tag_cloud
|
2013-01-08 12:36:50 +08:00 |
chris
|
423e2ac54e
|
Update bootstrap version 2.2.2
|
2013-01-07 17:25:32 +08:00 |
Fu Matthew
|
7594e1b9a6
|
fix member has no module_app
|
2013-01-07 17:20:37 +08:00 |