Brian Gough
5ad3fd769d
preserve original /status message
2017-07-04 12:42:54 +01:00
Brian Gough
b2f676af5a
avoid duplicate routes for /status
2017-07-04 12:41:51 +01:00
Brian Gough
dbbc4966d8
Merge pull request #513 from sharelatex/bg-split-web-and-web-api
...
split web and web api
2017-07-04 08:51:00 +01:00
Paulo Reis
86e66bbed1
Merge branch 'master' into pr-angular-1.6.x
2017-07-03 09:50:01 +01:00
Shane Kilkelly
b73b78e570
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2017-06-27 08:24:24 +01:00
Shane Kilkelly
0d5d59bb66
Remove user
field from log, var not in scope
2017-06-26 13:56:22 +01:00
Paulo Reis
1bc38b2ea7
Use Angular minified bundle.
2017-06-26 10:07:15 +01:00
Henry Oswald
3da5ef818c
null check subscription for group admin panel
2017-06-22 14:07:07 +01:00
Paulo Reis
ddee75e479
Use a getterSetter to manage int values in settings.
2017-06-20 17:08:53 +01:00
Paulo Reis
eab00c95df
Include Angular 1.6.
2017-06-20 11:49:33 +01:00
Brian Gough
bac275962f
put /ip on web router
2017-06-19 15:54:57 +01:00
Brian Gough
d32a3fbaf5
support status and health check on web and web-api
2017-06-19 15:54:14 +01:00
Brian Gough
02cb0f2295
make compiler health check available on web
2017-06-19 15:52:04 +01:00
Brian Gough
62d6933886
use settings instead of ENV for web/api split
2017-06-15 16:11:20 +01:00
Brian Gough
1ecabaa611
Revert "update pdfjs to v1.8.188"
...
This reverts commit 189e48dcc00f530eff674cc4a2b87c06814d45ff.
2017-06-15 11:14:01 +01:00
Shane Kilkelly
5a6415d3f8
Add logging for Labels http actions
2017-06-15 08:56:48 +01:00
Shane Kilkelly
9607174b64
Merge branch 'master' into sk-server-side-labels-loading
2017-06-15 08:49:14 +01:00
Shane Kilkelly
5e37b1dac1
Move logic for selectively loading labels.
...
Only load labels if the user has write permission
2017-06-14 13:26:02 +01:00
Brian Gough
9687daf97f
Merge pull request #520 from sharelatex/bg-upgrade-pdfjs-1.8.188
...
upgrade pdfjs 1.8.188
2017-06-13 16:46:10 +01:00
Shane Kilkelly
3b066758bb
Don't load labels for anonymous/read-only users
2017-06-13 14:06:00 +01:00
Shane Kilkelly
b97becc7a2
Change getLabelsForDoc
to broadcastLabelsForDoc
2017-06-13 11:38:15 +01:00
Shane Kilkelly
a3dbb16e50
Flush project before getting all project labels
2017-06-13 11:15:26 +01:00
Shane Kilkelly
bd6133aadb
Remove callback-pattern from label parsers
2017-06-13 11:10:21 +01:00
Shane Kilkelly
c25b6b792d
Namespace the document route under /doc/
2017-06-13 10:57:51 +01:00
Shane Kilkelly
26be4f84d0
Re-use parser
2017-06-12 15:15:14 +01:00
Shane Kilkelly
0a491a4f13
Add comment, explain flushing of doc to mongo
2017-06-12 13:09:13 +01:00
Shane Kilkelly
ff4991284d
Change docLabelsUpdated
socket event to broadcastDocLabels
2017-06-12 13:06:56 +01:00
Shane Kilkelly
234a2d0e21
Remove cruft
2017-06-12 11:37:34 +01:00
Shane Kilkelly
9f9468d0e0
Use lowercase project_id
2017-06-12 11:37:05 +01:00
James Allen
7137ab643f
Merge pull request #523 from sharelatex/ja-removing-group-holding-accounts
...
Use an email based invite system for groups, not holding accounts
2017-06-09 11:36:42 +01:00
Shane Kilkelly
5443b92e7d
Move state management into LabelsMaster on the ide
2017-06-09 11:28:27 +01:00
Paulo Reis
cc7f44737e
Tell Angular to avoid parsing the value attribute.
2017-06-08 16:02:28 +01:00
Shane Kilkelly
965a46291b
Only fetch labels for uploaded docs, not files
2017-06-08 15:55:17 +01:00
Shane Kilkelly
ff7955dfdb
Update labels when docs are uploaded or removed
2017-06-08 15:12:18 +01:00
James Allen
4cecbae6b6
Use an email based invite system for groups, not holding accounts
2017-06-08 12:12:08 +01:00
Shane Kilkelly
feb1d87de1
Add test for LablesHandler
2017-06-08 10:25:39 +01:00
Shane Kilkelly
c7dbd21cd1
use flag on aceEditor to enable autocomplete features
2017-06-08 09:22:08 +01:00
Paulo Reis
19ecffd654
Merge branch 'master' into pr-aggregate-insert-delete
2017-06-06 17:04:31 +01:00
Paulo Reis
34796b18c5
Add translation keys.
2017-06-06 16:46:36 +01:00
Brian Gough
ecf0857756
update pdfjs to v1.8.188
2017-06-06 12:19:13 +01:00
Brian Gough
b277ee3254
Merge pull request #511 from sharelatex/bg-handle-web-api-errors
...
use a separate error handler for api router errors
2017-06-06 09:22:28 +01:00
Paulo Reis
e616a62d68
Save entry ids inside entry object, not only as the key.
2017-06-05 16:29:55 +01:00
Shane Kilkelly
f7ad4a4786
WIP: basically working, with client sync
2017-06-05 14:48:50 +01:00
James Allen
d7981fd2d4
Merge pull request #512 from sharelatex/ja-project-name-validation
...
Refactor project name validation into one place and restrict /s
2017-06-05 11:55:39 +01:00
Paulo Reis
d4ac91f75e
Use correct handlers in directives.
2017-06-05 10:52:11 +01:00
Shane Kilkelly
f29320dd93
Add ability to load labels from single document
2017-06-05 09:26:13 +01:00
Shane Kilkelly
4cb41a988a
WIP: initial work on server-side labels
2017-06-02 15:12:59 +01:00
Paulo Reis
e2edf4184f
Explicit naming.
2017-06-02 11:43:43 +01:00
Paulo Reis
2a0454f2f1
Integrate aggregate changes with bulk actions.
2017-06-01 15:18:43 +01:00
Paulo Reis
1490ea7b04
Change aggregated change model: the main change is now the insertion, deletion is stored in metadata.
2017-06-01 15:03:37 +01:00
Paulo Reis
11c0644490
Aggregate changes; make accept and reject work.
2017-06-01 11:47:55 +01:00
Shane Kilkelly
6b746f757e
Merge pull request #514 from sharelatex/ja-update-raven
...
Update Raven (Sentry lib) to 3.15.0 in client
2017-06-01 09:13:40 +01:00
Shane Kilkelly
5847973615
Merge pull request #515 from sharelatex/ja-editable-asy-files
...
Make .asy files editable when uploaded
2017-06-01 09:13:25 +01:00
Paulo Reis
b6cef2e3d7
Include directive; add some styling.
2017-05-31 15:53:14 +01:00
James Allen
e2be4b6293
Make .asy files editable when uploaded
2017-05-22 17:12:01 +01:00
James Allen
32b27766bc
Update Raven (Sentry lib) to 3.15.0 in client
2017-05-22 16:45:50 +01:00
James Allen
59085c1ddd
Add missing require stubs and remove console.logs in unit tests
2017-05-22 15:33:52 +01:00
Brian Gough
4b188ce120
support separate processes for web and api
...
via an environment variable WEB_TYPE
2017-05-22 13:31:02 +01:00
Paulo Reis
8dfb91fa6f
Blur toggler after clicking.
2017-05-22 11:11:26 +01:00
James Allen
ba62206b91
Refactor project name validation into one place and restrict /s
2017-05-19 17:42:24 +01:00
Brian Gough
5ac2ed8fc6
use a separate error handler for api router errors
2017-05-19 16:36:29 +01:00
Paulo Reis
914e50f3f6
Add new review-related hotkeys; re-arrange hotkeys modal.
2017-05-19 15:52:04 +01:00
Paulo Reis
15980d5427
Merge branch 'master' into pr-hide-review-panel
2017-05-19 15:31:14 +01:00
Paulo Reis
957b201fc1
Add commenting and track-changes keyboard shortcuts.
2017-05-19 15:28:49 +01:00
James Allen
76b8fecde9
Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster
...
Don't try to set the server id if it isn't returned in the response
2017-05-19 15:00:18 +01:00
James Allen
01548a0216
Don't try to set the server id if it isn't returned in the response
2017-05-19 10:23:01 +01:00
Paulo Reis
e532f543a3
Merge branch 'master' into pr-bulk-actions
2017-05-18 14:38:16 +01:00
James Allen
39ca6d1e6c
Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster
...
Check for blank string in clsi cookie caching
2017-05-18 11:12:11 +01:00
James Allen
f708a0cd81
Check for blank string in clsi cookie caching
...
ioredis returns "" for a blank entry, the previous driver returned null,
so also check for a blank string
2017-05-18 11:09:33 +01:00
Paulo Reis
832764dd3d
Add key shortcut to toggle the review panel.
2017-05-18 11:02:50 +01:00
Paulo Reis
5a9519d18f
Add a toggler element inside the review panel.
2017-05-17 16:41:53 +01:00
Brian Gough
5237647b8b
Merge pull request #489 from sharelatex/bg-improve-upload-robustness
...
improve stream error handling on upload
2017-05-17 15:26:03 +01:00
Shane Kilkelly
6338835baf
Merge branch 'sk-sudo-mode'
2017-05-17 09:48:22 +01:00
Shane Kilkelly
4e3284cec8
Merge branch 'sk-dont-redirect-to-images'
2017-05-17 09:48:16 +01:00
Shane Kilkelly
25e0a19350
Make confirm-password routes more restful
2017-05-16 11:51:06 +01:00
Brian Gough
e23871118d
Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness
2017-05-15 16:01:01 +01:00
Shane Kilkelly
60d3e4a97b
If external auth system is in use, skip sudo-mode checks
2017-05-15 15:46:24 +01:00
Shane Kilkelly
707a81cc2a
Correct title of confirm-password page
2017-05-15 15:46:11 +01:00
James Allen
5aa8b71832
Allow writing of clsi cookie cache to redis cluster secondary
2017-05-15 15:35:01 +01:00
Shane Kilkelly
1d7d0193fc
Use translations for sudo-mode prompt
2017-05-15 13:37:54 +01:00
Shane Kilkelly
1f7724be68
Merge branch 'sk-sudo-mode' of github.com:sharelatex/web-sharelatex into sk-sudo-mode
2017-05-15 11:54:14 +01:00
Shane Kilkelly
c864288c4e
On logout, clear sudo mode
2017-05-15 11:53:52 +01:00
James Allen
17b064df18
Adjust style of sudo mode prompt
2017-05-15 11:45:41 +01:00
Shane Kilkelly
0f75d9f4d9
Test SudoModeController
2017-05-15 10:56:43 +01:00
Paulo Reis
82a19444b3
Merge branch 'master' into pr-bulk-actions
2017-05-15 10:29:15 +01:00
Shane Kilkelly
76285a1554
Start testing SudoModeController
2017-05-15 10:07:22 +01:00
Shane Kilkelly
8605dc83b4
Merge branch 'master' into sk-sudo-mode
2017-05-15 09:21:13 +01:00
Shane Kilkelly
0e26222551
Don't redirect to images, icons, etc, in login workflow
2017-05-12 15:46:16 +01:00
Paulo Jorge Reis
d550ede112
Merge pull request #496 from sharelatex/pr-review-panel-relayout
...
Review panel relayout
2017-05-12 13:54:59 +01:00
Shane Kilkelly
1640dfa79a
Merge branch 'sk-fix-cooldown-tpds'
2017-05-12 09:11:23 +01:00
James Allen
3bfd92dd9c
Rename lock to avoid potential conflict with doc updater
2017-05-11 15:27:01 +01:00
Shane Kilkelly
7b0aca7f02
add cooldown to tpds mergeUpdate
path
2017-05-11 11:29:57 +01:00
Paulo Reis
a3ab994ab3
Use the same watcher to control miniRP visibility and trigger Ace resizing.
2017-05-11 10:17:25 +01:00
Shane Kilkelly
a08dd26ef3
Remove CooldownMiddlewear from Tpds routes
2017-05-11 10:07:04 +01:00
Shane Kilkelly
e6286c721d
Merge branch 'master' into sk-fix-large-projects
2017-05-11 08:40:17 +01:00
Shane Kilkelly
01ee104f77
Revert "update to newest mongoose"
...
This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.
2017-05-10 15:31:17 +01:00
Shane Kilkelly
08567ff220
if projectId is not defined, error out
2017-05-10 15:25:23 +01:00
Shane Kilkelly
b8e4cafd81
Fix log line
2017-05-10 15:16:36 +01:00
Shane Kilkelly
27842996aa
start testing SudoModoController
2017-05-10 15:15:57 +01:00
James Allen
274d6f4ac6
Merge pull request #493 from sharelatex/ja-redis-cluster-refactor
...
Move all redis end points to be cluster compatible
2017-05-10 14:38:37 +01:00
Shane Kilkelly
08fd501ce2
Add a hint to the sudo-mode prompt
2017-05-10 11:36:35 +01:00
Shane Kilkelly
16128288a9
Add sudo-mode protection to sessions page
2017-05-10 11:36:19 +01:00
Shane Kilkelly
5a97521b04
Fix typo in log message
2017-05-10 11:36:05 +01:00
Shane Kilkelly
a3a2108526
Increase sudo-mode time to one hour
2017-05-10 11:35:47 +01:00
Shane Kilkelly
094784b6d5
protect settings page with sudo-mode middlewear
2017-05-10 10:25:32 +01:00
Shane Kilkelly
029c96c7cc
Add sudo-mode 'confirm password' prompt
2017-05-10 10:05:48 +01:00
Paulo Reis
f3e020df7e
Add dialog to confirm bulk actions.
2017-05-09 16:06:19 +01:00
Shane Kilkelly
fd0176c0cf
if project goes over maximum allowed files, put on cooldown
2017-05-09 14:20:29 +01:00
Shane Kilkelly
8e90b7fb9b
Add Cooldown to Tpds routes
2017-05-09 13:54:11 +01:00
Shane Kilkelly
149e38855f
Add a cooldown mechanism for projects which go over limits
2017-05-09 11:40:42 +01:00
Shane Kilkelly
c5c0364d49
update to newest mongoose
2017-05-08 16:09:59 +01:00
Paulo Reis
3ced808411
Use a single accept changes method.
2017-05-05 15:19:31 +01:00
James Allen
014e3afb36
Don't call sync functions inside async
...
Calling sync functions inside async can trigger the node max stack size.
Instead, build up our unique list of ids in advance, so we only call a
method in async for each user we actually need to look up, asynchronously.
Then use all the cached values synchronously afterwards.
2017-05-04 17:04:20 +01:00
Paulo Reis
19828d3c5b
Basic bulk accept support.
2017-05-04 15:33:47 +01:00
James Allen
8449b0417c
Move all redis end points to be cluster compatible
2017-05-04 15:22:54 +01:00
Paulo Reis
6662ec34ae
Only show bulk actions when n changes > 1.
2017-05-04 11:30:05 +01:00
Paulo Jorge Reis
20433327b8
Merge pull request #490 from sharelatex/pr-align-pdf-icon
...
Use header button classes in the PDF button.
2017-05-04 09:59:11 +01:00
Paulo Jorge Reis
9d2d217d35
Merge pull request #491 from sharelatex/pr-project-list-improvements
...
Project list improvements
2017-05-04 09:59:02 +01:00
Paulo Reis
05d9bf47d1
Use entry ids instead.
2017-05-03 16:53:04 +01:00
Paulo Reis
bf7bf701ed
Store selected entries; improve visibility logic.
2017-05-03 16:35:58 +01:00
Paulo Reis
0249a13012
Add bulk actions as in-editor widgets.
2017-05-03 11:41:17 +01:00
Paulo Reis
3f441ff38c
Count entries within selection; only show bulk actions if there are selected entries.
2017-05-02 17:02:30 +01:00
Paulo Reis
e2eaf6619e
Bulk actions directive; include it in the review panel.
2017-05-02 16:15:40 +01:00
Paulo Reis
76ea497b33
Use a single entry for bulk actions.
2017-05-02 15:43:45 +01:00
Paulo Reis
d874eb70f8
Add and remove bulk accept and reject entries with selections.
2017-05-02 15:34:05 +01:00
Paulo Reis
d71296da9f
Add row clicking in the projects list.
2017-05-01 17:11:03 +01:00
Paulo Reis
208f021bd0
Actually remove project from tag, inline.
2017-05-01 16:00:25 +01:00
Paulo Reis
2708fdf159
Add a button to allow inline removal of tags.
2017-05-01 15:43:44 +01:00
Paulo Reis
bca916d504
Use header button classes in the PDF button.
2017-05-01 15:04:08 +01:00
Paulo Reis
9fb166d2b3
Style improvements.
2017-04-28 17:09:34 +01:00
Paulo Reis
6e40284099
Add untagged projects counter.
2017-04-28 16:57:37 +01:00
Brian Gough
679680532f
improve stream error handling on upload
2017-04-28 14:47:18 +01:00
Paulo Reis
84a2658259
Add an untagged filter in the projects list.
2017-04-28 12:11:51 +01:00
Brian Gough
46f693519a
return 404 for api request on missing doc
2017-04-27 16:41:53 +01:00
Henry Oswald
3bdd5a4a2e
Merge pull request #483 from sharelatex/ja-dont-fail-on-tpdsworker-error
...
Continuing flushing document on tpds worker error
2017-04-25 09:19:13 +01:00
Henry Oswald
5d55e383c7
Merge pull request #485 from sharelatex/sk-warn-on-zip-failure
...
when the uploaded file is not a zip, warn instead of error
2017-04-25 09:18:17 +01:00
Henry Oswald
f5267ac6ee
Merge pull request #481 from sharelatex/ja-encode-project-names
...
Error if no project returned from joinProject
2017-04-25 09:17:59 +01:00
Henry Oswald
efe5e9efb0
Merge pull request #484 from sharelatex/ho-rate-limit-compiles
...
added rate limit to compile endpoint
2017-04-25 09:17:27 +01:00
Henry Oswald
c733925a26
show rate limit message when compiled too much
2017-04-24 15:56:09 +01:00
Shane Kilkelly
779336e5b0
when the uploaded file is not a zip, warn instead of error
2017-04-13 15:12:54 +01:00
Shane Kilkelly
8d6370026e
Merge pull request #479 from sharelatex/pr-fix-favicon-path
...
Fetch favicon and related assets from root.
2017-04-13 13:09:29 +01:00
Shane Kilkelly
e4e8520f27
Merge branch 'node-6.9'
2017-04-13 10:10:43 +01:00
Henry Oswald
65b83f2c67
added space before email for closed site
2017-04-12 17:04:12 +01:00
Shane Kilkelly
a9b8b864df
Move content-disposition setting into a method on res
2017-04-12 16:00:02 +01:00
Shane Kilkelly
02d75deaa0
when setting content-disposition, uri-encode names
2017-04-12 09:31:59 +01:00
Henry Oswald
0961a034ea
added rate limit to compile endpoint
2017-04-11 16:08:38 +01:00
James Allen
6d2f18016f
Move tpds worker error ignoring logic into tpdsUpdateSender
2017-04-11 15:41:17 +01:00
James Allen
7c8f228f48
Continuing flushing document on tpds worker error
2017-04-11 14:02:08 +01:00
Shane Kilkelly
f398e87e6f
Merge branch 'master' into node-6.9
2017-04-11 11:34:53 +01:00
James Allen
f6bd949f01
Error if no project returned from joinProject
...
socket.io seems to choke on the unicode project name and just return
undefined when it fails to parse the JSON. I've improved the escaping
of the user data on HTML load, but reporting an error is the best we
can easily do on joinProject via websockets.
2017-04-10 12:03:39 +01:00