James Allen
|
70c51cb947
|
Merge branch 'master' into master-redesign
|
2014-06-18 10:56:30 +01:00 |
|
James Allen
|
750b524771
|
Don't get user id from possibly deleted session
|
2014-06-17 17:45:07 +01:00 |
|
James Allen
|
5ce319f8d9
|
Use ng-cloak rather than a loading spinner
|
2014-06-17 16:43:33 +01:00 |
|
James Allen
|
525581bada
|
Add in test loading spinner
|
2014-06-17 16:36:08 +01:00 |
|
Henry Oswald
|
426b699865
|
links in emails use site url
|
2014-06-17 16:28:52 +01:00 |
|
James Allen
|
dac4f09943
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
|
2014-06-17 16:21:21 +01:00 |
|
James Allen
|
aa8969c652
|
Merge and fix external forms
|
2014-06-17 16:19:40 +01:00 |
|
Henry Oswald
|
92d1d4ca1a
|
remove muted from institution auto complete as some browsers are inserting it to the input value
|
2014-06-17 14:44:24 +01:00 |
|
Henry Oswald
|
e1c8dc943e
|
added defaults of empty string into user profile, also changed account -> profile in message
|
2014-06-17 14:36:17 +01:00 |
|
James Allen
|
012371333f
|
Wrap project list code in require.js
|
2014-06-17 12:43:42 +01:00 |
|
Henry Oswald
|
2d55f080d6
|
get algolia to pull app id and api key from settings file
|
2014-06-17 12:25:49 +01:00 |
|
Henry Oswald
|
cc1b9472b2
|
don't show the user details area on project list if algolia instituions has not be setup
|
2014-06-17 11:59:57 +01:00 |
|
James Allen
|
c56648ab80
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
|
2014-06-17 11:54:29 +01:00 |
|
Henry Oswald
|
df44792a10
|
fix tests in user info controller
|
2014-06-17 11:48:14 +01:00 |
|
Henry Oswald
|
457fffd3f7
|
Merge branch 'angular-info'
|
2014-06-17 11:34:28 +01:00 |
|
Henry Oswald
|
b54e2fc2d2
|
Merge branch 'angular-info' of https://github.com/sharelatex/web-sharelatex into angular-info
|
2014-06-17 11:33:56 +01:00 |
|
James Allen
|
2bf25ab450
|
Style and spelling tweaks
|
2014-06-17 11:33:37 +01:00 |
|
Henry Oswald
|
d2df4d6523
|
added little hack so post is sent on institution list when there are two brackets in name which hold domain
|
2014-06-17 11:27:45 +01:00 |
|
Henry Oswald
|
3350b99ccf
|
removed a couple of annoying console.log logs
|
2014-06-17 10:26:56 +01:00 |
|
Henry Oswald
|
af7a615fd4
|
added algolia lib
|
2014-06-17 10:18:15 +01:00 |
|
Henry Oswald
|
444e6cbd12
|
put domain into popup for user info
|
2014-06-16 18:41:44 +01:00 |
|
Henry Oswald
|
478a20be1f
|
use uglify2 and don't mangle names for angular
|
2014-06-16 18:29:55 +01:00 |
|
Henry Oswald
|
f42b2c2385
|
cleaning things up
|
2014-06-16 16:26:34 +01:00 |
|
Henry Oswald
|
f18172258e
|
focus on first element in form when showing
|
2014-06-16 16:22:45 +01:00 |
|
James Allen
|
608e9476b6
|
Show confirmation for deleting projects forever
|
2014-06-16 16:17:28 +01:00 |
|
Henry Oswald
|
7355a912b6
|
recomend roles and still show form when complete
|
2014-06-16 16:14:58 +01:00 |
|
James Allen
|
0a334939ce
|
Confirm deletes and leaves
|
2014-06-16 16:13:09 +01:00 |
|
James Allen
|
3a969876e0
|
Allow cloning of projects
|
2014-06-16 15:32:20 +01:00 |
|
James Allen
|
8bb181a465
|
Don't allow renaming of shared proejcts
|
2014-06-16 15:12:10 +01:00 |
|
James Allen
|
81ee0f4342
|
show and restore archived projects
|
2014-06-16 15:06:58 +01:00 |
|
Henry Oswald
|
a1055b226c
|
uses angular autocomplete modules
|
2014-06-16 14:49:35 +01:00 |
|
James Allen
|
802aae6148
|
Show partial folder selection state
|
2014-06-16 14:45:47 +01:00 |
|
James Allen
|
65a1f03768
|
Send project owner details to client
|
2014-06-16 13:34:38 +01:00 |
|
James Allen
|
9c5f63817e
|
Send accessLevel info to client
|
2014-06-16 12:47:39 +01:00 |
|
James Allen
|
63525a8bef
|
Use angular boostrap instead of vanilla bootstrap
|
2014-06-16 12:26:35 +01:00 |
|
James Allen
|
95ee8c772a
|
Fix modal styling
|
2014-06-16 11:30:54 +01:00 |
|
Henry Oswald
|
09f5a67f9b
|
got autocomplete presented correctly
|
2014-06-13 17:17:58 +01:00 |
|
James Allen
|
b9944ca2dc
|
Hook up file uploads
|
2014-06-13 17:11:36 +01:00 |
|
James Allen
|
8b57224267
|
Allow creation of projects
|
2014-06-13 16:05:44 +01:00 |
|
James Allen
|
ab5d6f82c0
|
Allow deleting of projects
|
2014-06-13 15:24:20 +01:00 |
|
James Allen
|
751572c977
|
Only show actions buttons when projects are selected
|
2014-06-13 14:28:16 +01:00 |
|
James Allen
|
db74e89f99
|
Add folder labels next to the project name
|
2014-06-13 14:14:56 +01:00 |
|
James Allen
|
290089407d
|
Allow creation of new tags
|
2014-06-13 13:55:55 +01:00 |
|
Henry Oswald
|
b9afde591b
|
improved the angular stuff a touch
|
2014-06-12 17:15:54 +01:00 |
|
James Allen
|
4494048cd4
|
Post tag modifications to server
|
2014-06-12 16:47:46 +01:00 |
|
James Allen
|
5fbbf6c452
|
Allow filtering by folder
|
2014-06-12 16:21:12 +01:00 |
|
Henry Oswald
|
68cc7d85bf
|
working with requirejs
|
2014-06-12 15:50:00 +01:00 |
|
James Allen
|
6305ac16f4
|
Work in progress of doing project list with Angular
|
2014-06-12 15:22:49 +01:00 |
|
Henry Oswald
|
f4cecb6591
|
moved alert to lower level so its hidden when not needed
|
2014-06-12 13:42:36 +01:00 |
|
Henry Oswald
|
6836aabac3
|
fiddled with the css
|
2014-06-12 11:22:18 +01:00 |
|