chris
|
dcdd730a01
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
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
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-08-31 14:31:54 +08:00 |
unknown
|
a1560ebcf5
|
update archive
|
2012-08-30 15:17:39 +08:00 |
|
unknown
|
bc5235aa9f
|
archive checkbox
|
2012-08-30 14:49:31 +08:00 |
|
unknown
|
c739ab3984
|
new archive
|
2012-08-30 14:49:31 +08:00 |
|
unknown
|
2a4c737cdd
|
archive checkbox
|
2012-08-30 14:48:42 +08:00 |
|
unknown
|
eb7e73b393
|
new archive
|
2012-08-30 14:44:55 +08:00 |
|
unknown
|
c74ebb91b8
|
archive checkbox
|
2012-08-30 14:37:56 +08:00 |
|
unknown
|
8a5519073b
|
new archive
|
2012-08-30 14:32:32 +08:00 |
|
unknown
|
29bcfa3139
|
archive checkbox
|
2012-08-30 14:19:51 +08:00 |
|
unknown
|
d5cc9961e3
|
new archive
|
2012-08-30 14:14:53 +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 |