Conversation
|
It's now based on latest master. |
|
It's ready for production |
There was a problem hiding this comment.
lines 648, 653: there are some unmatched quotes and some typos:
message = 'There is one duplicate ' +
- '["+files[duplicates[0]].name+"].' +
- '\n Press ok to replace it' +
- 'otherwise ancel to ignore it.';
should be:
message = 'There is one duplicate ' +
- '['+files[duplicates[0]].name+'].' +
- '\n Press ok to replace it ' +
- 'otherwise cancel to ignore it.';
(this has been fixed on production)
There was a problem hiding this comment.
Thanks for the notice, I have amended with the fix and rebase against the latest master.
* Replaces the uploadify plugin with the plupload plugin (drag-and-drop) * Adds the possibility of replacing photos Signed-off-by: Charalampos Tzovanakis <charalampos.tzovanakis@cern.ch> Reviewed-by: Ludmila Marian <ludmila.marian@gmail.com> Conflicts: modules/websubmit/lib/websubmit_webinterface.py
* Crop images on photo submit * Adds to web icon new `crop` format * HTTP API to crop images on the fly and serve them Signed-off-by: Charalampos Tzovanakis <charalampos.tzovanakis@cern.ch>
* Adds tabs on uploaded image captions with English and French languages
35a4317 to
e943849
Compare
|
@drjova & @ludmilamarian Is this ready to be merged? Or is still WIP? |
|
it's still WIP |
|
I see the three commits are deployed already, is there any reason not to merge this commits already and them develop more on top of them? @kasioumis has seen some conflicts between his code and yours which cannot be resolved unless we merge everything that is in production .... |
|
The submission will change completely again for albums which is almost done on test. What kind of conflicts? |
|
Ok, we can discuss this IRL |
|
There are some conflicts in |
4569625 to
2720b2e
Compare
5da83d6 to
2c4d90d
Compare
|
why the |
|
The |

Please do not merge it yet work in progress