 anuprulez
|
b52042ef8e
|
Merging with dev
|
2017-06-09 14:41:26 +02:00 |
|
|
anuprulez
|
785e3e557a
|
Fixing PR review comments
|
2017-06-09 14:35:57 +02:00 |
|
|
anuprulez
|
3573f4d59f
|
Removing usused imports in workflow.js
|
2017-06-07 22:38:40 +02:00 |
|
|
anuprulez
|
1caf29d759
|
Removing extra link for custom_builds in analysis.js
|
2017-06-07 22:26:35 +02:00 |
|
|
guerler
|
e3109d8d94
|
Merge branch 'dev' into grid_pages
|
2017-06-07 13:30:54 -04:00 |
|
|
guerler
|
aedb72606a
|
Add packed files
|
2017-06-07 13:27:48 -04:00 |
|
|
anuprulez
|
f2efc6e5f7
|
Merging with dev
|
2017-06-07 17:38:25 +02:00 |
|
|
guerler
|
7f97d5016e
|
Revise template
|
2017-06-06 12:55:20 -04:00 |
|
|
guerler
|
53cfedaaea
|
Pack scripts
|
2017-06-06 12:51:15 -04:00 |
|
|
guerler
|
26fdf8b8fd
|
Display only link for shared pages since viewing is the only operation
|
2017-06-06 12:49:28 -04:00 |
|
|
guerler
|
aa85d00615
|
Add shared pages table
|
2017-06-06 12:43:17 -04:00 |
|
|
anuprulez
|
207249a466
|
Moving configure menu call to user preferences
|
2017-06-06 18:36:51 +02:00 |
|
|
guerler
|
abe3b1e326
|
Add shared by other, load rendering through model
|
2017-06-06 12:07:28 -04:00 |
|
|
anuprulez
|
07ea4c0434
|
Resolving conflicts and merging with dev
|
2017-06-06 16:10:48 +02:00 |
|
|
guerler
|
aac37045d5
|
Redirect masthead link to client route
|
2017-06-05 15:18:57 -04:00 |
|
|
guerler
|
0a03039e35
|
Add page list viewer, move sharing feature out of operations
|
2017-06-05 15:16:27 -04:00 |
|
|
guerler
|
a2e14c6c6e
|
Resolve previously existing issue with pasting float values into integer fields
|
2017-06-05 14:09:24 -04:00 |
|
|
guerler
|
7274bb641b
|
Merge branch 'dev' into slider_upgrade
|
2017-06-05 12:19:05 -04:00 |
|
|
guerler
|
b7530fbbc9
|
Remove inconsistent change caller
|
2017-06-05 12:18:06 -04:00 |
|
|
John Chilton
|
00de5b9f9a
|
Merge remote-tracking branch 'jmchilton/dev' into download_collection
|
2017-06-05 08:48:42 -04:00 |
|
|
guerler
|
6605681c1d
|
Move slider building out of render, cannot be rebuild
|
2017-06-05 08:16:01 -04:00 |
|
|
guerler
|
f5bb522572
|
Use style classes to produce left floating text field
|
2017-06-04 14:11:14 -04:00 |
|
|
guerler
|
d632e4081d
|
Remove duplicate selector
|
2017-06-04 12:42:26 -04:00 |
|
|
guerler
|
6fe034f23d
|
Add value to model
|
2017-06-04 12:39:50 -04:00 |
|
|
guerler
|
1c5c400f95
|
Add consistent render caller
|
2017-06-04 11:59:55 -04:00 |
|
|
guerler
|
3c5044f01b
|
Add model handler for sliders
|
2017-06-04 11:47:23 -04:00 |
|
|
Dannon Baker
|
c269041b61
|
Merge remote-tracking branch 'upstream/release_17.05' into dev
|
2017-06-04 08:31:33 -04:00 |
|
|
guerler
|
9d0f9efbba
|
Disable feature for forms which auto refresh with a server validation
|
2017-06-02 15:51:59 -04:00 |
|
|
guerler
|
fdc712fb88
|
Hide error highlighting if user interacts with highlighted field
|
2017-06-02 15:49:41 -04:00 |
|
|
Dannon Baker
|
e8f730895c
|
Merge remote-tracking branch 'guerler/remove_grids_mako' into dev
|
2017-06-02 12:54:25 -04:00 |
|
|
Nicola Soranzo
|
d807ed0f75
|
Merge branch 'release_17.05' into dev
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
static/scripts/bundled/login.bundled.js.map
|
2017-06-02 15:05:14 +01:00 |
|
|
anuprulez
|
62bd742808
|
Moving common functions out of view and adding messages for client actions for importing workflow
|
2017-06-01 23:43:53 +02:00 |
|
|
Dannon Baker
|
20d2303d34
|
Merge remote-tracking branch 'upstream/release_17.05' into dev
|
2017-06-01 13:39:36 -04:00 |
|
|
Dannon Baker
|
c260e0b0c8
|
Sort tags for display (note, this is stupid to have in 3 places -- refactor)
|
2017-06-01 10:38:13 -04:00 |
|
|
Dannon Baker
|
f3aa53261d
|
Improved styling of workflow list. Removed unused class, used hierarchy in base.less.
|
2017-06-01 09:48:44 -04:00 |
|
|
anuprulez
|
764933bf34
|
Adding import functionality
|
2017-06-01 00:05:40 +02:00 |
|
|
guerler
|
c409572ef8
|
Handle potential regex expression in workflow parameter names
|
2017-05-31 16:28:18 -04:00 |
|
|
Dannon Baker
|
b6597d43f3
|
Merge remote-tracking branch 'upstream/release_17.05' into dev
|
2017-05-31 15:06:35 -04:00 |
|
|
guerler
|
b764d35cf7
|
Merge branch 'dev' into remove_grids_mako
|
2017-05-30 20:09:38 -04:00 |
|
|
anuprulez
|
6dba0c74f2
|
Merging with dev
|
2017-05-30 22:34:29 +02:00 |
|
|
Dannon Baker
|
5c954139fa
|
Since we're using addClass to inject status type, it's not necessary to escape this one.
|
2017-05-30 14:27:06 -04:00 |
|
|
Dannon Baker
|
8080c08ae6
|
Fix escaping of status/message passed by querystring in the new workflow
menu.
|
2017-05-30 14:24:59 -04:00 |
|
|
anuprulez
|
094dbe92c3
|
Adding basic elements for import workflow
|
2017-05-30 19:51:01 +02:00 |
|
|
anuprulez
|
a407a99ae3
|
Removing run mako from workflows
|
2017-05-29 20:08:51 +02:00 |
|
|
Dannon Baker
|
2ac04bbf09
|
Uniqueify hashtag display
|
2017-05-26 13:30:21 +01:00 |
|
|
anuprulez
|
852aa51225
|
Making one api url for getting and setting workflows menu
|
2017-05-23 11:12:57 +02:00 |
|
|
guerler
|
b2e517e41d
|
Remove unused properties in new format
|
2017-05-22 16:36:05 -04:00 |
|
|
mvdbeek
|
1093b61442
|
Add download button for collections
|
2017-05-22 22:32:27 +02:00 |
|
|
guerler
|
c33bf70657
|
Use makoless grid for published page list
|
2017-05-22 16:04:42 -04:00 |
|
|
guerler
|
9312f8eaf6
|
Move global tag function into grid view
|
2017-05-22 15:43:38 -04:00 |
|