Harry Bomrah
d8cf721a5b
rescue added for the previous feature
2013-12-05 17:30:41 +08:00
Harry Bomrah
9db4c787c9
approve and delete all done with registration approval notification for admin
2013-12-05 17:30:33 +08:00
2b4fa96b74
No email for user if added by admin
2013-12-04 14:38:22 +08:00
4b169cf2e0
Fix desktop nil theme bug and approval for new user
2013-12-04 13:43:00 +08:00
9f3042c4fe
Fix for mailer
2013-12-04 11:42:39 +08:00
Harry Bomrah
f1c2e29bf1
form validations and ajax check plus user approval done
2013-11-29 16:40:46 +08:00
c76adc1896
new ui member account privilege fix
2013-10-21 10:42:50 +08:00
00e9a5df5b
new ui member settings account data
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
config/locales/en.yml
config/routes.rb
2013-10-18 22:28:27 +08:00
14d2b0cc76
fix new ui member account privilege
2013-10-18 19:52:36 +08:00
3e491380cd
Revert "new ui member settings account data"
...
This reverts commit e1f4ee464b
2013-10-18 19:51:02 +08:00
e1f4ee464b
new ui member settings account data
2013-10-18 19:12:27 +08:00
5328a26440
Fix structure position
2013-10-08 12:33:24 +08:00
21db2a2cba
Drag and drop to reorder users
2013-10-07 15:53:54 +08:00
dfec6f7642
Fix for user order
2013-09-27 12:46:19 +08:00
9186978551
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +08:00
028c689739
Change User.all to User.not_guest_user
2013-09-26 19:46:14 +08:00
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
b970ea1e0e
Updated Authorization for member, link, tag, archive
2013-08-27 10:14:39 +08:00
c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
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
697944a029
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
2013-04-25 19:59:59 +08:00
76296ab29b
Merge branch 'sidebar_config' into ntu
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
7594e1b9a6
fix member has no module_app
2013-01-07 17:20:37 +08:00
36f6a6fdd6
first version of confined sidebar render
2012-12-24 16:17:00 +08:00
3d39c2c3c3
hidden guest user
2012-12-19 19:48:13 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
39adbb35c1
Remove before_filter for sub_manager in users
2012-11-22 09:37:31 +08:00
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
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
58d4554b0b
Fixing bugs
2012-11-05 11:30:15 +08:00
beb843f75b
add new member with role interface. add more not usable.
...
role management new attribute is ok. delete is ok.
2012-11-04 20:42:58 +08:00
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.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/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
13ae2602cd
member for THU
2012-10-18 18:36:21 +08:00
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
b5571dbc43
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
2012-10-12 18:17:05 +08:00
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
Harry Bomrah
saurabhbhatia
Manson Wang
Spen
chris
Fu Matthew
Matthew K. Fu JuYuan
Rueshyna