repnetweb-app

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 12
Last Commit: 19 Sep 18
Commits this week: 0
Total Lines of Code (LoC): 489
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 26 Aug 2015
4:32 pm

John, Joseph

APPDEV-4315: fixing issue with samples always being saved as inactive
Options
    • -1
    • +1
    /app/branches/ci_upgrade/application/controllers/Samples.php
12:55 pm

John, Joseph

APPDEV-4195: Manually merging all changes made to trunk for jiras: APPDEV-4303 and APPDEV-4307
Options
    • -3
    • +9
    /app/branches/ci_upgrade/application/controllers/Reports.php
    • -1
    • +8
    /app/branches/ci_upgrade/application/views/reports/reports.php
    • -1
    • +1
    /app/branches/ci_upgrade/application/controllers/Activities.php
    • -0
    • +6
    /app/branches/ci_upgrade/application/models/Dealer_info_model.php
    • -2
    • +25
    /app/branches/ci_upgrade/application/controllers/Download.php
10:02 am

tnelson

appdev-000: cleanup

Options
  1. /app/branches/system
  2. /app/branches/system/database/drivers/sqlite
  3. /app/branches/system/database/drivers
  4. /app/branches/system/database
    • -88
    • +0
    /app/branches/system/database/drivers/oci8/oci8_utility.php
  6. /app/branches/system/database/drivers/oci8
    • -10
    • +0
    /app/branches/system/database/drivers/index.html
    • -793
    • +0
    /app/branches/system/database/drivers/cubrid/cubrid_driver.php
  9. /app/branches/system/database/drivers/cubrid
    • -24
    • +0
    /app/branches/system/language/english/email_lang.php
  11. /app/branches/system/language/english
  12. /app/branches/system/language
    • -10
    • +0
    /app/branches/system/language/english/index.html
  14. /app/branches/system/database/drivers/odbc
    • -229
    • +0
    /app/branches/system/database/drivers/odbc/odbc_result.php
  16. … 158 more files in changeset.
10:01 am

tnelson

appdev-000: cleanup

Options
    • -2
    • +0
    /app/branches/robots.txt
10:01 am

tnelson

appdev-000: cleaning up

Options
    • -206
    • +0
    /app/branches/index.php
10:01 am

tnelson

appdev-000: bad merge

Options
  1. /app/branches/assets
    • -15
    • +0
    /app/branches/assets/js/samples.js
  3. /app/branches/assets/js
    • binary
    /app/branches/assets/fonts/glyphicons-halflings-regular.ttf
  5. /app/branches/assets/fonts
    • -5
    • +0
    /app/branches/assets/css/bootstrap.min.css
  7. /app/branches/assets/css
    • -103
    • +0
    /app/branches/assets/js/custom.js
    • binary
    /app/branches/assets/fonts/fontawesome-webfont.ttf
    • -4
    • +0
    /app/branches/assets/css/font-awesome.min.css
    • -7
    • +0
    /app/branches/assets/js/bootstrap.min.js
    • binary
    /app/branches/assets/fonts/FontAwesome.otf
    • -504
    • +0
    /app/branches/assets/fonts/fontawesome-webfont.svg
    • binary
    /app/branches/assets/fonts/glyphicons-halflings-regular.woff
    • -64
    • +0
    /app/branches/assets/js/summary.js
  16. … 11 more files in changeset.
10:00 am

tnelson

appdev-000: bad merge

Options
  1. /app/branches/application
  2. /app/branches/application/views
    • -46
    • +0
    /app/branches/application/views/activity/activity.php
  4. /app/branches/application/views/activity
    • -306
    • +0
    /app/branches/application/controllers/dealers.php
  6. /app/branches/application/controllers
    • -105
    • +0
    /app/branches/application/models/user_model.php
  8. /app/branches/application/models
    • -10
    • +0
    /app/branches/application/models/index.html
    • -122
    • +0
    /app/branches/application/views/reports/reports.php
  11. /app/branches/application/views/reports
    • -104
    • +0
    /app/branches/application/views/dealers/contacts.php
  13. /app/branches/application/views/dealers
    • -46
    • +0
    /app/branches/application/views/samples/sample_details.php
  15. /app/branches/application/views/samples
  16. … 91 more files in changeset.
9:59 am

tnelson

