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
|
4ee85a8c09
|
add coauthor and coauthor relation function
|
2013-02-21 13:58:47 +08:00 |
|
Rueshyna
|
f1db7be14e
|
remove test and change for personal journal
|
2013-02-21 13:51:37 +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
|
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 |
|
Rueshyna
|
f3bfe67e68
|
breadcrumb widget of back-end has done, front-end has bug...
Conflicts:
app/controllers/front_controller.rb
app/views/front/show_breadcrumb.html.erb
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
|
2013-02-19 17:39:41 +08:00 |
Fu Matthew
|
0a115906f1
|
fix i18n,reload problems
|
2013-02-19 14:21:54 +08:00 |
|
Fu Matthew
|
a6f6dc271c
|
fix i18n,reload problems
|
2013-02-18 15:13:31 +08:00 |
|
unknown
|
e244493b55
|
member plugin edit
|
2013-02-04 18:01:42 +08:00 |
|
Rueshyna
|
8e98aa10bc
|
modularize factories
|
2013-02-04 18:01:42 +08:00 |
|
Rueshyna
|
e0fedb4454
|
change textfiled to bilingual for co_author
|
2013-02-04 18:01:03 +08:00 |
|
Rueshyna
|
85ca196dec
|
add bilingual for personal journal
|
2013-02-04 18:01:03 +08:00 |
|
Fu Matthew
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +08:00 |
|
unknown
|
8bf7d0f6f3
|
member plugin edit
|
2013-01-28 16:19:36 +08:00 |
|
Fu Matthew
|
bfaa22052f
|
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
|
2013-01-24 16:30:02 +08:00 |
|
Rueshyna
|
da283e136b
|
correct personal journal language, but now hava no language config
|
2013-01-14 17:54:53 +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 |
|
chris
|
de39bce4ce
|
Fix the tooltips
|
2013-01-11 12:13:16 +08:00 |
|
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
Matthew K. Fu JuYuan
|
41bcbdd2f0
|
missing file?
|
2012-12-24 16:39:53 +08:00 |
|
Rueshyna
|
eb97d417bd
|
if coauthor not in coauthor db then it will be add in db
|
2012-12-04 00:31:06 +08:00 |
|
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
|
Rueshyna
|
b359d5d566
|
some bugs
|
2012-11-21 07:37:44 +08:00 |
|
Rueshyna
|
d7599f1ccf
|
add edit function
|
2012-11-21 07:37:43 +08:00 |
|
Rueshyna
|
5eb8cc4063
|
finished some method of list and journal
|
2012-11-21 07:37:43 +08:00 |
|
unknown
|
97d2380406
|
Merge branch 'new' of https://github.com/Rulingcom/orbit into new
|
2012-11-06 14:28:03 +08:00 |
|
unknown
|
b9c8d9d657
|
plugin edit
|
2012-11-06 14:26:37 +08:00 |
|
chris
|
b40d4702d5
|
Merge branch 'master' into various_bugs
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
|
2012-11-06 11:44:00 +08:00 |
|
Rueshyna
|
ed3644fb89
|
done journal
|
2012-11-05 11:42:49 +08:00 |
|
unknown
|
bd17641d18
|
member plugin list add new
|
2012-11-04 20:24:36 +08:00 |
|
unknown
|
2f61b3e0c9
|
member plugin list add new
|
2012-11-02 18:28:23 +08:00 |
|
chris
|
63a57682e6
|
Fix bugs:
TinyMCE: the size of the textarea change depending on the language
Page content edit: no tab selected on first load
|
2012-10-30 17:09:00 +08:00 |
|
chris
|
cbfa659928
|
Changes for side_bar
|
2012-10-26 11:19:56 +08:00 |
|
chris
|
0babd5f302
|
Changes for side_bar
|
2012-10-15 15:30:48 +08:00 |
|
unknown
|
a4c94c4404
|
demo site plugin
|
2012-10-08 16:20:21 +08:00 |
|
unknown
|
975523c8b2
|
demo site plugin
|
2012-09-24 14:10:44 +08:00 |
|
unknown
|
9eed9ec7b6
|
demo site plugin
|
2012-09-17 13:32:52 +08:00 |
|
unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |