Commit Graph

3121 Commits

Author SHA1 Message Date
chris dbf93ea9a8 Remove Gemfile.lock 2013-02-25 12:06:23 +08:00
chris fbf3f9fd2f Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop 2013-02-25 12:02:10 +08:00
Rueshyna 6f599bb95d sort conference and type 2013-02-25 12:01:59 +08:00
Rueshyna 522e0481e1 add conferene list order function 2013-02-25 12:01:59 +08:00
chris 1f58ed5cda Merge branch 'desktop_work' of github.com:Rulingcom/orbit into desktop_work 2013-02-25 12:01:37 +08:00
Rueshyna 8b0ffe747c sort conference and type 2013-02-25 11:46:20 +08:00
Rueshyna 6929d30b5d add conferene list order function 2013-02-25 11:46:11 +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
Harry Bomrah a0b22761c7 css minor changes. 2013-02-23 17:12:02 +08:00
chris caac9191ce Fix public_r_tag selection 2013-02-23 16:52:37 +08:00
Harry Bomrah 5f9dd984b1 gridster, url code fixed, views removed. 2013-02-23 15:23:24 +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
spen cd98f9c889 member plugin init add frontend 2013-02-22 18:21:11 +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 8704fb30d5 Fix init name/key 2013-02-22 14:46:22 +08:00
chris 9a63adedde Remove seminar from conference init 2013-02-22 11:57:10 +08:00
chris 680d7908b9 member plugin init edit 2013-02-21 17:53:08 +08:00
chris 4709c08ad1 Temporary fix zh_tw.yml
New Gemfile.lock
2013-02-21 14:43:49 +08:00
unknown d46abd7caf member list edit 2013-02-21 14:13:46 +08:00
Rueshyna 79f0fc1a3b add announcement header translation file 2013-02-21 14:10:42 +08:00
Rueshyna 4ee85a8c09 add coauthor and coauthor relation function 2013-02-21 13:58:47 +08:00
Rueshyna 13c757e8a9 clean add/edit page and add conference list page 2013-02-21 13:58:30 +08:00
Rueshyna 16fda25ace done personal conference add/edit page 2013-02-21 13:53:50 +08:00
Rueshyna 6d65af0312 done personal conference list page, but it need to js. 2013-02-21 13:53:50 +08:00
Rueshyna 2afbae7c08 make a fake data for personal conference plugin 2013-02-21 13:53:50 +08:00
Rueshyna 1c4b696052 add add/edit form page and controller 2013-02-21 13:53:50 +08:00
Rueshyna 54b12a193a add translation configuration 2013-02-21 13:53:47 +08:00
Rueshyna 158fd8ffff fixed conference icon and rename _p to _window of conference view 2013-02-21 13:51:42 +08:00
Rueshyna f1db7be14e remove test and change for personal journal 2013-02-21 13:51:37 +08:00
Rueshyna a61ec183c9 change add/edit url of personal_conference 2013-02-21 13:50:12 +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
chris 6324233f58 Fix breadcrumb again 2013-02-19 17:50:46 +08:00
chris d2f837f342 Add task to save pages 2013-02-19 17:50:46 +08:00
chris 82a8f99208 Fix [again] error in parser for category 2013-02-19 17:50:46 +08:00
chris ee59228665 Fix error in parser for category 2013-02-19 17:50:43 +08:00