developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,349 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1349 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan d9f6bb3b4e can display scope 2012-08-15 11:34:19 +08:00
Christophe Vilayphiou 905844f7bb Typo 2012-08-15 10:24:47 +08:00
Christophe Vilayphiou bcc13a47e6 Fix deadline was set to nil when update 2012-08-14 16:23:34 +08:00
Christophe Vilayphiou efaed060d9 Change for date 2012-08-14 15:11:52 +08:00
Christophe Vilayphiou fb53ad524a Add time to announcement quick edit 
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
 2012-08-14 14:38:21 +08:00
Matthew K. Fu JuYuan 77224bcc8f check deadline for news 2012-08-14 13:49:24 +08:00
Matthew K. Fu JuYuan e57b429398 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 13:13:25 +08:00
Matthew K. Fu JuYuan 5bb4aa95ee fix for dept 2012-08-14 13:13:06 +08:00
Christophe Vilayphiou ab1c457a51 Add i18n for message in editor pop-up 2012-08-14 01:20:45 +08:00
Christophe Vilayphiou bd56685b07 Merge branch 'nccu_ie' of github.com:Rulingcom/NCCU into nccu_ie 2012-08-14 01:03:06 +08:00
Harry Bomrah 9ff60d2ba4 form validation again 2012-08-14 01:02:45 +08:00
Harry Bomrah ffa49fd092 form validation 2012-08-14 01:02:45 +08:00
Christophe Vilayphiou 9196deb997 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 01:00:25 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Harry Bomrah 31f1f8092b Merge branch 'nccu_ie' of https://github.com/Rulingcom/NCCU into nccu_ie 2012-08-13 18:46:45 +08:00
Harry Bomrah 134f49359d form validation again 2012-08-13 18:45:02 +08:00
Matthew K. Fu JuYuan 83569fac82 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-13 18:36:04 +08:00
Matthew K. Fu JuYuan 6cc470ede9 nccu fix 2012-08-13 18:35:47 +08:00
Harry Bomrah 895918dfff form validation 2012-08-13 18:31:50 +08:00
Christophe Vilayphiou 18e18a4add Fix for banner on ie 2012-08-13 15:10:53 +08:00
Christophe Vilayphiou c2f3f45196 Fix for link in nccu widget 2012-08-13 11:34:14 +08:00
Christophe Vilayphiou 92fc0c8c26 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-13 11:20:23 +08:00
Christophe Vilayphiou 2ea3193879 Fix for banner link 2012-08-13 11:03:11 +08:00
Matthew K. Fu JuYuan 080974b563 Merge branch 'new_rss' 
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
 2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan f1b4d9e204 Add authorization for rescue interface 
Change logic for NCCU site for status panel.
 2012-08-12 23:29:13 +08:00
Christophe Vilayphiou 33fc96ac7c Changes for NCCU after email 2012-08-11 18:19:30 +08:00
Christophe Vilayphiou 5281464af4 Fix bug for sorting when there's only one category with elements 2012-08-11 16:56:28 +08:00
Christophe Vilayphiou 2bd132cef9 Pass category and tag to search to redirect to the right page 
Ray's change for mouseover (take out the black background)
 2012-08-09 19:16:26 +08:00
Matthew K. Fu JuYuan 6059edad70 Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss 2012-08-09 18:36:31 +08:00
Matthew K. Fu JuYuan 9e1e33798c fix search for i.e. 2012-08-09 18:35:57 +08:00
Christophe Vilayphiou f77043e632 Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss 
Conflicts:
	vendor/built_in_modules/news/app/models/news_bulletin.rb
 2012-08-09 17:05:40 +08:00
Matthew K. Fu JuYuan 1e7bc9aadd 1.Rss feed but no entry for clicking now. wait for design. 
2.Unit link is now fixed.
 2012-08-09 17:04:37 +08:00
Christophe Vilayphiou e256440678 RSS first page 2012-08-09 17:04:08 +08:00
Matthew K. Fu JuYuan 561d510aa8 rss branch end 2012-08-09 17:04:08 +08:00
Matthew K. Fu JuYuan 2d2172752f remove announcement category column in announcement 2012-08-09 16:14:05 +08:00
Matthew K. Fu JuYuan 987e6fff2b 1.Rss feed but no entry for clicking now. wait for design. 
2.Unit link is now fixed.
 2012-08-09 02:20:10 +08:00
Matthew K. Fu JuYuan 5fcc910723 Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss 2012-08-09 00:32:09 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0645f04240 Ray's change in css 2012-08-08 18:11:18 +08:00
Christophe Vilayphiou 0d55a2f76b Hide quick edit 2012-08-08 18:11:03 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
Christophe Vilayphiou 41930eb693 RSS first page 2012-08-08 17:41:48 +08:00
Matthew K. Fu JuYuan eb91322e1f rss branch end 2012-08-08 17:40:49 +08:00
Matthew K. Fu JuYuan 2158e0a879 Merge branch 'nccu_fix_matt' 2012-08-08 16:15:49 +08:00
Matthew K. Fu JuYuan 1b35415699 conditional showing quick edit. 2012-08-08 15:56:46 +08:00
Christophe Vilayphiou 959def6c1f Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt 
Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb
 2012-08-08 14:48:29 +08:00
Matthew K. Fu JuYuan e8317e0a4b 1.Remove category column when category is specified 
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
 2012-08-08 14:46:08 +08:00
Christophe Vilayphiou b4c2dfe0ef Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:53:47 +08:00
OrbitServer 3fdff9357c Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:52:11 +08:00
OrbitServer fbb53cca36 Ray's changes for sitemap backend 2012-08-08 11:51:20 +08:00