Christophe Vilayphiou
|
79f484300e
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:32:06 +08:00 |
|
Christophe Vilayphiou
|
c9cbec4239
|
Asset changes, add description
|
2012-05-17 18:31:40 +08:00 |
Matt
|
0d69403f4a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 16:42:07 +08:00 |
|
Christophe Vilayphiou
|
5e93fe51a9
|
Merge branch 'design_team' into ldap
|
2012-05-17 16:41:11 +08:00 |
|
Christophe Vilayphiou
|
29c54e6480
|
Add mandatory fields to assets
|
2012-05-17 16:40:09 +08:00 |
|
Matt
|
d1d25a12a1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 10:00:35 +08:00 |
|
Christophe Vilayphiou
|
1e2b146c21
|
Merge branch 'design_team' into ldap
|
2012-05-17 10:00:07 +08:00 |
|
Christophe Vilayphiou
|
4467bc5e48
|
Change Date to DateTime
Fix filename error
|
2012-05-17 09:59:49 +08:00 |
|
Matt
|
e9dde4cefe
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 09:32:57 +08:00 |
|
Christophe Vilayphiou
|
bfad553cc3
|
Merge branch 'design_team' into ldap
|
2012-05-17 09:31:02 +08:00 |
|
Christophe Vilayphiou
|
84dac1d250
|
Create FileAssetUploader
|
2012-05-17 09:30:21 +08:00 |
|
Matt
|
3d08bd48de
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:47:03 +08:00 |
|
Christophe Vilayphiou
|
eba4671733
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:46:29 +08:00 |
|
Christophe Vilayphiou
|
cd1640482a
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-05-17 06:45:30 +08:00 |
Matthew K. Fu JuYuan
|
0f354b8ccc
|
fix ad_image size hints. fix orbit backend controller error when changing language.
|
2012-05-17 06:44:14 +08:00 |
|
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
82d78acbad
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
03387d3c07
|
Object auth for ad_banner
|
2012-05-17 06:42:33 +08:00 |
|
Matthew K. Fu JuYuan
|
f663985a40
|
starting ad_banner auth
|
2012-05-17 06:42:33 +08:00 |
|
Matt
|
d5bb48ef58
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:33:03 +08:00 |
|
Christophe Vilayphiou
|
6b9c8eb15d
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:31:57 +08:00 |
|
Christophe Vilayphiou
|
c35cd2e3a6
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-17 06:31:07 +08:00 |
|
Christophe Vilayphiou
|
b05836835a
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-17 06:28:49 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
Christophe Vilayphiou
|
aab030efa9
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-17 06:26:21 +08:00 |
|
Christophe Vilayphiou
|
be7ce0bf45
|
Redmine change's
|
2012-05-17 06:25:38 +08:00 |
Harry Bomrah
|
27a0984da1
|
tinymce loading fixed…
|
2012-05-16 18:51:37 +08:00 |
|
Christophe Vilayphiou
|
9129835f23
|
Add tags to assets
|
2012-05-16 18:19:41 +08:00 |
|
Matthew K. Fu JuYuan
|
0647698012
|
fix ad_image size hints. fix orbit backend controller error when changing language.
|
2012-05-16 17:16:48 +08:00 |
|
Matthew K. Fu JuYuan
|
befd3bcdec
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-16 16:42:43 +08:00 |
|
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
|
Harry Bomrah
|
c380c4cad0
|
popup fixed
|
2012-05-16 15:34:23 +08:00 |
|
Harry Bomrah
|
30137b50b4
|
popup fix..
|
2012-05-16 15:33:54 +08:00 |
|
Matthew K. Fu JuYuan
|
a31a9c4792
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
|
2012-05-16 12:13:07 +08:00 |
|
Matthew K. Fu JuYuan
|
88a26cc6a1
|
Fix sidebar and hide some links by roles
|
2012-05-16 12:10:16 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Matt
|
f1941f1fc5
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-15 23:09:17 +08:00 |
|
Christophe Vilayphiou
|
f950f77f36
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile
app/models/ad_banner.rb
|
2012-05-15 23:02:22 +08:00 |
|
Christophe Vilayphiou
|
80e84c10ba
|
Remove link from dashboard
|
2012-05-15 23:01:00 +08:00 |
|
Christophe Vilayphiou
|
42881553a8
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-15 22:48:40 +08:00 |
|
Christophe Vilayphiou
|
5e9b55e08e
|
Ray took out 'default' tags
|
2012-05-15 22:47:28 +08:00 |
|
Christophe Vilayphiou
|
a8c1cbdbba
|
Add vendor/impressionist
|
2012-05-15 22:42:49 +08:00 |
|
Christophe Vilayphiou
|
3462c0e319
|
Add each page name to page_context index
|
2012-05-15 21:31:54 +08:00 |
|
Christophe Vilayphiou
|
e54f4409fb
|
Add impressionist
|
2012-05-15 21:26:09 +08:00 |
|
Christophe Vilayphiou
|
53a0fbddf0
|
Fix commit error
|
2012-05-15 21:25:51 +08:00 |
|
Matthew K. Fu JuYuan
|
3f744dab05
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-15 18:55:16 +08:00 |
|
Matthew K. Fu JuYuan
|
b23b5e8ec5
|
Object auth for ad_banner
|
2012-05-15 16:39:23 +08:00 |
|
Matthew K. Fu JuYuan
|
77deffb512
|
Nccu calendar and daily job.
|
2012-05-15 14:03:54 +08:00 |
|
Matthew K. Fu JuYuan
|
848d935d23
|
Remove unless config file
|
2012-05-15 11:37:45 +08:00 |