Paulo Reis
61b57905cb
Merge branch 'master' into pr-contact-form-suggestions
2016-07-12 10:48:37 +01:00
Henry Oswald
a9f3a29b72
moved translations to dev dependency so its not included in shrinkwrap.
2016-07-12 10:17:58 +01:00
Paulo Reis
785bf1b5a2
New key for the message label.
2016-07-11 16:24:06 +01:00
Paulo Reis
02ba277473
Small styling fixes.
2016-07-11 16:21:35 +01:00
Brian Gough
b546c5eee9
cleanup, remove comments
2016-07-11 15:07:06 +01:00
Brian Gough
4b1ec24bc0
cancel existing load/render tasks correctly
2016-07-11 15:01:58 +01:00
Brian Gough
f68ab1e508
improve loading indicators
2016-07-11 15:01:24 +01:00
Paulo Reis
af93ac4413
Track suggestions usage.
2016-07-11 14:27:07 +01:00
Paulo Reis
9ef78b4bc2
Merge branch 'master' into pr-contact-form-suggestions
2016-07-11 13:54:06 +01:00
Paulo Reis
fb7c437098
Make other Algolia clients use the common factory.
2016-07-11 12:31:52 +01:00
Paulo Reis
bf67fedc73
Centralize Algolia methods in a common factory.
2016-07-11 12:24:48 +01:00
Brian Gough
379e6d2f90
nullify highlight timeout after clearing it
2016-07-11 12:17:49 +01:00
Brian Gough
ad83784a81
remove the renderTimer
...
only display the page when it is fully rendered
2016-07-11 12:17:49 +01:00
Brian Gough
70a82c10ce
cleanup pdfJs
2016-07-11 12:17:49 +01:00
Brian Gough
41b0309e6e
show progress bar when loading starts
2016-07-11 12:17:49 +01:00
Brian Gough
a4cd5c90c3
only process the render queue after we stop moving
2016-07-11 12:17:49 +01:00
Brian Gough
eaca616dd3
use progress bar for initial loading
2016-07-11 12:17:49 +01:00
Brian Gough
b8f677ac7c
replace canvas with rendered page after 1 second
2016-07-11 12:17:49 +01:00
Brian Gough
0e550ac012
add spinner for loading, initially static
2016-07-11 12:17:49 +01:00
Brian Gough
c657a02db5
render offscreen pages
2016-07-11 12:17:49 +01:00
Brian Gough
83ea771aef
include start method for spinner
2016-07-11 12:17:49 +01:00
Brian Gough
8c81f0a9ff
prerender offscreen pages
2016-07-11 12:17:49 +01:00
Henry Oswald
6b2a11a4d4
use https for google fonts
2016-07-11 12:13:01 +01:00
Paulo Reis
7eafa5ca3f
Make Countly server configurable via settings.
2016-07-11 11:02:52 +01:00
Henry Oswald
c7506391ca
optimised oxford gif
2016-07-10 11:12:57 +01:00
Henry Oswald
94d760e32d
import bootstrap font awseome via less not html
2016-07-10 11:10:43 +01:00
Henry Oswald
85936a1391
moved css min to exec, import was not working via grunt
2016-07-10 11:04:51 +01:00
Paulo Reis
444120f8b1
Merge branch 'master' into pr-contact-form-suggestions
2016-07-08 13:55:08 +01:00
Paulo Reis
e1fb4a51c6
Identify sampled events.
2016-07-08 11:17:18 +01:00
Paulo Jorge Reis
c5cf151add
Merge pull request #275 from sharelatex/pr-separate-events-log-hints-feedback
...
Track positive and negative feedback as different events
2016-07-08 10:54:02 +01:00
Paulo Reis
c67ad84be8
Track positive and negative feedback as different events.
2016-07-08 10:26:40 +01:00
Paulo Reis
dfe9e05abe
Use sampled tracking in editor recompiles.
2016-07-08 10:07:45 +01:00
Paulo Reis
07cce99c17
Add sampled tracking method.
2016-07-08 10:06:46 +01:00
Paulo Jorge Reis
3a24c4bff9
Merge pull request #272 from MCribbin/patch-2
...
Update HumanReadableLogsRules.coffee
2016-07-07 13:39:44 +01:00
Shane Kilkelly
0e9beb5653
remove daft redundancy.
2016-07-07 09:42:01 +01:00
Shane Kilkelly
896cbb5f4c
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-07-07 09:35:53 +01:00
Shane Kilkelly
9e35bdcaea
Refactor: add ?
suffix to truth tests.
2016-07-07 09:35:44 +01:00
MCribbin
b62fbd4d3f
Update HumanReadableLogsRules.coffee
2016-07-06 16:18:27 +01:00
Paulo Jorge Reis
efacd9e7f2
Merge pull request #267 from sharelatex/pr-log-dropdown
...
"Other logs & files" dropdown / dropup
2016-07-06 16:06:10 +01:00
MCribbin
dadee03ca3
Update HumanReadableLogsRules.coffee
...
Added new linke for LaTeX Error: Unknown float option `q'.
Changed hint for "No positions in optional float specifier" to include quick fix (will probably need some clearer way of saying which square brackets need to be removed)
2016-07-06 15:57:56 +01:00
Paulo Reis
54ec75d36a
Avoid line-breaks when showing the log icon.
2016-07-06 15:55:36 +01:00
Shane Kilkelly
21eb104928
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-07-06 15:39:12 +01:00
Shane Kilkelly
dda0841af3
Return early if there are no keys to delete
2016-07-06 15:39:03 +01:00
Paulo Reis
b867c37d49
Merge branch 'master' into pr-log-dropdown
2016-07-06 15:35:28 +01:00
Paulo Jorge Reis
59065395ef
Merge pull request #273 from sharelatex/pr-countly-integration
...
Countly integration
2016-07-06 15:00:47 +01:00
Paulo Reis
7a3d3d3ffd
Make Countly track by internal ids.
2016-07-06 14:44:28 +01:00
Paulo Reis
8e2475afdc
Track hints feedback in both GA and Countly; clean-up.
2016-07-06 14:24:50 +01:00
MCribbin
95f1435920
Update HumanReadableLogsRules.coffee
2016-07-06 14:16:21 +01:00
Shane Kilkelly
fc6cf75ad5
Merge branch 'master' into sk-session-revocation
2016-07-06 13:19:15 +01:00
Paulo Reis
0dd3a70b4b
Use Countly tracking method where appropriate.
2016-07-06 12:32:33 +01:00
Paulo Reis
b841d41b68
Actually send the data to Countly.
2016-07-06 12:26:21 +01:00
Shane Kilkelly
9f724d0a04
Add tests to check if users can access a restricted page.
2016-07-06 12:14:01 +01:00
Paulo Reis
5c121a5f05
Track user log in and sign up.
2016-07-06 12:12:54 +01:00
Paulo Reis
7e1c1f7414
Remove heap integration.
2016-07-06 12:12:22 +01:00
Paulo Reis
c9b1faa1a1
Add user info to correlate with events.
2016-07-06 11:59:33 +01:00
Paulo Reis
909f7c15b5
Track log-related actions.
2016-07-05 16:27:14 +01:00
Paulo Reis
d5efe81a46
Track recompiles.
2016-07-05 16:02:46 +01:00
Paulo Reis
96f6603bd3
Track settings changes.
2016-07-05 15:37:13 +01:00
Shane Kilkelly
0362fee60f
test the retain
option to revokeAllUserSessions
.
2016-07-05 15:32:32 +01:00
Paulo Reis
304529754d
Track editor modals.
2016-07-05 15:16:55 +01:00
Shane Kilkelly
464866847f
Fix name of UserSessionsManager test module.
2016-07-05 15:14:29 +01:00
Paulo Reis
71b8f86e89
Track editor macro views.
2016-07-05 15:07:16 +01:00
Shane Kilkelly
a1c662b9d8
Test session revocation on password change.
2016-07-05 14:55:08 +01:00
Shane Kilkelly
3f1a47eccb
map the 'retain' values to session ids
2016-07-05 14:54:26 +01:00
Paulo Reis
a40cbdd84e
Track share modal opening.
2016-07-05 14:32:56 +01:00
Shane Kilkelly
2caa80bbcb
acceptance test for logging in two sessions.
2016-07-05 14:21:38 +01:00
Shane Kilkelly
5b9903551a
add an array of session ids to retain.
2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308
clear sessions on password reset
2016-07-05 14:19:59 +01:00
Paulo Reis
fac3698c40
Better namespacing of sprite CSS classes.
2016-07-05 11:08:58 +01:00
Shane Kilkelly
bec3d2ad42
start acceptance tests for sessions
2016-07-05 10:24:24 +01:00
Paulo Reis
7dd1906eaf
Initial Countly integration.
2016-07-04 16:51:31 +01:00
Paulo Reis
040739ef7f
Comment out sprity and leave a not in README.md.
2016-07-04 16:03:29 +01:00
Shane Kilkelly
df0a7bc547
test the _checkSessions
function.
2016-07-04 14:04:10 +01:00
Shane Kilkelly
699ba21032
test revokeAllUserSessions
2016-07-04 11:15:28 +01:00
Shane Kilkelly
dfcb47fb5c
test untrackSession
2016-07-04 10:56:13 +01:00
Shane Kilkelly
2ae2e6ed4f
Test trackSession
2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60
Begin testing UserSessionsManager
.
2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3
check sessions on login and logout.
2016-07-04 09:27:38 +01:00
Paulo Reis
11f198d970
Merge branch 'master' into sprites
2016-07-01 16:27:09 +01:00
Paulo Reis
64a73b0356
Disable default 4px margin on grunt-sprity, also add the built files.
2016-07-01 16:02:40 +01:00
Paulo Reis
4f49a25639
Use a figure element instead of an img, as there is no src attribute.
2016-07-01 16:02:01 +01:00
Shane Kilkelly
6f20f565fe
Add early-return guards
2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02
Add ip_address
and session_created
to the session user object.
2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7
Refactor method names in UserSessionsManager
2016-07-01 15:33:59 +01:00
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +01:00
Shane Kilkelly
6938f1d055
No need to build extra string
2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f
Clear out sessions
2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94
Fix logging.
2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1
set expiry on the user sessions set.
2016-07-01 11:24:46 +01:00
Shane Kilkelly
ab26edb44b
Adjust UserController unit tests
2016-07-01 10:20:22 +01:00
Shane Kilkelly
88bef5c5ea
Add revokeAllSessions
handler, when password is reset
2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255
Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers
...
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 15:16:28 +01:00
Brian Gough
73ad1fde5c
comment out disabling of per user compiles
2016-06-30 15:15:37 +01:00
Henry Oswald
7cb266d904
removed imagemin
2016-06-30 14:59:05 +01:00
Brian Gough
c04e00026b
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 14:43:03 +01:00
James Allen
882e28a811
Don't choke on null projects
2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314
Remove a user from being a collaborator when their account is deleted
2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed
Skip null user objects when getting collaborators
2016-06-30 13:56:21 +01:00
Paulo Reis
d93c96d43c
Improve log hints ids.
2016-06-30 11:30:43 +01:00
Paulo Reis
c5f53ef431
Track log hints feedback.
2016-06-30 11:30:30 +01:00
Henry Oswald
05dedeebb8
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-29 15:36:53 +01:00
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5
save the session key string, rather than just the id
2016-06-29 15:12:12 +01:00
Paulo Reis
536c1ac65e
Merge branch 'pr-project-filepath-regex'
2016-06-29 14:19:37 +01:00
Paulo Reis
36e09e3b0c
Make the user id portion of the path optional.
2016-06-29 14:19:16 +01:00
Brian Gough
16b58a9420
Merge pull request #268 from sharelatex/per-user-containers-part-3
...
add support for on-demand viewing of pdfs for per-user compiles
2016-06-29 14:16:24 +01:00
Paulo Reis
72d498c6c8
Merge branch 'master' into pr-contact-form-suggestions
2016-06-29 11:58:07 +01:00
Paulo Reis
f50c73642a
Integrate with KB index.
2016-06-29 11:57:43 +01:00
Shane Kilkelly
db213c0621
Begin keeping record of user sessions in reds.
2016-06-29 11:35:25 +01:00
Paulo Reis
d037cb93a9
Wiki styles clean-up.
2016-06-29 10:42:51 +01:00
Paulo Reis
5ad0c06770
Regex now matches new folder nomenclature.
2016-06-28 17:19:02 +01:00
Henry Oswald
8f14526354
added custom footer in email option
2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884
hook notifications handler up to make request which doesn't make request if url not set
2016-06-28 16:52:27 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126
Dynamically determine if the files dropdown should drop up or drop down.
2016-06-28 15:48:11 +01:00
Shane Kilkelly
9e16f250f9
Merge branch 'sk-subscription-address'
2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf
set postal_code as zip
2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe
Test the createSubscription action (+4 squashed commits)
...
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
2016-06-28 13:59:52 +01:00
Paulo Reis
4263d3f8c6
Merge branch 'master' into pr-overflowing-images-wiki
2016-06-28 11:58:58 +01:00
Paulo Reis
86a8a180a8
Merge branch 'master' into pr-toggle-comment-keybinding-windows
2016-06-28 11:37:46 +01:00
Brian Gough
e0d262a6d8
fix shrinkwrap file
2016-06-28 11:18:20 +01:00
Paulo Reis
616fd5daf6
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619
Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds
...
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-28 10:49:33 +01:00
Brian Gough
afc89d8d27
added missing package grunt-execute
2016-06-28 10:42:36 +01:00
Brian Gough
6e187e3996
added npm shrinkwrap file
2016-06-28 10:42:36 +01:00
James Allen
883a9b512a
Merge pull request #265 from MCribbin/patch-1
...
Update HumanReadableLogsRules.coffee
2016-06-28 10:33:24 +01:00
Shane Kilkelly
e194de50cf
test _paypal.checAccountExists
.
2016-06-28 10:17:06 +01:00
Henry Oswald
b8b833b753
moved wiki into module
2016-06-28 10:16:02 +01:00
Paulo Reis
da960a721f
Vertical layout for LaTeX examples.
2016-06-28 10:09:12 +01:00
Shane Kilkelly
6bdfedc1b0
Test when a paypal stage produces an error
2016-06-28 09:09:57 +01:00
Shane Kilkelly
d21eb1b07f
Add tests
2016-06-28 09:04:19 +01:00
Brian Gough
8d32fa1e87
enable per-user containers by default
2016-06-28 08:40:30 +01:00
Shane Kilkelly
709f8f2bea
start testing the paypal workflow.
2016-06-27 16:34:00 +01:00
Paulo Reis
6a8499f515
Merge branch 'master' into pr-toggle-comment-keybinding-windows
2016-06-27 15:39:35 +01:00
Paulo Reis
3580d8377f
Merge branch 'master' into pr-contact-form-suggestions
2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931
Integrate translations.
2016-06-27 15:38:13 +01:00
Paulo Reis
0551f27c83
Extra search options; only search after three chars have been entered.
2016-06-27 14:46:34 +01:00
Shane Kilkelly
3bf8da3e83
test _createCreditCardSubscription
2016-06-27 14:45:17 +01:00
Shane Kilkelly
2c1b326681
test the createSubscription
function.
2016-06-27 14:29:19 +01:00
Shane Kilkelly
95d85538cc
Clean up xml text block in test.
2016-06-27 14:00:30 +01:00
Shane Kilkelly
d853eb5916
Update existing RecurlyWrapper tests.
2016-06-27 13:54:54 +01:00
Brian Gough
8b15d40f8b
add word count to per-user container
2016-06-27 12:41:50 +01:00
Shane Kilkelly
401565ba23
Fix references to the RecurlyWrapper object.
2016-06-27 12:14:43 +01:00
Paulo Reis
81b93ab5a9
Disable links to the docs when the wiki is not available.
2016-06-27 11:34:24 +01:00
Shane Kilkelly
eb92cfe8e0
Remove the postal_code from test, until recurly get back to us.
2016-06-27 10:40:08 +01:00
Shane Kilkelly
9938787e4a
fix a few silly issues. Appears to work now
2016-06-27 10:38:10 +01:00
Paulo Reis
c2ace9a0a0
Restrict # of hits returned; clear results on empty search string.
2016-06-27 10:21:36 +01:00
Shane Kilkelly
72c73809f6
Generate address xml from object.
2016-06-27 09:44:40 +01:00
Henry Oswald
6526b29f96
add another null check on file inside fetchLogs
2016-06-25 13:56:45 +01:00