Christophe Vilayphiou
|
fdb3707024
|
Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check
|
2012-03-19 10:57:44 +08:00 |
Matt Fu
|
6700114955
|
after merge
|
2012-03-19 10:55:58 +08:00 |
|
Matt Fu
|
9c8b0235b0
|
add new files
|
2012-03-19 10:55:58 +08:00 |
unknown
|
a755eb184b
|
fix announcement links & files
|
2012-03-16 16:49:25 +08:00 |
|
unknown
|
7d553acaec
|
fix announcement link & files
|
2012-03-16 15:53:57 +08:00 |
|
Matt Fu
|
c7a333f990
|
after merge
|
2012-03-16 15:51:59 +08:00 |
|
Matt Fu
|
50a9f66269
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into announcement_fact_check
|
2012-03-16 15:50:43 +08:00 |
|
Matt Fu
|
eb2b4b80b7
|
add new files
|
2012-03-16 15:48:13 +08:00 |
|
Christophe Vilayphiou
|
07edf44643
|
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-03-16 15:13:06 +08:00 |
Christophe Vilayphiou
|
29ec36130e
|
css and js changes
|
2012-03-16 15:06:45 +08:00 |
|
Christophe Vilayphiou
|
f4fda08e86
|
Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
|
2012-03-16 14:58:32 +08:00 |
|
Christophe Vilayphiou
|
785ead5209
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-03-16 14:55:21 +08:00 |
|
unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
|
Christophe Vilayphiou
|
b6d49df145
|
Change Obit to Orbit
|
2012-03-16 11:54:31 +08:00 |
|
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
|
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +08:00 |
|
Christophe Vilayphiou
|
db9608d918
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-03-07 18:17:40 +08:00 |
|
Christophe Vilayphiou
|
3e22c6e61b
|
Add bootstrap-orbit.css in front-end
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
79c8b3861b
|
Fix link in widget
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
4dd9b7ffa4
|
Fix announcement pagination in front-end
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
0b1f83c042
|
Fix extra loaded js: the widgets only need to render layout when they need js.
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
900855724c
|
Add bootstrap-orbit.css in front-end
|
2012-03-07 11:37:00 +08:00 |
|
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
|
Christophe Vilayphiou
|
826a5a5f20
|
Fix link in widget
|
2012-03-01 14:12:47 +08:00 |
|
Christophe Vilayphiou
|
9ae140204f
|
Fix announcement pagination in front-end
|
2012-03-01 10:58:31 +08:00 |
|
Christophe Vilayphiou
|
ebf3a2eae4
|
Fix extra loaded js: the widgets only need to render layout when they need js.
|
2012-03-01 10:57:13 +08:00 |
|
Matt Fu
|
7f05f21930
|
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
config/environments/development.rb
|
2012-03-01 10:13:49 +08:00 |
|
Christophe Vilayphiou
|
7c55f6fb88
|
Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
Conflicts:
config/environments/development.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/models/bulletin.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
vendor/built_in_modules/announcement/config/routes.rb
vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
|
2012-02-29 19:03:29 +08:00 |
|
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
Matthew Kaito Juyuan Fu
|
8932615f05
|
add "all_user" for app&object auth
|
2012-02-29 18:56:42 +08:00 |
|
Matthew Kaito Juyuan Fu
|
2e58c63ff7
|
fix bugs with token
|
2012-02-29 18:56:42 +08:00 |
|
Matthew Kaito Juyuan Fu
|
cc550c5745
|
First version for App and Object auth.Taking Announcement as experiment
|
2012-02-29 18:55:55 +08:00 |
|
Matthew Kaito Juyuan Fu
|
3bcd7ea349
|
Exp with object_auth
|
2012-02-29 18:50:23 +08:00 |
|
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +08:00 |
|
Matt Fu
|
819f815023
|
for different database for demo
|
2012-02-29 13:15:25 +08:00 |
|
Matt Fu
|
9a40ecd1d9
|
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
|
2012-02-29 13:07:21 +08:00 |
|
Christophe Vilayphiou
|
5223a7a3e9
|
Css and js changes
|
2012-02-29 12:45:47 +08:00 |
|
Matt Fu
|
b84b7bad63
|
ldap config for 0229 nccu demo
|
2012-02-29 12:35:54 +08:00 |
|
Christophe Vilayphiou
|
0a23ce7b24
|
Add missing i18n for announcement
|
2012-02-29 12:00:16 +08:00 |
|
Matt Fu
|
438dc0ad3d
|
i18n vars for announcement
|
2012-02-29 11:54:48 +08:00 |
|
Matt Fu
|
ccb61fc2dd
|
change Search bar
|
2012-02-29 11:29:13 +08:00 |
|
Matt Fu
|
b83a783a26
|
Add translation files for Announcement
|
2012-02-29 11:12:34 +08:00 |
|
Matt Fu
|
10fd8ce455
|
Change locales for orbit
|
2012-02-29 10:48:15 +08:00 |
|
Christophe Vilayphiou
|
0fa5c3ba9d
|
Fix bug in orbit-bar
|
2012-02-29 04:56:52 +08:00 |
|
Christophe Vilayphiou
|
344ec86c57
|
Remove class 'error' in devise forms
|
2012-02-29 04:56:32 +08:00 |
|
Christophe Vilayphiou
|
4b7b57bb3d
|
Add some missing translations
|
2012-02-29 04:48:21 +08:00 |
|
Christophe Vilayphiou
|
9aa4173933
|
Change orbit-bar for language but bug when user name is too long
|
2012-02-29 04:21:56 +08:00 |
|
Christophe Vilayphiou
|
18617850e5
|
Add categories for all the widgets
|
2012-02-28 22:00:05 +08:00 |
|
Christophe Vilayphiou
|
6a30b0a1e4
|
Add RSS event
|
2012-02-28 18:29:13 +08:00 |
|
Christophe Vilayphiou
|
fdf4cfad2d
|
Add category for announcement widget
|
2012-02-28 14:08:57 +08:00 |