APPDEV-000: merge trunk into ci_upgrade branch
Options
  1. /app/branches
  2. /app/branches/application/views
  3. /app/branches/system/database/drivers/sqlite
    • -0
    • +88
    /app/branches/system/database/drivers/oci8/oci8_utility.php
    • -0
    • +46
    /app/branches/application/views/activity/activity.php
    • -0
    • +306
    /app/branches/application/controllers/dealers.php
    • -0
    • +15
    /app/branches/assets/js/samples.js
    • -0
    • +10
    /app/branches/system/database/drivers/index.html
    • binary
    /app/branches/assets/fonts/glyphicons-halflings-regular.ttf
    • -0
    • +793
    /app/branches/system/database/drivers/cubrid/cubrid_driver.php
    • -0
    • +2
    /app/branches/robots.txt
    • -0
    • +24
    /app/branches/system/language/english/email_lang.php
    • -0
    • +10
    /app/branches/system/language/english/index.html
  14. /app/branches/system/database/drivers/odbc
    • -0
    • +229
    /app/branches/system/database/drivers/odbc/odbc_result.php
  16. … 294 more files in changeset.
Monday 24 Aug 2015
10:09 am

awittrock

APPDEV-4307: Increase the page size when requesting corporate samples.
Options
    • -1
    • +1
    /app/trunk/application/controllers/activities.php
Thursday 20 Aug 2015
3:54 pm

awittrock

APPDEV-4303: Remove redundant validation checks.
Options
    • -3
    • +0
    /app/trunk/assets/js/report.js
3:42 pm

awittrock

APPDEV-4303: Enable the activity log button properly when conditions are met.
Options
    • -3
    • +3
    /app/trunk/application/views/reports/reports.php
    • -0
    • +3
    /app/trunk/assets/js/report.js
2:44 pm

awittrock

APPDEV-4303: Lock down the activity reports

- RSMs should only see data from salesmen in their own region.

- REPs should only see their own data.

Changes:

- All relevant parameters are now sent to the report controller. If the selec input is not created because the user is not allowed to set a particular parameter, it is sent as a hidden input instead.

- The parameters are locked down in the report controller. If the user is not allowed to set a particular parameter, the query string value for that parameter is ignored, and it is explicitly set to an allowed value before sending the query to the middle-tier API.

Options
    • -0
    • +6
    /app/trunk/application/models/dealer_info_model.php
    • -2
    • +25
    /app/trunk/application/controllers/download.php
    • -3
    • +9
    /app/trunk/application/controllers/reports.php
    • -1
    • +8
    /app/trunk/application/views/reports/reports.php
  5. /app/trunk
Wednesday 19 Aug 2015
1:15 pm

tnelson

NET-1999: stage repnetweb is no longer externally accessible
Options
    • -5
    • +0
    /config/trunk/apache-stage.conf
Tuesday 18 Aug 2015
5:50 pm

John, Joseph

APPDEV-4195: Merge all from trunk at 175
Options
    • -1
    • +1
    /app/branches/ci_upgrade/application/views/samples/sample_details.php
  2. /app/branches/ci_upgrade
Friday 14 Aug 2015
12:30 pm

tnelson

APPDEV-0000: all Options must have a - or +
Options
    • -1
    • +1
    /config/trunk/apache-prod.conf
    • -1
    • +1
    /config/trunk/apache-dev.conf
    • -1
    • +1
    /config/trunk/apache-stage.conf
Wednesday 12 Aug 2015
11:58 am

John, Joseph

APPDEV-4284: removed asterik for "Brand" field for "Add Samples" page
Options
    • -1
    • +1
    /app/trunk/application/views/samples/sample_details.php
Thursday 06 Aug 2015
1:45 pm

John, Joseph

APPDEV-4195: Merge all from trunk at 172
Options
  1. /app/branches/ci_upgrade
    • -1
    • +1
    /app/branches/ci_upgrade/application/libraries/Lemans_Pagination.php
    • -0
    • +4
    /app/branches/ci_upgrade/assets/js/custom.js
10:49 am

John, Joseph

APPDEV-4276: removed href for current page link; also added javascript preventdefault for extra safety.
Options
    • -1
    • +1
    /app/trunk/application/libraries/Lemans_Pagination.php
    • -0
    • +4
    /app/trunk/assets/js/custom.js
Thursday 23 Jul 2015
5:28 pm

John, Joseph

