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 |
|
chris
|
3c85f3ef00
|
Make the archive module work (it needs more details)
|
2012-11-06 10:35:11 +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 |
unknown
|
23a3a7eff6
|
update archive
|
2012-08-20 17:14:13 +08:00 |
|
Christophe Vilayphiou
|
bebb8a1c1e
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
|
2012-08-10 15:30:33 +08:00 |
|
unknown
|
d8b0613147
|
archive checkbox
|
2012-08-10 15:26:34 +08:00 |
|
unknown
|
d5cc470e5d
|
new archive
|
2012-08-10 15:23:56 +08:00 |
|
unknown
|
81fa2a7428
|
archive checkbox
|
2012-08-10 15:19:45 +08:00 |
|
unknown
|
e8cea9f0ab
|
new archive
|
2012-08-10 15:14:43 +08:00 |
|
unknown
|
cc02ea511c
|
archive checkbox
|
2012-05-16 01:13:39 +08:00 |
|
unknown
|
4e9bb1b583
|
new archive
|
2012-05-16 01:06:26 +08:00 |