Matthew K. Fu JuYuan
|
45ef7fd302
|
guest user
|
2012-09-12 16:20:15 +08:00 |
Harry Bomrah
|
17f3104c8d
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-09-12 16:18:13 +08:00 |
devin
|
e96ebefe9c
|
calendar update
|
2012-09-12 16:16:01 +08:00 |
|
Harry Bomrah
|
4ea0c0ec9c
|
minor fix for sidebar
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8a71bd530f
|
page added...
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8dd69a140f
|
frontend commits
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
3749e919cb
|
front ends updates
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
a42a651f90
|
frontend updates
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
199839a42a
|
frontend update
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
3fc07b9ff1
|
one more modification
|
2012-09-12 02:07:40 +08:00 |
|
Harry Bomrah
|
2a66b89d33
|
Modifications in ruby
|
2012-09-12 02:07:40 +08:00 |
|
Harry Bomrah
|
7ae1dcd8e0
|
Calendar Module
|
2012-09-12 02:06:22 +08:00 |
|
devin
|
a05fff98ac
|
front update
|
2012-09-12 02:05:10 +08:00 |
|
devin
|
4e662c744a
|
backend update
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
97923a4d31
|
resize thumbnails
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
7903d2ae36
|
ruby update for form and edit tagging
|
2012-09-12 02:05:10 +08:00 |
|
devin
|
789c2df7fd
|
gallery frontend update
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
8259dee4a3
|
Ruby update
|
2012-09-12 02:05:10 +08:00 |
|
devin
|
cc6986cb16
|
language fix
|
2012-09-12 02:05:10 +08:00 |
|
devin
|
0be494c62b
|
front end added
|
2012-09-12 02:05:09 +08:00 |
|
Harry Bomrah
|
6a23e29f33
|
Ruby structure implementation
|
2012-09-12 02:05:09 +08:00 |
|
Harry Bomrah
|
26ff2af078
|
View only update
|
2012-09-12 02:04:36 +08:00 |
|
Harry Bomrah
|
f62eba182e
|
Commit for view only
|
2012-09-12 02:04:36 +08:00 |
|
Harry Bomrah
|
f4dde67344
|
frontend fixes
|
2012-09-12 02:04:36 +08:00 |
|
Harry Bomrah
|
8caa798c08
|
frontend updates
|
2012-09-12 02:04:36 +08:00 |
|
devin
|
29c5126455
|
gallery update
|
2012-09-12 02:04:36 +08:00 |
|
devin
|
4b6eebba7c
|
gallery update
|
2012-09-12 02:04:08 +08:00 |
|
devin
|
b6f10951b8
|
gallery update
especially upload panel
|
2012-09-12 02:04:07 +08:00 |
|
Harry Bomrah
|
6e6d441b26
|
code merged … ui updated
|
2012-09-12 02:03:02 +08:00 |
|
devin
|
2274df4111
|
gallery update
|
2012-09-12 02:02:29 +08:00 |
|
devin
|
584d1eb0e0
|
gallery update
|
2012-09-12 02:02:01 +08:00 |
|
devin
|
ede9727a18
|
gallery update
|
2012-09-12 02:02:00 +08:00 |
|
devin
|
0e5a305f39
|
gallery update
|
2012-09-12 01:58:23 +08:00 |
|
devin
|
0c624794d5
|
gallery update
|
2012-09-12 01:58:23 +08:00 |
|
devin
|
887b2d528d
|
gallery update
especially upload panel
|
2012-09-12 01:58:23 +08:00 |
|
Harry Bomrah
|
ad431b1d06
|
Minor update
|
2012-09-12 01:58:23 +08:00 |
|
Harry Bomrah
|
91d45b64da
|
code merged … ui updated
|
2012-09-12 01:58:23 +08:00 |
|
devin
|
17c4b9a1bf
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
|
devin
|
01eae75ad0
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
|
devin
|
a2ed9e3350
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
|
Matthew K. Fu JuYuan
|
e486ac5d25
|
complete visitor dashbroad
|
2012-09-11 11:30:58 +08:00 |
|
Harry Bomrah
|
7bab8bf8ad
|
page added...
|
2012-09-10 14:44:21 +08:00 |
|
Harry Bomrah
|
8295286c6e
|
frontend commits
|
2012-09-05 19:08:48 +08:00 |
|
Harry Bomrah
|
b726c10857
|
front ends updates
|
2012-09-04 21:30:17 +08:00 |
|
Harry Bomrah
|
a080667615
|
frontend updates
|
2012-09-04 17:17:18 +08:00 |
|
Harry Bomrah
|
4a12c9d6fb
|
frontend update
|
2012-09-03 21:49:35 +08:00 |
|
Harry Bomrah
|
202d736a5d
|
one more modification
|
2012-08-31 22:02:06 +08:00 |
|
Harry Bomrah
|
4d6a9a8e87
|
Modifications in ruby
|
2012-08-31 22:01:19 +08:00 |
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
|
10d9253399
|
announcement edit to view file
|
2012-08-30 14:25:51 +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 |
|
Harry Bomrah
|
9cd7aa81a6
|
Calendar Module
|
2012-08-29 20:13:41 +08:00 |
|
devin
|
34764fb28d
|
front update
|
2012-08-29 17:54:18 +08:00 |
|
devin
|
43294b2f49
|
backend update
|
2012-08-29 17:48:29 +08:00 |
|
Harry Bomrah
|
4fc196fb71
|
resize thumbnails
|
2012-08-29 17:36:12 +08:00 |
|
Harry Bomrah
|
a2da065ce6
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-08-29 17:19:04 +08:00 |
|
Harry Bomrah
|
4e6703dae6
|
ruby update for form and edit tagging
|
2012-08-29 17:13:45 +08:00 |
|
devin
|
e17bc400f1
|
gallery frontend update
|
2012-08-29 17:12:20 +08:00 |
|
Harry Bomrah
|
a11d865dd1
|
Ruby update
|
2012-08-28 21:04:48 +08:00 |
|
Harry Bomrah
|
833349bf6c
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-08-28 15:45:20 +08:00 |
|
devin
|
86535874f7
|
language fix
|
2012-08-28 15:38:35 +08:00 |
|
devin
|
d2733bde28
|
front end added
|
2012-08-28 15:23:55 +08:00 |
|
Harry Bomrah
|
62abbf9417
|
Ruby structure implementation
|
2012-08-27 23:36:56 +08:00 |
|
Harry Bomrah
|
99096c4ac0
|
View only update
|
2012-08-23 21:30:37 +08:00 |
|
Harry Bomrah
|
33bc430df5
|
Commit for view only
|
2012-08-23 19:25:56 +08:00 |
|
Harry Bomrah
|
861f521da3
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-08-23 17:15:03 +08:00 |
|
Harry Bomrah
|
e2c16e1931
|
frontend fixes
|
2012-08-23 17:13:33 +08:00 |
|
Matthew K. Fu JuYuan
|
e4cc80248d
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad
Conflicts:
config/mongoid.yml
|
2012-08-23 16:08:17 +08:00 |
|
Matthew K. Fu JuYuan
|
01d278d688
|
guest user
|
2012-08-23 16:05:14 +08:00 |
|
Harry Bomrah
|
4d9244005a
|
Code merge
|
2012-08-23 01:40:55 +08:00 |
|
Harry Bomrah
|
1e4d534908
|
frontend updates
|
2012-08-23 01:36:56 +08:00 |
|
devin
|
93da8520ed
|
gallery update
|
2012-08-23 01:36:56 +08:00 |
|
devin
|
9430f66bee
|
gallery update
|
2012-08-23 01:36:56 +08:00 |
|
devin
|
1a4097d1c0
|
gallery update
especially upload panel
|
2012-08-23 01:36:56 +08:00 |
|
Harry Bomrah
|
4fe4dc35de
|
Minor update
|
2012-08-23 01:36:55 +08:00 |
|
Harry Bomrah
|
0799fb4f87
|
code merged … ui updated
|
2012-08-23 01:36:55 +08:00 |
|
devin
|
d6b24c6454
|
gallery update
|
2012-08-23 01:36:55 +08:00 |
|
devin
|
a732910f35
|
gallery update
|
2012-08-23 01:36:55 +08:00 |
|
devin
|
7b42adc9a0
|
gallery update
|
2012-08-23 01:36:55 +08:00 |
|
chris
|
7d5531bf01
|
Merge branch 'nccu_master' into demo_site
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
|
2012-08-22 18:07:49 +08:00 |
|
devin
|
75b6c447fc
|
gallery update
|
2012-08-22 16:46:37 +08:00 |
|
devin
|
e8a0015365
|
gallery update
|
2012-08-22 15:59:06 +08:00 |
|
devin
|
1437d2dc14
|
gallery update
especially upload panel
|
2012-08-22 01:15:50 +08:00 |
|
Harry Bomrah
|
4a53e5faea
|
Minor update
|
2012-08-21 20:26:07 +08:00 |
|
Harry Bomrah
|
16b1e97685
|
code merged … ui updated
|
2012-08-21 20:15:17 +08:00 |
|
devin
|
0ad0ea9acf
|
gallery update
|
2012-08-21 16:32:55 +08:00 |
|
devin
|
cbef7cd368
|
gallery update
|
2012-08-21 14:31:25 +08:00 |
|
devin
|
1a6ecf4d0f
|
gallery update
|
2012-08-21 13:56:50 +08:00 |
|
chris
|
68aed18956
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
|
2012-08-20 23:24:41 +08:00 |
|
Harry Bomrah
|
3d607cfca4
|
updates for tagging and language fix
|
2012-08-20 23:20:20 +08:00 |
|
Harry Bomrah
|
2c0058e8c9
|
authorization
|
2012-08-20 23:18:50 +08:00 |
|
devin
|
489231166f
|
gallery update
|
2012-08-20 23:17:32 +08:00 |