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 |
|
chris
|
3e79b787bb
|
Set default widget sort to created_at
Don't use page category when home
|
2013-02-19 17:49:23 +08:00 |
|
chris
|
ec9c68f039
|
Remove breadcrumb when home
|
2013-02-19 17:49:22 +08:00 |
|
chris
|
25d9a3d9b9
|
Add home to breadcrum
|
2013-02-19 17:49:22 +08:00 |
|
chris
|
bc21840262
|
Comment out delete link for archive category
Modify the import:
- hot_news to announcement
- iso_zone of 20000 to 21100
|
2013-02-19 17:49:20 +08:00 |
|
chris
|
324ab266af
|
Fix query in default widget for tags
|
2013-02-19 17:48:07 +08:00 |
|
chris
|
f5728a4f92
|
Enable designer to add the class "page_breadcrumb"
|
2013-02-19 17:48:07 +08:00 |
|
chris
|
b049e16634
|
Create part and save pages when layout is edited
|
2013-02-19 17:48:06 +08:00 |
|
chris
|
c27141ff5a
|
Fix query for category in default widget
|
2013-02-19 17:48:04 +08:00 |
|
Fu Matthew
|
5a177f34a8
|
default widget query for category and tags
|
2013-02-19 17:45:24 +08:00 |
|
chris
|
a9fecec985
|
Add pagination to default widget for front end page
|
2013-02-19 17:41:01 +08:00 |
|
chris
|
0cacfb7c05
|
Fix path error in parser for breadcrumb
|
2013-02-19 17:39:43 +08:00 |
|
chris
|
c7cf587581
|
Fix web links html and index query
|
2013-02-19 17:39:43 +08:00 |
|
chris
|
236f68ba84
|
Fix archive module back end pagination and front end html
|
2013-02-19 17:39:43 +08:00 |
|
chris
|
1f11293fbe
|
Fix sitemap in page edit
|
2013-02-19 17:39:43 +08:00 |
|
chris
|
17ac564fbb
|
Fix sitemap nil
Fix namespace of role in subrole
|
2013-02-19 17:39:43 +08:00 |
|
chris
|
f36bcb8801
|
Put missing changes for breadcrumb in page edit
|
2013-02-19 17:39:42 +08:00 |
|
chris
|
61648d23e1
|
Change delete_all to destroy_all
|
2013-02-19 17:39:42 +08:00 |
|
chris
|
3676de8a14
|
Change validation for url: can include IPs
|
2013-02-19 17:39:42 +08:00 |
|
chris
|
2a293734c7
|
Change breadcrumb html
|
2013-02-19 17:39:42 +08:00 |
|
Rueshyna
|
bfad8467c8
|
breadcrumb widget of front-end has done
Conflicts:
app/controllers/front_controller.rb
lib/parsers/parser_common.rb
|
2013-02-19 17:39:42 +08:00 |