Douglas Lovell
|
aae0484458
|
Merge branch 'master' into dcl-i1207
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
|
2018-11-30 13:24:27 +00:00 |
|
Douglas Lovell
|
ed3147a58f
|
Allow open from template button when lacking source
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
|
2018-11-30 13:24:23 +00:00 |
|
Simon Detheridge
|
50cba1a86f
|
Merge pull request #1153 from sharelatex/spd-open-in-overleaf-local-storage
Use browser local storage instead of session for tex snippets
GitOrigin-RevId: 9609dc882c37ccd2f58bf6d36ea851bbe746fa25
|
2018-11-26 16:53:31 +00:00 |
|
Tim Alby
|
bfb2f636cd
|
enable affiliations UI
|
2018-08-13 14:59:39 +02:00 |
|
Paulo Reis
|
e7f819fbdd
|
Hide affiliations UI behind feature flag.
|
2018-06-25 17:06:23 +01:00 |
|
Tim Alby
|
5fbe5c5537
|
remove UserLocator
Use UserGetter instead
|
2018-05-28 14:11:13 +02:00 |
|
Shane Kilkelly
|
52462d7020
|
Merge branch 'sk-sync-details-from-sso'
|
2016-11-28 10:11:59 +00:00 |
|
Shane Kilkelly
|
2ab5ad4230
|
If we're updating details from a SSO source, don't allow editing on settings page.
|
2016-11-25 14:38:00 +00:00 |
|
Shane Kilkelly
|
22101d0305
|
If user is sent to login page with explicit redirect, obey
|
2016-11-24 11:38:13 +00:00 |
|
Shane Kilkelly
|
8089bb55a4
|
use session for the post-login redirect, remove redir query string.
|
2016-11-22 14:24:36 +00:00 |
|
Shane Kilkelly
|
25dd998107
|
clear-sessions page (+4 squashed commits)
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
|
2016-10-07 16:47:00 +01:00 |
|
Shane Kilkelly
|
894c549ec6
|
WIP: display sessions on a page
|
2016-10-06 15:49:47 +01:00 |
|
Shane Kilkelly
|
ab2c1e82fb
|
WIP: refactor
|
2016-09-05 15:58:31 +01:00 |
|
Henry Oswald
|
c52af1393e
|
should be able to set first and last name via user details on registration
|
2016-06-13 13:21:44 +01:00 |
|
James Allen
|
1e8ab5357b
|
Improve pre-registered account activation process
|
2015-12-11 11:30:06 +00:00 |
|
James Allen
|
6c387edbe2
|
Remove Dropbox front end logic from main sharelatex repo
|
2015-02-05 18:20:34 +00:00 |
|
James Allen
|
dbd85a05f1
|
Send user features and features switches to views where needed
|
2014-10-07 13:31:13 +01:00 |
|
Henry Oswald
|
9c6f0faff6
|
Merge branch 'i18n'
Conflicts:
app/coffee/Features/User/UserPagesController.coffee
app/views/layout.jade
app/views/project/editor/dropbox.jade
app/views/project/editor/file-tree.jade
app/views/project/editor/pdf.jade
app/views/project/list/project-list.jade
app/views/user/settings.jade
|
2014-08-07 14:46:17 +01:00 |
|
James Allen
|
a7cf8d6b0a
|
Sort out title of wiki
|
2014-08-05 17:08:38 +01:00 |
|
Henry Oswald
|
1e0652888a
|
removed console.log
|
2014-08-04 12:21:38 +01:00 |
|
Henry Oswald
|
1b8c8b8c48
|
sorted out titles
|
2014-08-01 13:47:14 +01:00 |
|
Henry Oswald
|
8670b543b9
|
added basic chat handler
|
2014-07-02 17:28:05 +01:00 |
|
James Allen
|
f154f17704
|
Wire up fontSize and mode settings
|
2014-06-24 20:46:00 +01:00 |
|
James Allen
|
5cef41fdbd
|
Allow selecting of theme
|
2014-06-24 20:28:53 +01:00 |
|
Henry Oswald
|
f7245f32d0
|
cleaned up old password reset cruft
|
2014-05-15 18:01:43 +01:00 |
|
Henry Oswald
|
12773c26c2
|
moved user settings page to the user pages controller
|
2014-04-09 15:04:47 +01:00 |
|
Henry Oswald
|
c55c5032b0
|
moved delete user to the user controller
|
2014-04-09 14:43:08 +01:00 |
|
Henry Oswald
|
5f72f13528
|
moved password reset to user pages controller
|
2014-04-09 12:26:59 +01:00 |
|
Henry Oswald
|
434fca8874
|
moved login page to new user page controller
|
2014-04-09 12:22:57 +01:00 |
|
Henry Oswald
|
fa36891faf
|
moved register page to new UserPagesController
|
2014-04-09 12:17:50 +01:00 |
|