APPDEV-4195: Previous versions of CodeIgniter used to have an override set for the max_execution_time in the Codeigniter.php (to 5 minutes), but do not have it set for CodeIgniter 3, so modified code to add this override to the service model (but just for 2 minutes, as the middle tier only has 2 minutes) - the same way we did it for dashboard.
Options
    • -0
    • +10
    /app/branches/ci_upgrade/application/models/Service_model.php
4:59 pm

John, Joseph

APPDEV-4195: codeigniter upgrade to version 3
Options
    • -21
    • +20
    /app/branches/ci_upgrade/application/libraries/Lemans_Parser.php
    • -0
    • +8
    /app/branches/ci_upgrade/application/views/errors/cli/error_404.php
    • -0
    • +8
    /app/branches/ci_upgrade/application/views/errors/cli/error_general.php
    • -0
    • +11
    /app/branches/ci_upgrade/application/views/errors/html/index.html
  5. /app/branches/ci_upgrade/application/views/errors
    • -0
    • +25
    /app/branches/ci_upgrade/application/views/errors/cli/error_php.php
  7. /app/branches/ci_upgrade/application/errors
    • -16
    • +46
    /app/branches/ci_upgrade/application/config/config.php
    • -0
    • +33
    /app/branches/ci_upgrade/application/views/errors/html/error_php.php
    • -9
    • +24
    /app/branches/ci_upgrade/application/config/database.php
    • -0
    • +8
    /app/branches/ci_upgrade/application/views/errors/cli/error_db.php
    • -0
    • +25
    /app/branches/ci_upgrade/application/views/errors/cli/error_exception.php
    • -0
    • +64
    /app/branches/ci_upgrade/application/views/errors/html/error_general.php
    • -79
    • +0
    /app/branches/ci_upgrade/application/controllers/download.php
    • -0
    • +101
    /app/branches/ci_upgrade/application/controllers/Followups.php
  16. … 39 more files in changeset.
Tuesday 07 Jul 2015
5:45 pm

John, Joseph

APPDEV-4195: replacing with system folder from version3
Options
    • -0
    • +424
    /app/branches/ci_upgrade/system/libraries/Typography.php
    • -0
    • +63
    /app/branches/ci_upgrade/system/database/drivers/pdo/pdo_utility.php
    • -0
    • +268
    /app/branches/ci_upgrade/system/database/drivers/odbc/odbc_result.php
    • -0
    • +161
    /app/branches/ci_upgrade/system/database/drivers/ibase/ibase_result.php
    • -0
    • +683
    /app/branches/ci_upgrade/system/libraries/User_agent.php
  6. /app/branches/ci_upgrade/system/libraries/Cache/drivers
    • -0
    • +199
    /app/branches/ci_upgrade/system/database/drivers/mysql/mysql_result.php
    • -0
    • +149
    /app/branches/ci_upgrade/system/database/drivers/oci8/oci8_forge.php
  9. /app/branches/ci_upgrade/system/database/drivers/cubrid
    • -0
    • +641
    /app/branches/ci_upgrade/system/core/URI.php
    • -0
    • +203
    /app/branches/ci_upgrade/system/core/Lang.php
    • -0
    • +2284
    /app/branches/ci_upgrade/system/libraries/Email.php
    • -0
    • +182
    /app/branches/ci_upgrade/system/database/drivers/postgre/postgre_result.php
    • -0
    • +253
    /app/branches/ci_upgrade/system/helpers/captcha_helper.php
    • -0
    • +11
    /app/branches/ci_upgrade/system/index.html
  16. … 215 more files in changeset.
5:42 pm

John, Joseph

APPDEV-4195: deleting system folder to replace with new folder
Options
  1. /app/branches/ci_upgrade/system
    • -409
    • +0
    /app/branches/ci_upgrade/system/libraries/Typography.php
  3. /app/branches/ci_upgrade/system/libraries
    • -104
    • +0
    /app/branches/ci_upgrade/system/database/drivers/pdo/pdo_utility.php
  5. /app/branches/ci_upgrade/system/database/drivers/pdo
  6. /app/branches/ci_upgrade/system/database/drivers
  7. /app/branches/ci_upgrade/system/database
    • -229
    • +0
    /app/branches/ci_upgrade/system/database/drivers/odbc/odbc_result.php
  9. /app/branches/ci_upgrade/system/database/drivers/odbc
    • -550
    • +0
    /app/branches/ci_upgrade/system/libraries/User_agent.php
  11. /app/branches/ci_upgrade/system/libraries/Cache/drivers
  12. /app/branches/ci_upgrade/system/libraries/Cache
    • -175
    • +0
    /app/branches/ci_upgrade/system/database/drivers/mysql/mysql_result.php
  14. /app/branches/ci_upgrade/system/database/drivers/mysql
    • -249
    • +0
    /app/branches/ci_upgrade/system/database/drivers/oci8/oci8_forge.php
  16. … 158 more files in changeset.
2:49 pm

John, Joseph

APPDEV-4195: new breanch for repnetweb CI upgrade
Options
  1. /app/branches/ci_upgrade
    • -0
    • +10
    /app/branches/ci_upgrade/system/index.html
    • -0
    • +114
    /app/branches/ci_upgrade/application/views/activity/summary.php
    • -0
    • +129
    /app/branches/ci_upgrade/system/helpers/security_helper.php
    • -0
    • +22
    /app/branches/ci_upgrade/system/language/english/upload_lang.php
  6. /app/branches/ci_upgrade/application/cache
  7. /app/branches/ci_upgrade/application/third_party
    • -0
    • +282
    /app/branches/ci_upgrade/system/helpers/smiley_helper.php
    • -0
    • +107
    /app/branches/ci_upgrade/system/helpers/download_helper.php
    • -0
    • +330
    /app/branches/ci_upgrade/system/libraries/Migration.php
  11. /app/branches/ci_upgrade/system/core
    • -0
    • +161
    /app/branches/ci_upgrade/system/core/Lang.php
    • -0
    • +62
    /app/branches/ci_upgrade/application/errors/error_general.php
    • -0
    • +252
    /app/branches/ci_upgrade/system/libraries/Sha1.php
    • -0
    • +383
    /app/branches/ci_upgrade/system/database/DB_forge.php
  16. … 293 more files in changeset.
Wednesday 01 Jul 2015
4:13 pm

jenkins

APPDEV-4169: Move branch to tags
Options
  1. /app/branches/refactor2015
  2. /app/tags/refactor2015
  3. /app/branches/refactor2015/application/views
  4. /app/branches/refactor2015/application
    • -2
    • +0
    /app/branches/refactor2015/application/views/dealers/activity.php
  6. /app/branches/refactor2015/application/views/dealers
    • -50
    • +0
    /app/branches/refactor2015/application/config/routes.php
  8. /app/branches/refactor2015/application/config
    • -47
    • +0
    /app/branches/refactor2015/application/views/followups/followup_form.php
  10. /app/branches/refactor2015/application/views/followups
    • -22
    • +0
    /app/branches/refactor2015/application/views/activity/merchandising.php
  12. /app/branches/refactor2015/application/views/activity
    • -8
    • +0
    /app/branches/refactor2015/application/views/activity/followups.php
    • -163
    • +0
    /app/branches/refactor2015/application/libraries/Lemans_Parser.php
  15. /app/branches/refactor2015/application/libraries
  16. … 294 more files in changeset.
4:13 pm

jenkins

APPDEV-4169: Jenkins reintegration
Options
    • -6
    • +12
    /app/trunk/application/views/includes/message_block.php
  2. /app/trunk
    • -0
    • +24
    /app/trunk/application/views/dealers/dealer.php
    • -0
    • +115
    /app/trunk/application/views/reports/reports.php
  5. /app/trunk/application/views/reports
    • -0
    • +104
    /app/trunk/application/views/dealers/contacts.php
    • -0
    • +46
    /app/trunk/application/views/samples/sample_details.php
    • -68
    • +0
    /app/trunk/application/controllers/followup.php
  9. /app/trunk/application/views/download
    • -36
    • +72
    /app/trunk/application/views/activity/programs.php
    • -1226
    • +0
    /app/trunk/application/controllers/visits.php
    • -163
    • +326
    /app/trunk/application/libraries/Lemans_Parser.php
    • -8
    • +5
    /app/trunk/application/config/routes.php
    • -10
    • +11
    /app/trunk/application/views/index.html
    • -22
    • +44
    /app/trunk/application/views/activity/merchandising.php
  16. … 56 more files in changeset.
Thursday 25 Jun 2015
2:06 pm

sjohnson

APPDEV-4169: hide navigation menu button when on login page as there is no where to navigate to
Options
    • -6
    • +8
    /app/branches/refactor2015/application/views/includes/header.php
Tuesday 23 Jun 2015
4:32 pm

sjohnson

