developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,123 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

56 Commits

Author SHA1 Message Date
chris b3cdffb59e Fix typo 2013-07-27 15:57:14 +08:00
chris fd432f30ba Fix cktext_area and removing of files and links 2013-07-27 15:50:34 +08:00
chris 1dc7884ec0 Changes for default index: 
- remove approvable and filterable
 - add display_option
 - change params
Update web link and gallery index
 2013-07-25 11:32:25 +08:00
chris 0d0f85e7ad Fix tooltip in form 
Change form_file
 2013-07-22 20:54:40 +08:00
Spen 5d3bc07488 archive and web_resouce for new ui 
Conflicts:
	app/assets/stylesheets/lib/main-forms.css
 2013-07-22 18:14:33 +08:00
chris 856898016b New UI changes(tags, categories, authorisations, module index…) 
To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
 2013-07-02 16:46:44 +08:00
Spen 07b3857465 archive app Category Authorization fix 2013-06-26 17:44:31 +08:00
Spen 8751b15385 archive app add Module Authorization & Category Authorization 2013-06-26 15:35:35 +08:00
iCross e48a1ffece archive module: add sort to frontend module 
Conflicts:

	vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
 2013-06-14 15:25:49 +08:00
iCross 5b7ac1a22b archive module: add sort feature to achive files 2013-06-06 22:20:27 +08:00
iCross c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb 2013-06-06 19:20:21 +08:00
Matt K. Fu 30824d1620 add search to archive 2013-06-05 18:03:09 +08:00
chris 127ab3845c Changes for queries 2013-05-03 12:12:19 +08:00
chris 167a71272a queries need to be rethink 2013-05-03 12:12:19 +08:00
Matt K. Fu 64101109dd disable all sorted_tags 2013-04-26 18:07:59 +08:00
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
Spen 536f0d30af apps_translate_fix 2013-04-23 11:09:20 +08:00
chris ec1605358b Fix sorting for archive 2013-03-27 06:30:22 +08:00
chris 41311c74d0 Spen's changes in archive 2013-03-21 14:38:04 +08:00
chris 031cf927d5 Sort archive by top and creation date 2013-03-20 17:22:40 +08:00
chris e71b002438 Fix archive front end query for multiple categories 2013-03-20 15:37:34 +08:00
Rueshyna 6abf53f34d change page number of archive 2013-03-19 23:43:28 +08:00
Rueshyna 4e151690e9 fixed archive bug, make it have page and category 2013-03-19 23:42:39 +08:00
chris f29ad27b56 Fix pagination in archive back end 2013-03-18 21:53:31 +08:00
chris 2427bc5b69 Update CSS for archive and put the call in widget index 2013-03-13 17:21:39 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
chris bc21840262 Comment out delete link for archive category 
Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100
 2013-02-19 17:49:20 +08:00
chris 236f68ba84 Fix archive module back end pagination and front end html 2013-02-19 17:39:43 +08:00
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Rueshyna c219792a13 fixed delete function of archive file 2012-12-28 10:02:16 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Matthew K. Fu JuYuan 1279af0c11 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
chris 9b1ada0af9 Fix these bugs: 
1.結構部份
    a.原選單，點選編輯，無動作反應
    b.新增選單後，左邊灰色架構部份不會更新

  2.檔案室
    a.無法編輯分類
 2012-11-15 15:51:44 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
 2012-11-06 11:44:00 +08:00
chris 3c85f3ef00 Make the archive module work (it needs more details) 2012-11-06 10:35:11 +08:00
chris 63a57682e6 Fix bugs: 
TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load
 2012-10-30 17:09:00 +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 29bcfa3139 archive checkbox 2012-08-30 14:19:51 +08:00
unknown d5cc9961e3 new archive 2012-08-30 14:14:53 +08:00
unknown 23a3a7eff6 update archive 2012-08-20 17:14:13 +08:00
Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	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
 2012-08-10 15:30:33 +08:00