Paulo Reis
11f198d970
Merge branch 'master' into sprites
2016-07-01 16:27:09 +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
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +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
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
c5f53ef431
Track log hints feedback.
2016-06-30 11:30:30 +01:00
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +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
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
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
Henry Oswald
b8b833b753
moved wiki into module
2016-06-28 10:16:02 +01:00
Shane Kilkelly
709f8f2bea
start testing the paypal workflow.
2016-06-27 16:34:00 +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
9938787e4a
fix a few silly issues. Appears to work now
2016-06-27 10:38:10 +01:00
Shane Kilkelly
72c73809f6
Generate address xml from object.
2016-06-27 09:44:40 +01:00
Paulo Reis
f427ce88d9
Better Jade syntax.
2016-06-24 16:37:35 +01:00
Paulo Reis
dfc375adf8
Add more feedback on :hover.
2016-06-24 15:55:19 +01:00
Henry Oswald
9888d6631a
don't error if references is not enabled
2016-06-24 15:46:37 +01:00
Henry Oswald
6e59a10fb3
added more null checks for potential undefined notifications
2016-06-24 15:23:57 +01:00
Paulo Reis
c376c807d7
Forgotten href attribute.
2016-06-24 15:22:34 +01:00
Henry Oswald
51df3825e5
add null check on notifications handler
2016-06-24 15:11:22 +01:00
Henry Oswald
8d79b37651
return from _doIndexOperation if referneces is not setup eailer
2016-06-24 15:07:28 +01:00
Shane Kilkelly
026e9f46c8
WIP: process appears to work, setting address correctly
2016-06-24 15:03:46 +01:00
Shane Kilkelly
56bc840b88
WIP: fix up error handling and account for possibility of account already existing.
2016-06-24 14:11:28 +01:00
Paulo Reis
a33aeca9c3
Merge branch 'pr-latex-hints-improvements'
2016-06-24 14:07:57 +01:00
Henry Oswald
3887db8898
don't call notifications if notifications has no url
2016-06-24 14:06:04 +01:00
Paulo Reis
b4de353828
Merge branch 'master' into pr-latex-hints-improvements
2016-06-24 14:02:55 +01:00
Henry Oswald
9a3e621c9c
stripe off errors and kb from page titles
2016-06-24 13:15:22 +01:00
Paulo Reis
5f7ffb5a8c
Make hint card area non-clickable.
2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d
Better handling of whitespace.
2016-06-24 12:07:02 +01:00
Shane Kilkelly
249381b6a8
WIP: initial work on sending address to recurly for paypal subscriptions
2016-06-24 11:42:58 +01:00
Henry Oswald
d294117286
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-23 16:40:22 +01:00
Henry Oswald
5371669f89
if references has no url don't send post, silently return
2016-06-23 16:39:54 +01:00
Shane Kilkelly
cbdcc874e3
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-22 11:03:32 +01:00
James Allen
b693ced843
Merge pull request #263 from sharelatex/pr-human-readable-logs
...
Human readable logs
2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973
Minor UI improvements.
2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e
Remove DataJoy link from the project page.
2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80
Merge branch 'ha_custom_image_logo'
2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91
Safety checks for non-existing values; avoid rendering the hint template when there is no hint.
2016-06-21 12:07:47 +01:00
Paulo Reis
d8e0026bc6
Add class to enable per-hint feedback tracking.
2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd
Show thank you note after receiving feedback.
2016-06-20 15:04:47 +01:00