Henry Oswald
|
5759c381b1
|
create templates dir
|
2016-05-23 12:51:49 +01:00 |
|
Henry Oswald
|
ba2ef4f6bd
|
move init scripts to init dir
|
2016-05-23 12:43:26 +01:00 |
|
Henry Oswald
|
f33d82088e
|
use dir of versions not version
|
2016-05-23 12:39:06 +01:00 |
|
James Allen
|
82e00ce700
|
ignore api-data
|
2016-05-23 11:38:09 +00:00 |
|
James Allen
|
9b1189bf17
|
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
|
2016-05-23 10:37:58 +00:00 |
|
Henry Oswald
|
fc11c63ac1
|
add git ignore
|
2016-05-23 11:37:43 +01:00 |
|
Henry Oswald
|
7eebc60aa5
|
added docker and and templates options for server pro
|
2016-05-23 11:30:25 +01:00 |
|
Henry Oswald
|
3f7623f970
|
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
|
2016-05-23 10:31:43 +01:00 |
|
Henry Oswald
|
a24f635531
|
removed uneeded passing of clsiServer to _parseOutputFiles and improve logging
|
2016-05-21 10:23:17 +01:00 |
|
James Allen
|
d5b133de1a
|
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
|
2016-05-20 16:16:00 +00:00 |
|
Henry Oswald
|
d1fd00ae7a
|
Merge pull request #43 from heukirne/master
add support for grunt build
|
2016-05-20 17:15:39 +01:00 |
|
Brian Gough
|
7f332c0436
|
support url object with query-string when proxying to clsi
|
2016-05-20 16:51:19 +01:00 |
|
Brian Gough
|
3c5eb9a730
|
clean up whitespace
|
2016-05-20 16:35:00 +01:00 |
|
Shane Kilkelly
|
0c454f5ddd
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-05-20 14:34:55 +01:00 |
|
Shane Kilkelly
|
2441930fe9
|
Add a spinner when waiting for image preview to load.
|
2016-05-20 14:28:51 +01:00 |
|
Henry Oswald
|
b6e581756a
|
Merge pull request #246 from sharelatex/clsi-dynamic-load
Clsi dynamic load
|
2016-05-20 14:25:27 +01:00 |
|
Henry Oswald
|
c918028d14
|
removed clsi priorty url
|
2016-05-20 12:46:14 +01:00 |
|
Henry Oswald
|
11724fce13
|
Merge branch 'master' into clsi-dynamic-load
|
2016-05-20 12:34:42 +01:00 |
|
Brian Gough
|
eaa41e4361
|
support displaying output files using .url parameter from clsi
|
2016-05-20 11:34:22 +01:00 |
|
Shane Kilkelly
|
939c7a8c72
|
Force reload BinaryFile view when a new object is selected.
|
2016-05-20 11:20:00 +01:00 |
|
Brian Gough
|
bd55e18d6b
|
be ready to serve files from per-user containers
|
2016-05-20 10:23:07 +01:00 |
|
Brian Gough
|
340fef38a9
|
fix error in log for expiry timeout
|
2016-05-20 10:23:07 +01:00 |
|
Shane Kilkelly
|
2e2354c574
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-05-20 09:17:35 +01:00 |
|
Shane Kilkelly
|
9a6876d237
|
Toggle the dots at the end of bib preview, based on size of payload.
|
2016-05-20 09:17:25 +01:00 |
|
Henry Oswald
|
786b9cdb84
|
Merge branch 'master' of https://github.com/sharelatex/clsi-sharelatex
|
2016-05-19 16:57:19 +01:00 |
|
Henry Oswald
|
9c873f99ba
|
log out EXPIRY_TIMEOUT
|
2016-05-19 16:57:14 +01:00 |
|
Henry Oswald
|
61b9a683aa
|
put clsiCookie vals into subobject in settings
|
2016-05-19 16:55:58 +01:00 |
|
Henry Oswald
|
9ae37d1814
|
make cached assets ttl set via config
|
2016-05-19 16:51:50 +01:00 |
|
Brian Gough
|
07401c5a45
|
avoid clobbering the existing port variable
|
2016-05-19 16:38:18 +01:00 |
|
Brian Gough
|
e286aede4e
|
return the file path in the output file list for easy lookup
|
2016-05-19 16:38:18 +01:00 |
|
Henry Oswald
|
04e70735d2
|
Merge branch 'master' into clsi-dynamic-load
|
2016-05-19 16:26:54 +01:00 |
|
Henry Oswald
|
f03a076669
|
make cash bust add onto object not recreate it
|
2016-05-19 16:23:56 +01:00 |
|
Brian Gough
|
5497eb86d1
|
Merge pull request #245 from sharelatex/clean-up-log-requests-in-pdf-controller
clean up log requests, avoid requesting blg file when not present
|
2016-05-19 16:13:21 +01:00 |
|
Shane Kilkelly
|
0ea16f0bcc
|
Index '.bib' file objects.
|
2016-05-19 14:58:12 +01:00 |
|
Henry Oswald
|
789257fd4a
|
use cookie key when setting cookie for jar
|
2016-05-19 13:52:18 +01:00 |
|
Henry Oswald
|
036b179ffe
|
put the clsiserverid onto qs object for correct server allocation
|
2016-05-19 13:28:20 +01:00 |
|
Henry Oswald
|
2abebd850c
|
Merge branch 'project_url_query' into clsi-dynamic-load
|
2016-05-19 13:08:20 +01:00 |
|
Shane Kilkelly
|
b649c13c17
|
Eliminate weird flicker when loading bibtex
|
2016-05-19 11:25:24 +01:00 |
|
Shane Kilkelly
|
b70a993572
|
Make bib previews more robust.
|
2016-05-19 11:11:23 +01:00 |
|
Shane Kilkelly
|
199844db2d
|
Fix styling of the bib-loading div.
|
2016-05-19 10:02:46 +01:00 |
|
Shane Kilkelly
|
3c298ed6ad
|
Preview up to Two Megabytes of bib files
|
2016-05-19 10:02:25 +01:00 |
|
Shane Kilkelly
|
5df5ba868c
|
Fix logic for showing error or loading message.
|
2016-05-19 10:02:07 +01:00 |
|
Shane Kilkelly
|
4509642914
|
use highlight colour for any font-awesome icons in file-tree.
|
2016-05-18 16:34:50 +01:00 |
|
Brian Gough
|
6305cea3e3
|
clean up log requests, avoid requesting blg file when not present
|
2016-05-18 16:17:38 +01:00 |
|
Shane Kilkelly
|
10f64004fc
|
Show a book icon for *.bib files.
|
2016-05-18 15:58:24 +01:00 |
|
James Allen
|
d813f45d28
|
Cherry-pick 0e70320 (Select icon based on file extension) from datajoy
|
2016-05-18 15:58:01 +01:00 |
|
Henry Oswald
|
d2cc75b73f
|
changed $scope.pdf.clsiServerId to ide.clsiServerId
|
2016-05-18 14:38:17 +01:00 |
|
Henry Oswald
|
dba8d96d11
|
pass clsiServerId to the client and use it as query stirng for requests
|
2016-05-18 12:50:50 +01:00 |
|
Shane Kilkelly
|
8621d497b4
|
Fix view so that bib preview only shows for bib files
|
2016-05-18 11:14:24 +01:00 |
|
Henry Oswald
|
b0baea5073
|
add query string to end of project resources
|
2016-05-18 10:09:22 +01:00 |
|