Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicts with refactored develop #2

Merged
merged 336 commits into from
Aug 23, 2017
Merged

Fix conflicts with refactored develop #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
336 commits
Select commit Hold shift + click to select a range
60277fd
Remove src/adaptbuilder folder
taylortom Mar 29, 2017
16bafef
Remove modules.js
taylortom Mar 29, 2017
5710e7d
Update .gitignore
taylortom Mar 29, 2017
6354562
Fix app.js load order
taylortom Mar 29, 2017
0a84785
Add src/libraries to statically served folders
taylortom Mar 29, 2017
4e2cbd5
Replace dashboard and project modules with projects module
taylortom Mar 29, 2017
3cebdd3
Remove images folder
taylortom Mar 29, 2017
3a1b0d2
Merge root less with module less
taylortom Mar 29, 2017
1b4a8e7
Remove hard-coded type inference
taylortom Mar 29, 2017
2deea72
Remove log
taylortom Mar 29, 2017
2d3eae1
Rename variables.less to colours.less
taylortom Mar 29, 2017
2e7f6a0
Move view code from router
taylortom Mar 29, 2017
6a539d8
Abstract location code
taylortom Mar 29, 2017
23a2bea
Amend comments
taylortom Mar 29, 2017
46f0694
Update Gruntfile.js
taylortom Mar 30, 2017
4ea3c13
Merge branch 'adaptlearning-develop' into thebigfix
taylortom Mar 30, 2017
817436d
Merge branch 'thebigfix' into refactor/structure
taylortom Mar 30, 2017
6c9afca
Merge branch 'adaptlearning-develop' into refactor/editor
taylortom Mar 30, 2017
1b52714
Merge branch 'thebigfix' into refactor/editor
taylortom Mar 30, 2017
bb0a8d1
Merge branch 'refactor/editor' into refactor/structure
taylortom Mar 30, 2017
8a27d0b
Add missing comma
taylortom Mar 30, 2017
61181cf
Remove files added in merge
taylortom Mar 30, 2017
1468a72
Fix logo file names
taylortom Mar 30, 2017
c9af11b
Add routing abstraction to router
taylortom Mar 31, 2017
0d30342
Add semicolon
taylortom Mar 31, 2017
7a9798c
Fix editor templates whitespace
taylortom Mar 31, 2017
11dde22
Fix loading LESS
taylortom Mar 31, 2017
2799002
Add callback to editorDataLoader.loadCourseData
taylortom Mar 31, 2017
e943419
Fix .no-projects styling
taylortom Mar 30, 2017
1ef3683
Move navigation instantiation to its module folder
taylortom Mar 30, 2017
36e756b
Refactor route handler for readability
taylortom Mar 31, 2017
3a1253e
Add defensive programming
taylortom Mar 31, 2017
ac2e21b
Switch to router wrapper function
taylortom Mar 31, 2017
b52a672
Add Origin l10n wrapper for polyglot
taylortom Mar 30, 2017
180c575
Fix component list icons and refactor file
taylortom Mar 30, 2017
dbca2ae
Remove permissions.md
taylortom Mar 31, 2017
9921932
Refactor options files
taylortom Apr 3, 2017
963c3ff
Move app initialisation code to origin.js
taylortom Apr 5, 2017
2ed2d1d
Fix permissionsView imports
taylortom Apr 5, 2017
4f1ee63
Update references to dataReady event
taylortom Apr 5, 2017
89c41de
Update references to dataReady event
taylortom Apr 5, 2017
0de8cf4
Fix broken scope reference
taylortom Apr 5, 2017
27f8335
Add editor events to help simplify routing
taylortom Apr 5, 2017
3ceded1
Fix whitespace
taylortom Apr 5, 2017
7447917
Remove unused files
taylortom Apr 5, 2017
48f1d67
Refactor context menu code
taylortom Apr 5, 2017
d03f9e3
Move context menu code to modules/
taylortom Apr 5, 2017
bea973e
Add focus event support to Origin
taylortom Apr 5, 2017
3a77f37
Move content pane files to modules/
taylortom Apr 5, 2017
80d0d62
Remove content pane loading
taylortom Apr 2, 2017
0347429
Remove permissions view
taylortom Apr 2, 2017
6288792
Fix whitespace
taylortom Apr 2, 2017
3075466
Turn off Origin.debug
taylortom Apr 2, 2017
718abd9
Add Backbone.history.start()
taylortom Apr 2, 2017
39822bf
Remove success boolean from response
taylortom Apr 6, 2017
3efee83
Refactor sessionModel
taylortom Apr 6, 2017
278ef2f
Remove extra bracket
taylortom Apr 6, 2017
4db7288
THEBIGBUGFIX: Fix form styles (#1568)
taylortom Apr 10, 2017
e7d1347
Remove logs
taylortom Apr 12, 2017
8570704
Fix bug with routing forcing trigger:true
taylortom Apr 12, 2017
905cb7d
Fix broken context menu
taylortom Apr 12, 2017
52dbf79
Fix bug with event inheritance
taylortom Apr 12, 2017
cae47fb
Refactor menu code
taylortom Apr 12, 2017
08a8b33
Refactor editorPageView
taylortom Apr 12, 2017
cb5ae8c
Amend comment
taylortom Apr 12, 2017
720738d
Remove extraneous imports
taylortom Apr 15, 2017
2832f92
Change routing functions
taylortom Apr 15, 2017
1b1faa1
Change class
taylortom Apr 15, 2017
61b0313
Refactor pluginManagement
taylortom Apr 13, 2017
576630d
Define var
taylortom Apr 15, 2017
32bc5f6
Fix Gruntfile to include libraries folder
taylortom Apr 18, 2017
59fdef2
Remove redundant code
taylortom Apr 18, 2017
f9718f3
Fix broken logic
taylortom Apr 18, 2017
25ee06c
Refactor sidebar whitespace
taylortom Apr 18, 2017
0cc427e
Refactor sessionModel instantiation
taylortom Apr 19, 2017
b7b54c5
Tidy up libraries
taylortom Apr 20, 2017
09b4580
Re-add tags styling
taylortom Apr 20, 2017
8c0b1cf
Remove log
taylortom Apr 20, 2017
f074918
Fix tag input library imports
taylortom Apr 21, 2017
e6cb8b5
Fix anonymous define error
taylortom Apr 24, 2017
589767f
Refactor project code
taylortom Apr 25, 2017
ba8c7e0
Fix polyglot reference
taylortom Apr 26, 2017
897f63d
Fix bug stopping user deletion
taylortom Apr 26, 2017
8012227
Fix plugin management enable checkbox
taylortom Apr 26, 2017
86a3bee
Fix manage extension list
taylortom Apr 26, 2017
6d2f715
Fix user delete
taylortom Apr 27, 2017
1b6c22c
Fix context menu
taylortom Apr 27, 2017
72351ff
Fix preloaded bugs
taylortom Apr 27, 2017
2d2c218
Fix event name
taylortom Apr 28, 2017
6217a3b
Update page titles
taylortom Apr 28, 2017
e6a6675
Add missing schema error
taylortom Apr 28, 2017
52843a1
Revert .gitignore
taylortom Apr 28, 2017
a1af79d
Fix callback scope
taylortom May 8, 2017
39bfe04
Add reference to menu
taylortom May 8, 2017
c275ee1
Refactor listeners
taylortom May 8, 2017
a022498
Fix event data reference
taylortom May 8, 2017
88b088f
Specify all require modules for now
taylortom May 8, 2017
a56a3f5
Fix extension rendering issue
taylortom May 8, 2017
07c670f
Rename component icons to avoid name collisions
taylortom May 8, 2017
623f6e0
Sort components by displayName
taylortom May 8, 2017
872e1a6
Fix routing bug
taylortom May 8, 2017
ed7f123
Add helpers preload
taylortom May 9, 2017
ca63c10
Merge branch 'thebigfix' into thebigbugfix/refactor
taylortom May 9, 2017
5ded9df
Set navigation background colour to stop image ‘pop in’
taylortom May 10, 2017
7c7a31d
Add backbone forms import
taylortom May 10, 2017
ec4ce9e
Fix lang string reference
taylortom May 9, 2017
4fc699e
Fix input placeholder colour
taylortom May 16, 2017
38363e0
Fix scope bug
taylortom May 16, 2017
26c4153
Fix sidebar input colours
taylortom May 18, 2017
d365e33
Fix theme picker scope issue
taylortom May 18, 2017
0897aae
Add missing helpers reference
taylortom May 18, 2017
d36da20
Fix bug with userModel saving
taylortom May 18, 2017
8945544
Fix bug with error alert
taylortom May 18, 2017
8ad52f9
Rewrite plugin update check
taylortom May 22, 2017
26553f9
Refresh plugin view on update
taylortom May 22, 2017
c918049
No more popup warning
canstudios-louisem May 18, 2017
dbd5aaf
window is now closed on build error
canstudios-louisem May 19, 2017
477db6e
Fix mouse event area
taylortom May 24, 2017
21bd60a
added route to permission check
canstudios-louisem May 25, 2017
4ea2e5e
Apply selected state to dashboard filters
taylortom May 25, 2017
989670a
Fix issue with component edit routing
taylortom May 30, 2017
064f99f
Fix issue with user view enable/disable styling
taylortom May 30, 2017
357655c
Fix back button routing
taylortom May 31, 2017
3ed1a6f
Fix page title names
taylortom May 31, 2017
b76bcea
Amend plugin update styling
taylortom Jun 1, 2017
ca90ecc
Fix broken contextMenu listeners
taylortom Jun 1, 2017
6fa38d2
Add copyID to course context menu
taylortom Jun 1, 2017
0969670
Close context menu on outside click
taylortom Jun 1, 2017
32721c1
Fix bugs with destructive Notify styling
taylortom Jun 1, 2017
22af756
Fix .row-disabled style
taylortom Jun 1, 2017
2e268bc
Restrict project tile height to ensure neat grid
taylortom Jun 7, 2017
3c119a9
Moved window open inside validity check
canstudios-louisem Jun 7, 2017
840155f
Expose maxLoginAttempts to config.json
taylortom Jun 7, 2017
3388ac5
Add userModel fetch override
taylortom Jun 7, 2017
79724c5
Fix var reference
taylortom Jun 7, 2017
9648b2b
Fix userModel URL bug
taylortom Jun 8, 2017
fc348f7
Add sidebar button Reset
taylortom Jun 8, 2017
a58e1f1
Fix editorView paste functionality
taylortom Jun 8, 2017
978b4af
Fix CO drag and drop
taylortom Jun 9, 2017
2ecf008
Revert #1586 - Add build includes to output manager
canstudios-nicolaw Jun 23, 2017
39904f7
Merge pull request #1601 from adaptlearning/issue/1512
taylortom Jul 3, 2017
fb344de
Fix spacing
taylortom Jul 3, 2017
084c362
Fix for sub-menu page deletion
taylortom Jul 3, 2017
d97d247
Revert "Restrict project tile height to ensure neat grid"
taylortom Jul 3, 2017
07582fa
Upgrade Backbone Forms; move overrides out
tomgreenfield Jul 3, 2017
5864ff2
Fix button position
taylortom Jul 3, 2017
7d5ee6d
Change Boolean selects to checkboxes
tomgreenfield Jul 4, 2017
c4fb1d8
Fix bug with help wiki links
taylortom Jul 5, 2017
29f6969
Remove duplicate overflow
taylortom Jul 5, 2017
56fd41f
Merge pull request #1551 from CanStudios/issue/1032
taylortom Jul 5, 2017
e7deb92
Fix scrolling
taylortom Jul 5, 2017
b859b5b
Refactor event listening
taylortom Jul 6, 2017
db1bd15
Switch to use reRender
taylortom Jul 6, 2017
c0bf1ae
Remove unused listener
taylortom Jul 6, 2017
ea18552
Fix create user error
canstudios-nicolaw Jul 11, 2017
581f13b
Change container div
taylortom Jul 12, 2017
f3d15a7
Minor refactor
taylortom Jul 12, 2017
1779941
Change containers to fix scrolling
taylortom Jul 12, 2017
185a4d1
Amend whitespace
taylortom Jul 12, 2017
33c07e9
Fix block move event trigger
taylortom Jul 12, 2017
5a4f8b9
Fix reference to missing var
taylortom Jul 14, 2017
01f45a6
Merge pull request #1669 from adaptlearning/issue/1380
taylortom Jul 17, 2017
cede8f4
Remove reference to specific node version
taylortom Jul 21, 2017
34680be
Remove ES6 code to fix build:prod
taylortom Jul 21, 2017
b145d2b
Remove ES6 code to fix build:prod
taylortom Jul 21, 2017
fc43134
Fix bug whereby removing last extension doesn’t update UI
taylortom Jul 24, 2017
1f02bb1
Change isPreview to 3 way mode
canstudios-nicolaw Jul 25, 2017
20bb544
Merge pull request #1598 from adaptlearning/thebigbugfix/1524
taylortom Jul 26, 2017
f0d48ef
Add semicolons
taylortom Jul 26, 2017
d6fcb2a
Merge pull request #1640 from CanStudios/issue/1636
taylortom Jul 26, 2017
eb54a7e
Fix issue with extensions settings showing on new courses
taylortom Jul 27, 2017
7e05469
Fix bug with menu layers double rendering
taylortom Jul 27, 2017
1461830
Remove code export from course context menu
taylortom Jul 27, 2017
aac4bf1
Fix user registration error message
canstudios-nicolaw Jul 28, 2017
ff10c76
Merge pull request #1627 from adaptlearning/thebigbugfix/refactor
taylortom Jul 28, 2017
6ccb582
Remove extra else
canstudios-nicolaw Jul 28, 2017
2c75407
Merge branch 'develop' into thebigfix
taylortom Jul 28, 2017
4a05f05
Merge pull request #1680 from CanStudios/issue/1677
taylortom Jul 28, 2017
d3122fa
Merge branch 'develop' into thebigfix
taylortom Jul 28, 2017
b1f970a
Reinstate custom list classes
tomgreenfield Jul 28, 2017
803d736
Fix imports
taylortom Jul 28, 2017
ab5167e
Fix image url
taylortom Jul 28, 2017
8cc0ba0
Shorten GA code
taylortom Jul 28, 2017
7dc0e04
Switch to use 2-space indentation
taylortom Jul 28, 2017
a2b3519
Remove fetch from reset
taylortom Jul 31, 2017
b8697cc
Merge pull request #1668 from adaptlearning/issue/1544
taylortom Jul 31, 2017
b31c721
Merge pull request #1559 from adaptlearning/thebigbugfix/ffmpeg
taylortom Jul 31, 2017
fdff919
Merge pull request #1687 from adaptlearning/issue/1685
taylortom Jul 31, 2017
79f43dd
Merge pull request #1670 from adaptlearning/thebigfix
taylortom Jul 31, 2017
aa91284
Merge pull request #1664 from CanStudios/issue/1623
taylortom Jul 31, 2017
937c6a8
Use variables for font weights
tomgreenfield Jul 31, 2017
95be761
Update mocha tests
taylortom Jul 31, 2017
e7f15c5
Expose logger level
taylortom Jul 31, 2017
414c5d8
Fix tenant deletion
taylortom Jul 31, 2017
551aeab
Remove old tests
taylortom Aug 1, 2017
4d1bbda
Tidy up imports
taylortom Aug 1, 2017
b17c84a
Add route to ignores
taylortom Aug 1, 2017
1948ddd
Pass result to delete function
taylortom Aug 1, 2017
2c3b85e
Refactor error handling
taylortom Aug 1, 2017
35c047c
Fix destroyRole
taylortom Aug 1, 2017
a6f37d1
Fix removeDirectory
taylortom Aug 1, 2017
70085da
Add comment
taylortom Aug 1, 2017
c32ff09
tests now allways start with a clean db
canstudios-louisem Aug 2, 2017
00c2117
fix tests, upgrade should
canstudios-louisem Aug 2, 2017
5612b98
Rename references to tenant record results for clarity
taylortom Aug 2, 2017
c53225b
Move data folder cleanup and rename various things for readability
taylortom Aug 2, 2017
5b05625
Alter tests to stop error messages
taylortom Aug 2, 2017
2ec97e8
Amend testData
taylortom Aug 2, 2017
d5954aa
Update config files
taylortom Aug 2, 2017
9593030
Remove log
taylortom Aug 2, 2017
295d0c8
Only show logger errors
taylortom Aug 3, 2017
1a26349
Remove sidebar progress bars
tomgreenfield Aug 4, 2017
cc19a42
Fix heading
taylortom Aug 9, 2017
bdba39f
Remove unused files
taylortom Aug 9, 2017
ff15370
Switch to use grunt test task
taylortom Aug 10, 2017
b6bf953
Tidy up mocha config
taylortom Aug 10, 2017
db8e131
Update mocha
taylortom Aug 10, 2017
c81986c
Update package.json prior for next release
taylortom Aug 10, 2017
8a9fed1
Temporarily disable casperjs tests
taylortom Aug 10, 2017
5c3bd8e
Add grunt to deps
taylortom Aug 10, 2017
3f55c62
Reinstate longer timeout
taylortom Aug 10, 2017
a5a1b36
Add extended timeout to after() in addition to before()
taylortom Aug 10, 2017
e79b020
Remove test data both before and after tests
taylortom Aug 10, 2017
08b7ad1
Fix asset preview in place
taylortom Aug 11, 2017
f55057d
Merge pull request #1691 from adaptlearning/issue/1502
taylortom Aug 11, 2017
b95fe36
Merge branch 'develop' into issue/1695
taylortom Aug 11, 2017
b80dda9
Bump timeout for Travis
taylortom Aug 11, 2017
818b430
Merge branch 'develop' into issue/1503
taylortom Aug 11, 2017
f1cb47e
Merge branch 'develop' into issue/1328
taylortom Aug 11, 2017
9bda630
Merge branch 'develop' into issue/1638
taylortom Aug 11, 2017
e4a0997
Merge pull request #1699 from adaptlearning/travisTimeout
taylortom Aug 15, 2017
ff77f07
fix auth source issue
canstudios-louisem Aug 15, 2017
494ad8f
Merge branch 'develop' into issue/1638
taylortom Aug 15, 2017
827392a
Remove grunt-casperjs from dependencies
taylortom Aug 16, 2017
58c8dc4
Merge pull request #1690 from adaptlearning/issue/1638
taylortom Aug 16, 2017
aab8232
Remove test_frontend/
taylortom Aug 16, 2017
c439765
Merge pull request #1674 from CanStudios/custom-auth-source
taylortom Aug 16, 2017
67d8367
Merge pull request #1693 from adaptlearning/issue/1328
taylortom Aug 16, 2017
2b973fa
Merge pull request #1694 from adaptlearning/issue/1503
taylortom Aug 16, 2017
8aab60f
Merge pull request #1696 from adaptlearning/issue/1695
taylortom Aug 16, 2017
a51fed7
Merge pull request #1706 from adaptlearning/issue/1704
canstudios-louisem Aug 18, 2017
dd34a9e
Populate new courses so that they can be previewed
canstudios-nicolaw Jul 13, 2017
7a3a07a
Add block layout options
canstudios-nicolaw Jul 28, 2017
f473c29
localise body text
canstudios-louisem Aug 4, 2017
111c1ee
rebase and fix conflicts plus broken stuff
canstudios-louisem Aug 4, 2017
c55ce83
Localise page title, remove initialize function from models
canstudios-nicolaw Aug 7, 2017
2fe2a34
Refactor nesting
canstudios-nicolaw Aug 9, 2017
4f4cdae
revert image changes
canstudios-louisem Aug 10, 2017
e0f10db
Merge pull request #1683 from CanStudios/issue/1678
taylortom Aug 21, 2017
6233767
Merge branch 'develop' into danielstorey/issue/1631
taylortom Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 2 additions & 5 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

/data

/frontend/src/adaptbuilder/css/adapt.css
/frontend/src/adaptbuilder/css/adapt.css.map
/frontend/src/adaptbuilder/css/adapt.css.map.imports
/frontend/src/adaptbuilder/js/
/frontend/build

/frontend/src/modules/modules.js
/frontend/src/plugins/plugins.js
/frontend/src/templates/templates.js

Expand Down Expand Up @@ -39,4 +37,3 @@ version.json
.vagrant
.env
.project
*.iml
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ before_install:
- mongod --version
- npm install -g adapt-cli
- adapt --version
- npm install -g grunt-cli

install:
- npm config set spin false
Expand Down
Loading