Alasdair Smith
27fd090075
Merge pull request #1064 from sharelatex/as-fix-500-on-teams
...
Fix 500 on /teams route
GitOrigin-RevId: 9f554f9b77fb7fea64db1ad9c4d8635f47efff9e
2018-10-25 12:51:18 +00:00
Timothée Alby
7af86b0704
Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller
...
fix missing next argument
GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce
2018-10-24 14:03:02 +00:00
Timothée Alby
b123f830ff
Merge pull request #1042 from sharelatex/ta-user-membership-access
...
User Membership Access Refactor
GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
2018-10-24 14:02:55 +00:00
Brian Gough
d75d8ee079
Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes
...
check the filetype before syncing file
GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e
Merge pull request #1030 from sharelatex/spd-bonus-program
...
Implement bonus program
GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
2018-10-23 11:36:17 +00:00
Jessica Lawshe
7a03fbeb06
Merge pull request #1018 from sharelatex/jel-track-changes-info-page
...
Styling for track changes info page and add existence checks for metadata
GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
2018-10-19 14:12:30 +00:00
Paulo Jorge Reis
6dd9680af8
Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout
...
Fix single-quotes breaking layout directive
2018-10-19 11:30:59 +01:00
Paulo Reis
00a489a000
Fetch brand variation details for branded projects; inject details into the editor page front-end.
...
Test brand variation details.
Rename BrandVariationsController to BrandVariationsHandler.
Use the V1 API helper.
Do not swallow errors when fetching brand details for project load.
Fix indentation.
2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62
Avoid adding custom toggler attributes when the feature flag is false.
2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646
Avoid using Angular eval for user-provided strings in the layout directive.
2018-10-19 10:00:52 +01:00
Brian Gough
c6ec31c773
Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names
...
avoid duplicate project names for templates and zips
2018-10-18 13:51:05 +01:00
Simon Detheridge
6ad16c9406
Merge pull request #1028 from sharelatex/spd-no-github-for-new-users
...
retry: Don't add old v1 features for new accounts
2018-10-17 14:51:46 +01:00
Brian Gough
ad6b3a625a
use generateUniquename to create names with timestamps
2018-10-16 14:43:40 +01:00
Hugh O'Brien
3b766bf523
Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id
...
Create projects with brand variation id
2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b
Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback
...
Add affiliations on university domain confirmation
2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52
Add additional tests for V1SubscriptionManager
...
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.
bug: overleaf/sharelatex#1014
2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-16 09:45:16 +01:00
Simon Detheridge
ec9c38df57
Revert "Don't add old v1 features for new accounts"
2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f
Merge pull request #1022 from sharelatex/spd-no-github-for-new-users
...
Don't add old v1 features for new accounts
2018-10-15 15:28:34 +01:00
Timothée Alby
c41fb5c9f4
Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation
...
Email confirmation notification UI fixes
2018-10-15 14:49:06 +02:00
Tim Alby
6f63cd7ca0
add notification to confirm unconfirmed emails
2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a
refactor to use config file
2018-10-15 14:46:38 +02:00
Brian Gough
a640397052
make project names unique for zip uploads and template imports
2018-10-15 09:33:39 +01:00
Brian Gough
59cf0aa3cb
fix bug in call to findAllUsersProjects
2018-10-15 09:33:39 +01:00
Simon Detheridge
48995d2d44
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-12 17:45:57 +01:00
Hugh O'Brien
b825f0b267
Merge branch 'master' into hb-v2-affiliations-callback
2018-10-11 17:14:35 +01:00
Timothée Alby
89590d5199
Merge pull request #1003 from sharelatex/cmg-split-screen-button
...
Switch between pdf and editor with full-screen button
2018-10-11 10:54:53 +01:00
Simon Detheridge
e7506489d1
Fix missing string in modals.pug
...
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-10 15:06:37 +01:00
Paulo Reis
901fb0fc1e
Unit test brand variation id.
2018-10-10 14:09:47 +01:00
Paulo Reis
29787c42c5
Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates.
2018-10-10 14:09:47 +01:00
Paulo Reis
a380feab98
Add brand variation id to the Project model.
2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22
Merge pull request #1005 from sharelatex/spd-no-more-asterisks
...
Sanitize paths in all relevant ProjectEntityHandler methods
2018-10-10 10:44:13 +01:00
Simon Detheridge
32149e652f
Handle 'invalid element name' error in project list ui
...
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.
Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7
update error message
2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800
add account merge error
2018-10-09 09:47:03 -04:00
Tim Alby
48e5c6b523
add UserMembership logic
2018-10-09 12:09:11 +01:00
Chrystal Griffiths
7ae39a0f84
Revert to ng-show
2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7
Avoid duplicating code
2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412
Merge pull request #1008 from sharelatex/ta-fix-help-link
...
fix link to link sharing help page
2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c
fix link to link sharing help page
2018-10-08 16:07:11 +01:00
Simon Detheridge
56dcbefb5b
Check for safe paths in all ProjectEntityHandler methods
...
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.
Added checks to all methods in ProjectEntityHandler that can create or rename a file.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 15:31:04 +01:00
Jessica Lawshe
d9c98aa45e
Add default Twitter and OG images
2018-10-08 15:18:18 +01:00
Simon Detheridge
e66210d2af
Add method to sanitize full paths
...
For convenience, add a method to SafePath to break a path into components and verify the status of each one.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 14:48:17 +01:00
Simon Detheridge
50993f59c0
Merge pull request #926 from sharelatex/dcl-i850
...
Display password change form in Account Settings
2018-10-08 13:59:04 +01:00
Simon Detheridge
9c189303c1
Merge pull request #1002 from sharelatex/spd-email-cta-links
...
Add additional CTA link to emails
2018-10-08 13:56:21 +01:00
Simon Detheridge
af9c9517f3
Merge pull request #999 from sharelatex/as-validate-password-length
...
Validate password length
2018-10-08 13:55:25 +01:00
hugh-obrien
f6307f9086
store reversedHostname property and update test accordingly
2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46
store reversed hostname and review fixes for v2 university domain confirmation
2018-10-08 12:08:29 +01:00
Jessica Lawshe
b78f362c53
Merge pull request #1000 from sharelatex/jel-meta-img-src
...
Handle image_src in metadata layout
2018-10-08 11:44:10 +01:00
Jessica Lawshe
f04212c96f
Merge pull request #995 from sharelatex/ta-remove-confirmed-field
...
remove unused confirmed field from user model
2018-10-08 11:43:42 +01:00