| Commit message (Collapse) | Author | Age |
... | |
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | | |
Integration
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | |_|_|_|_|_|/ /
| | | | | |/| | | | | | |
| | | | | | | | | | | | | |
integration
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
integration
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|/ / / / / /
| | | | |/| | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Conflicts:
js/controllers/document-controller.js
|
| | | | |_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
File io - drawing the layout on open and make models
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Added a temp fix to parse out the app url that is placed in the CSS styles.
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
Saving CSS in <style> tags, need to implement saving CSS to files.
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | |
FileIO branch pull request
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
stale element
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | |