Closed michielbdejong closed 10 years ago
Sorry, but I cannot integrate most of your changes with what I already have on my machine. You should've at least said a single word (ideally try to have a conversation) before working on my branch. I said about 3 times that it is not ready for collab and that it is my own private branch for now.
No worries, I just picked the parts I could use. You can rebase your private work once this is merged.
OK, all the views have now been ported and all css bugs fixed.
I staged it on https://rerelaunch.5apps.com/ - please browse around and let me know if you see any errors!
I'm not sure what part of "this is not ready for contrib yet and my own private branch" was unclear. I explained it at least 5 times over the last months, and it is still the same status. There is no open-source license attached to this code.
That puts the whole project in a rather interesting situation. :) @galfert can you mediate?
There's nothing to mediate and it doesn't put anything in any situation. I told you about 5 times at least what the status of that branch is and for some reason you just ignored me completely and didn't even try to communicate before adding to it. You're forcing me in this position; it's not I who's suddenly uncooperative or something. I'm sorry (and I absolutely hate that you're forcing me to block this), but you should've clearly handled this in any other way than ignoring what I explained multiple times over.
... btw, that milestone, which is obviously the reason why you were in such a hurry, doesn't concern me. We for our part are investing in remoteStorage from both our own and our company's funds and time and we will not change our commitments and schedules according to outside milestones that we didn't set up, coordinate or agree to in the first place. If you're bound by those, and you need something done by a certain point in time and that something is dependent on your collaborator's work and time, you need to communicate that earlier than a few days before the deadline and not just barge through with whatever you decided to make sense by yourself and with no consensus.
It's OK, I backported the textual changes to the live site and we can just forget about the layout changes, or at least postpone them indefinitely.
I think we should try again to set up a doc sprint day where we all work together on this.
Apparently you didn't read the IRC log and I forgot to push my changes to master in addition to gh-pages after fixing the site.
Please start a PR so we can discuss the changes, because we think they're making things worse instead of better and some points are just outright misleading and wrong.
I'll fix the layout issue again.
@skddc yeah, I must have missed that IRC conversation, sorry.
we think they're making things worse instead of better and some points are just outright misleading and wrong.
'We' being the people who were in that IRC conversation? 'worse' in what way? 'misleading' in what way? 'wrong' in what way? PR created - please paste your IRC conversation on there if you still have the log.
I took the relaunch branch and filled in the missing bits. In 1037a2d I reworded the selling points a bit, to be aimed more at potential users of remotestorage.js (i.e., web app developers), and less at end users.
The /get/, /provide/ and /integrate/ pages could still use some css love; contributions welcome!