Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
devin
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
Harry Bomrah
b8ee748723
Lot of changes in gridster
2013-03-04 12:37:29 +08:00
Rueshyna
ee4b94ace0
Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop
...
* 'desktop' of https://github.com/Rulingcom/orbit :
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
2013-03-04 12:17:14 +08:00
Rueshyna
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
Harry Bomrah
7ef02d3108
Merge branch 'desktop' into desktop_work
2013-02-27 11:51:56 +08:00
Harry Bomrah
912080482b
some changes for gridster
2013-02-27 11:47:41 +08:00
chris
ca946fc881
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
lib/tasks/migrate.rake
2013-02-27 11:03:52 +08:00
Fu Matthew
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
Fu Matthew
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
Fu Matthew
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
Fu Matthew
d7699e1a46
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-27 10:49:51 +08:00
Fu Matthew
0e6599e9b9
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-27 10:49:51 +08:00
Fu Matthew
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
Rueshyna
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
Rueshyna
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
Harry Bomrah
e9c0f443b7
Lot of changes in gridster
2013-02-26 11:47:39 +08:00
Fu Matthew
5f832a17d4
fix widget field reload
2013-02-25 12:49:06 +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
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
Fu Matthew
0be1c45c81
link to more
2013-02-23 18:29:50 +08:00
chris
5b0b8e6c79
Fix bug in widget selection
2013-02-23 17:25:07 +08:00
chris
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
Fu Matthew
73bca03b33
fix default widget link
2013-02-23 15:19:51 +08:00
Fu Matthew
8592015b1b
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-23 15:19:04 +08:00
chris
ad9b91f792
Fix url with id in default widget
2013-02-23 12:20:45 +08:00
Fu Matthew
d6dd38744b
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-23 11:34:47 +08:00
Fu Matthew
9fec7beb47
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
app/controllers/default_widget_controller.rb
lib/tasks/migrate.rake
2013-02-22 17:53:49 +08:00
Fu Matthew
b315215bed
first version of multi categories and tags
2013-02-22 16:32:05 +08:00
chris
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
unknown
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
Rueshyna
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
unknown
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
unknown
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
unknown
a7bc19768e
member list edit
2013-02-20 11:12:08 +08:00
chris
39c6660c67
Remove useless code not removed in merge
...
Fix argument bug in link_to_field
2013-02-19 20:42:46 +08:00
chris
d19ba7b1c6
Change css mobile for 3 columns
2013-02-19 18:31:34 +08:00
chris
a9aa1dd150
Fix for path renaming
2013-02-19 18:09:55 +08:00
chris
9e9620c04a
Fix item looking for widget when no front end
2013-02-19 18:09:54 +08:00
chris
6d1f919bb7
Fix links in default widget
2013-02-19 18:09:50 +08:00