APPDEV-4169: refactor changes to repnetweb
Options
    • -3
    • +0
    /app/branches/refactor2015/application/views/followups/followup_form.php
    • -1
    • +1
    /app/branches/refactor2015/application/controllers/samples.php
    • -9
    • +1
    /app/branches/refactor2015/application/config/routes.php
Monday 22 Jun 2015
10:15 am

sjohnson

APPDEV-4169: refactor changes to repnetweb
Options
    • -0
    • +2
    /app/branches/refactor2015/application/views/dealers/activity.php
    • -2
    • +7
    /app/branches/refactor2015/application/config/routes.php
    • -0
    • +50
    /app/branches/refactor2015/application/views/followups/followup_form.php
    • -0
    • +22
    /app/branches/refactor2015/application/views/activity/merchandising.php
    • -0
    • +8
    /app/branches/refactor2015/application/views/activity/followups.php
    • -163
    • +163
    /app/branches/refactor2015/application/libraries/Lemans_Parser.php
  7. /app/branches/refactor2015/application/views/dealers
  8. /app/branches/refactor2015/application/views/download
    • -0
    • +104
    /app/branches/refactor2015/application/views/dealers/contacts.php
    • -0
    • +64
    /app/branches/refactor2015/application/views/activity/samples.php
    • -0
    • +4
    /app/branches/refactor2015/application/views/activity/activity_page.php
    • -0
    • +50
    /app/branches/refactor2015/application/views/activity/order.php
    • -0
    • +24
    /app/branches/refactor2015/application/views/dealers/dealer.php
    • -0
    • +115
    /app/branches/refactor2015/application/views/reports/reports.php
    • -0
    • +2
    /app/branches/refactor2015/application/views/samples/samples.php
  16. … 33 more files in changeset.
Wednesday 17 Jun 2015
8:29 am

sjohnson

APPDEV-4159: starting over with the views
Options
  1. /app/branches/refactor2015/application/views
    • -22
    • +0
    /app/branches/refactor2015/application/views/activity/merchandising.php
  3. /app/branches/refactor2015/application/views/activity
    • -8
    • +0
    /app/branches/refactor2015/application/views/activity/followups.php
  5. /app/branches/refactor2015/application/views/download
    • -64
    • +0
    /app/branches/refactor2015/application/views/activity/samples.php
    • -50
    • +0
    /app/branches/refactor2015/application/views/activity/order.php
    • -10
    • +0
    /app/branches/refactor2015/application/views/index.html
    • -13
    • +0
    /app/branches/refactor2015/application/views/includes/footer.php
  10. /app/branches/refactor2015/application/views/includes
    • -25
    • +0
    /app/branches/refactor2015/application/views/login.php
    • -56
    • +0
    /app/branches/refactor2015/application/views/includes/header.php
    • -36
    • +0
    /app/branches/refactor2015/application/views/activity/programs.php
    • -6
    • +0
    /app/branches/refactor2015/application/views/includes/message_block.php
    • -46
    • +0
    /app/branches/refactor2015/application/views/activity/activity.php
  16. … 24 more files in changeset.
Thursday 11 Jun 2015
2:47 pm

sjohnson

APPDEV-4169: Create branch for refactoring
Options
  1. /app/branches/refactor2015
    • -0
    • +780
    /app/branches/refactor2015/system/database/drivers/mysql/mysql_driver.php
    • -0
    • +274
    /app/branches/refactor2015/system/database/drivers/mysql/mysql_forge.php
    • -0
    • +53
    /app/branches/refactor2015/application/config/routes.php
  5. /app/branches/refactor2015/application/core
    • -0
    • +10
    /app/branches/refactor2015/application/index.html
    • -0
    • +64
    /app/branches/refactor2015/application/views/activity/samples.php
    • -0
    • +10
    /app/branches/refactor2015/application/config/index.html
    • -0
    • +64
    /app/branches/refactor2015/assets/js/summary.js
    • -0
    • +15
    /app/branches/refactor2015/application/config/doctypes.php
    • -0
    • +246
    /app/branches/refactor2015/system/database/drivers/sqlsrv/sqlsrv_forge.php
  12. /app/branches/refactor2015/system/database/drivers/sqlite
    • -0
    • +10
    /app/branches/refactor2015/system/language/english/index.html
    • -0
    • +88
    /app/branches/refactor2015/system/database/drivers/oci8/oci8_utility.php
    • -0
    • +308
    /app/branches/refactor2015/assets/js/report.js
  16. … 292 more files in changeset.