developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,206 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

2206 Commits

Author SHA1 Message Date
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
Matthew K. Fu JuYuan fc4e2ceba5 fix for 403 for new interface 2012-08-31 18:56:26 +08:00
Matthew K. Fu JuYuan 26f99c296f fix page blank for 403 forbidden. 2012-08-31 18:33:18 +08:00
Matthew K. Fu JuYuan 6b904a37ad let all signed in users at NCCU upload files 2012-08-31 17:54:25 +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 0cb573946e update item page 2012-08-30 15:17:39 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +08:00
Christophe Vilayphiou 3ebe7378b9 Delete duplicate side_bar code 2012-08-30 14:49:31 +08:00
unknown bc5235aa9f archive checkbox 2012-08-30 14:49:31 +08:00
unknown e281262b6d new archive 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 7ce4a51b73 new archive 2012-08-30 14:45:28 +08:00
unknown eb7e73b393 new archive 2012-08-30 14:44:55 +08:00
Christophe Vilayphiou becf88bc20 Delete duplicate side_bar code 2012-08-30 14:39:48 +08:00
unknown c74ebb91b8 archive checkbox 2012-08-30 14:37:56 +08:00
unknown 57717eef33 new archive 2012-08-30 14:36:48 +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 c5c7b0ca7c new archive 2012-08-30 14:18:16 +08:00
unknown d5cc9961e3 new archive 2012-08-30 14:14:53 +08:00
Harry Bomrah b0c13e34d4 Calendar update 2012-08-29 20:21:36 +08:00
Harry Bomrah 3423167600 minor changes 2012-08-29 20:16:46 +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
Matthew K. Fu JuYuan 0ea73fa874 Merge branches 'master' and 'master' of github.com:Rulingcom/NCCU 2012-08-29 10:03:34 +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
Matthew K. Fu JuYuan 6bd8514675 fix for no login window for backend 2012-08-24 11:53:45 +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